Changeset 263 in dev for trunk/abdev/BasicCompiler_Common/src

Timestamp:

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

Author:

dai_9181

Message:

 

Location:

trunk/abdev/BasicCompiler_Common/src

Files:

• Class.cpp (modified) (1 diff)
• Linker.cpp (modified) (2 diffs)
• NativeCode.cpp (modified) (3 diffs)

trunk/abdev/BasicCompiler_Common/src/Class.cpp

@@ -737 +737 @@
         pUserProc=(UserProc *)pVtbl[i];
         if(!pUserProc) continue;
-        pVtbl[i]=pUserProc->_beginOpAddressOld+ImageBase+MemPos_CodeSection;
+
+        // 古いOpBufferを利用する場合は_beginOpAddressOldでないとダメ
+        //pVtbl[i]=pUserProc->_beginOpAddressOld+ImageBase+MemPos_CodeSection;
+        pVtbl[i]=pUserProc->GetBeginOpAddress()+ImageBase+MemPos_CodeSection;
     }
 }

trunk/abdev/BasicCompiler_Common/src/Linker.cpp

@@ -26 +26 @@
         if( schedule.GetType() == Schedule::DllProc )
         {
-#ifdef _AMD64
+#ifdef _AMD64_
             nativeCode.Overwrite(
                 schedule.GetOffset(),
@@ -103 +103 @@
 void Linker::Link( vector<ObjectModule *> &objectModules )
 {
+    // nativeCodeは初期状態でなければならない
+    if( nativeCode.GetSize() > 0 )
+    {
+        SetError();
+    }
+
     /*
     BOOST_FOREACH( ObjectModule *pObjectModule, objectModules )

trunk/abdev/BasicCompiler_Common/src/NativeCode.cpp

@@ -22 +22 @@
     long baseOffset = size;
 
+    // コードバッファを追加
     Put( nativeCode.codeBuffer, nativeCode.size, isOpBuffer );
 
+    // スケジュールを追加
     BOOST_FOREACH( const Schedule &schedule, nativeCode.schedules )
     {
@@ -31 +33 @@
                 baseOffset + schedule.GetOffset(),
                 schedule.GetLongPtrValue()
+            )
+        );
+    }
+
+    // ソースコード行番号とネイティブコード位置の対応情報を追加
+    BOOST_FOREACH( const SourceLine &sourceLine, nativeCode.sourceLines )
+    {
+        this->sourceLines.push_back(
+            SourceLine(
+                sourceLine.GetLineNum(),
+                baseOffset + sourceLine.GetNativeCodePos(),
+                sourceLine.GetSourceCodePos(),
+                sourceLine.GetCodeType()
             )
         );
@@ -85 +100 @@
     ObpPlus( sizeof(long) );
 }
+
+void NativeCode::NextSourceLine()
+{
+    if( sourceLines.size() )
+    {
+        if( sourceLines.back().GetNativeCodePos() == size )
+        {
+            sourceLines.back().SetSourceCodePos( cp );
+            return;
+        }
+    }
+
+    extern BOOL bDebugSupportProc;
+    extern BOOL bSystemProc;
+    DWORD sourceLineType = 0;
+    if( bDebugSupportProc )
+    {
+        sourceLineType |= CODETYPE_DEBUGPROC;
+    }
+    if( bSystemProc )
+    {
+        sourceLineType |= CODETYPE_SYSTEMPROC;
+    }
+    sourceLines.push_back( SourceLine( (long)sourceLines.size(), size, cp, sourceLineType ) );
+}