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

Timestamp:

Aug 14, 2007, 8:37:08 AM (17 years ago)

Author:

dai_9181

Message:

 

Location:

trunk/abdev/BasicCompiler_Common/src

Files:

• Meta.cpp (modified) (2 diffs)
• NativeCode.cpp (modified) (4 diffs)
• ObjectModule.cpp (modified) (1 diff)
• Source.cpp (modified) (1 diff)

trunk/abdev/BasicCompiler_Common/src/Meta.cpp

@@ -36 +36 @@
 }
 
-void Meta::StaticLink( Meta &meta, long dataSectionBaseOffset )
+void Meta::StaticLink( Meta &meta, long dataSectionBaseOffset, int sourceIndexBase )
 {
     // 名前空間
@@ -55 +55 @@
 
         pUserProc->GetNativeCode().ResetDataSectionBaseOffset( dataSectionBaseOffset );
+        pUserProc->GetNativeCode().ResetSourceIndexes( sourceIndexBase );
 
         this->userProcs.Put( pUserProc );

trunk/abdev/BasicCompiler_Common/src/NativeCode.cpp

@@ -1 +1 @@
 #include "stdafx.h"
 
-#include <NativeCode.h>
-#include <Procedure.h>
+#include <Compiler.h>
 
 #define BREAK_EIP(checkEip)  (obp+0x00401000>=checkEip)
@@ -32 +31 @@
                 sourceLine.GetLineNum(),
                 baseOffset + sourceLine.GetNativeCodePos(),
+                sourceLine.GetSourceIndex(),
                 sourceLine.GetSourceCodePos(),
                 sourceLine.GetCodeType()
@@ -86 +86 @@
         sourceLineType |= CODETYPE_SYSTEMPROC;
     }
-    sourceLines.push_back( SourceLine( (long)sourceLines.size(), size, cp, sourceLineType ) );
+    sourceLines.push_back(
+        SourceLine(
+            (long)sourceLines.size(),
+            size,
+            compiler.GetObjectModule().GetCurrentSourceIndex(),
+            cp,
+            sourceLineType
+        )
+    );
 }
 
@@ -102 +110 @@
     }
 }
+void NativeCode::ResetSourceIndexes( long sourceIndexBase )
+{
+    BOOST_FOREACH( SourceLine &sourceLine, sourceLines )
+    {
+        sourceLine.SetSourceIndex( sourceLine.GetSourceIndex() + sourceIndexBase );
+    }
+}

trunk/abdev/BasicCompiler_Common/src/ObjectModule.cpp

@@ -14 +14 @@
 void ObjectModule::StaticLink( ObjectModule &objectModule )
 {
+    long dataSectionBaseOffset = dataTable.GetSize();
+    int sourceIndexBase = sources.size();
+
     // メタ情報を結合
-    meta.StaticLink( objectModule.meta, dataTable.GetSize() );
+    meta.StaticLink( objectModule.meta, dataSectionBaseOffset, sourceIndexBase );
 
     // ネイティブコードを結合
+    objectModule.globalNativeCode.ResetDataSectionBaseOffset( dataSectionBaseOffset );
+    objectModule.globalNativeCode.ResetSourceIndexes( sourceIndexBase );
     globalNativeCode.Put( objectModule.globalNativeCode );
-    globalNativeCode.ResetDataSectionBaseOffset( dataTable.GetSize() );
 
     // データテーブルを結合
     dataTable.Add( objectModule.dataTable );
+
+    // ソースコードを結合
+    BOOST_FOREACH( const BasicSource &source, objectModule.sources )
+    {
+        this->sources.push_back( source );
+    }
 }
 

trunk/abdev/BasicCompiler_Common/src/Source.cpp

@@ -921 +921 @@
 }
 
-bool BasicSource::GetLineInfo( int sourceCodePos, int &line, std::string &filePath )
+bool BasicSource::GetLineInfo( int sourceCodePos, int &line, std::string &filePath ) const
 {
     int i2,i3,i4,i5;
 
-    char *buffer = GetBuffer();
+    const char *buffer = GetBuffer();
     int i = sourceCodePos;