Changeset 263 in dev for trunk/abdev/BasicCompiler_Common/DebugMiddleFile.cpp

Timestamp:

Aug 5, 2007, 3:47:49 AM (17 years ago)

Author:

dai_9181

Message:

 

File:

• trunk/abdev/BasicCompiler_Common/DebugMiddleFile.cpp (modified) (6 diffs)

trunk/abdev/BasicCompiler_Common/DebugMiddleFile.cpp

@@ -98 +98 @@
     // コードと行番号の関係
     ////////////////////////
-    extern int MaxLineInfoNum;
-    extern LINEINFO *pLineInfo;
-
-    //バッファが足りない場合は再確保
-    if(MaxLineInfoNum*sizeof(LINEINFO)<32768) i3=32768;
-    else i3=MaxLineInfoNum*sizeof(LINEINFO)+32768;
-    if(BufferSize<i2+i3){
-        BufferSize+=i3;
-        buffer=(char *)HeapReAlloc(hHeap,0,buffer,BufferSize);
-    }
-
-    *(long *)(buffer+i2)=MaxLineInfoNum;
-    i2+=sizeof(long);
-    memcpy(buffer+i2,pLineInfo,MaxLineInfoNum*sizeof(LINEINFO));
-    i2+=MaxLineInfoNum*sizeof(LINEINFO);
+    extern SourceLines oldSourceLines;
+
+    *(long *)(buffer+i2)=(long)oldSourceLines.size();
+    i2+=sizeof(long);
+    BOOST_FOREACH( const SourceLine &sourceLine, oldSourceLines )
+    {
+        *(long *)(buffer+i2) = sourceLine.GetLineNum();
+        i2+=sizeof(long);
+
+        *(long *)(buffer+i2) = sourceLine.GetNativeCodePos();
+        i2+=sizeof(long);
+
+        *(long *)(buffer+i2) = sourceLine.GetSourceCodePos();
+        i2+=sizeof(long);
+
+        *(long *)(buffer+i2) = sourceLine.GetCodeType();
+        i2+=sizeof(long);
+
+        //バッファが足りない場合は再確保
+        if(BufferSize<i2+32768){
+            BufferSize+=32768;
+            buffer=(char *)HeapReAlloc(hHeap,0,buffer,BufferSize);
+        }
+    }
 
 
@@ -431 +440 @@
     memcpy(buffer,OpBuffer,SizeOf_CodeSection);
 
-    int i2;
-    for(i2=0;i2<MaxLineInfoNum;i2++){
+    BOOST_FOREACH( const SourceLine &sourceLine, oldSourceLines )
+    {
         if(!(
-            pLineInfo[i2].dwCodeType&CODETYPE_SYSTEMPROC||
-            pLineInfo[i2].dwCodeType&CODETYPE_DEBUGPROC
-            )){
+            sourceLine.IsInSystemProc()
+            || sourceLine.IsInDebugProc() ) )
+        {
             //int 3
-            buffer[pLineInfo[i2].TopObp]=(char)0xCC;
+            buffer[sourceLine.GetNativeCodePos()]=(char)0xCC;
         }
     }
@@ -487 +496 @@
 
     //コードと行番号の関係
-    MaxLineInfoNum=*(long *)(buffer+i2);
-    i2+=sizeof(long);
-    pLineInfo=(LINEINFO *)HeapAlloc(hHeap,0,MaxLineInfoNum*sizeof(LINEINFO)+1);
-    memcpy(pLineInfo,buffer+i2,MaxLineInfoNum*sizeof(LINEINFO));
-    i2+=MaxLineInfoNum*sizeof(LINEINFO);
+    int maxLineInfoNum;
+    maxLineInfoNum=*(long *)(buffer+i2);
+    i2+=sizeof(long);
+    for(i3=0;i3<maxLineInfoNum;i3++){
+        int lineNum = *(long *)(buffer+i2);
+        i2+=sizeof(long);
+
+        int nativeCodePos = *(long *)(buffer+i2);
+        i2+=sizeof(long);
+
+        int sourceCodePos = *(long *)(buffer+i2);
+        i2+=sizeof(long);
+
+        DWORD sourceLineType = *(DWORD *)(buffer+i2);
+        i2+=sizeof(long);
+
+        oldSourceLines.push_back( SourceLine( lineNum, nativeCodePos, sourceCodePos, sourceLineType ) );
+    }
 
 
@@ -837 +859 @@
 
     //コードと行番号の関係
-    extern int MaxLineInfoNum;
-    extern LINEINFO *pLineInfo;
-    MaxLineInfoNum=this->MaxLineInfoNum;
-    pLineInfo=this->pLineInfo;
+    extern SourceLines oldSourceLines;
+    oldSourceLines = this->oldSourceLines;
 
     BreakStepCodeBuffer=pobj_DBBreakPoint->update(OpBuffer,SizeOf_CodeSection);
@@ -956 +976 @@
 
     //コードと行番号の関係
-    extern int MaxLineInfoNum;
-    extern LINEINFO *pLineInfo;
-    MaxLineInfoNum=this->MaxLineInfoNum;
-    pLineInfo=this->pLineInfo;
+    extern SourceLines oldSourceLines;
+    oldSourceLines = this->oldSourceLines;
 
     // クラス情報
@@ -996 +1014 @@
     delete this->pobj_DBClass;
     this->pobj_DBClass=0;
-
-    //コードと行番号の関係を解放
-    HeapDefaultFree(pLineInfo);
 
     //コードバッファを解放