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

Timestamp:

Aug 16, 2007, 7:55:02 PM (17 years ago)

Author:

dai_9181

Message:

Binaryクラスを追加

Location:

trunk/abdev/BasicCompiler_Common/src

Files:

• Linker.cpp (modified) (2 diffs)
• Meta.cpp (modified) (1 diff)
• NativeCode.cpp (modified) (6 diffs)
• ObjectModule.cpp (modified) (1 diff)
• Source.cpp (modified) (1 diff)
• Variable.cpp (modified) (3 diffs)

trunk/abdev/BasicCompiler_Common/src/Linker.cpp

@@ -126 +126 @@
     }
 
-    nativeCode.Put( masterObjectModule.globalNativeCode );
+    nativeCode.PutEx( masterObjectModule.globalNativeCode );
 
     masterObjectModule.meta.GetUserProcs().Iterator_Reset();
@@ -137 +137 @@
             pUserProc->SetBeginOpAddress( nativeCode.GetSize() );
 
-            nativeCode.Put( pUserProc->GetNativeCode() );
+            nativeCode.PutEx( pUserProc->GetNativeCode() );
 
             pUserProc->SetEndOpAddress( nativeCode.GetSize() );

trunk/abdev/BasicCompiler_Common/src/Meta.cpp

@@ -90 +90 @@
         }
 
+        bool isResetOffsetAddress = true;
+        if( pVar->HasInitData() )
+        {
+            // 初期バッファがあるときはデータテーブルオフセットを適用する
+            pVar->SetOffsetAddress( pVar->GetOffsetAddress() + dataSectionBaseOffset );
+
+            isResetOffsetAddress = false;
+        }
+
         pVar->isTargetObjectModule = false;
-        this->globalVars.Add( pVar );
+        this->globalVars.Add( pVar, isResetOffsetAddress );
     }
     meta.globalVars.PullOutAll();

trunk/abdev/BasicCompiler_Common/src/NativeCode.cpp

@@ -5 +5 @@
 #define BREAK_EIP(checkEip)  (obp+0x00401000>=checkEip)
 
-void NativeCode::Put( const NativeCode &nativeCode )
+void NativeCode::PutEx( const NativeCode &nativeCode )
 {
-    long baseOffset = size;
+    long baseOffset = GetSize();
 
     // コードバッファを追加
-    Put( nativeCode.codeBuffer, nativeCode.size );
+    Put( nativeCode.GetBuffer(), nativeCode.GetSize() );
 
     // スケジュールを追加
@@ -43 +43 @@
     pUserProc->Using();
 
-    Schedule schedule( pUserProc, size );
+    Schedule schedule( pUserProc, GetSize() );
     if( isCall == false )
     {
@@ -50 +50 @@
     schedules.push_back( schedule );
 
-    *((long *)(codeBuffer+size))=0;
-    size += sizeof(long);
+    Put( (long)0 );
 }
 
@@ -58 +57 @@
     pDllProc->Using();
 
-    schedules.push_back( Schedule( pDllProc, size ) );
+    schedules.push_back( Schedule( pDllProc, GetSize() ) );
 
-    *((long *)(codeBuffer+size))=0;
-    size += sizeof(long);
+    Put( (long)0 );
 }
 
 void NativeCode::PutVtblSchedule( const CClass *pClass )
 {
-    schedules.push_back( Schedule( pClass, size ) );
+    schedules.push_back( Schedule( pClass, GetSize() ) );
 
-    *((long *)(codeBuffer+size))=0;
-    size += sizeof(long);
+    Put( (long)0 );
 }
 
@@ -76 +73 @@
     if( sourceLines.size() )
     {
-        if( sourceLines.back().GetNativeCodePos() == size )
+        if( sourceLines.back().GetNativeCodePos() == GetSize() )
         {
             sourceLines.back().SetSourceCodePos( cp );
@@ -97 +94 @@
         SourceLine(
             (long)sourceLines.size(),
-            size,
+            GetSize(),
             compiler.GetObjectModule().GetCurrentSourceIndex(),
             cp,

trunk/abdev/BasicCompiler_Common/src/ObjectModule.cpp

@@ -23 +23 @@
     objectModule.globalNativeCode.ResetDataSectionBaseOffset( dataSectionBaseOffset );
     objectModule.globalNativeCode.ResetSourceIndexes( sourceIndexBase );
-    globalNativeCode.Put( objectModule.globalNativeCode );
+    globalNativeCode.PutEx( objectModule.globalNativeCode );
 
     // データテーブルを結合

trunk/abdev/BasicCompiler_Common/src/Source.cpp

@@ -815 +815 @@
 
     // basic.sbpをインクルード
-    const char *headCode = "#include <basic.sbp>\n";
-    //const char *headCode = "\n";
+    //const char *headCode = "#include <basic.sbp>\n";
+    const char *headCode = "\n";
     Realloc( length + lstrlen(headCode) );
     Text::SlideString( buffer, lstrlen(headCode) );

trunk/abdev/BasicCompiler_Common/src/Variable.cpp

@@ -74 +74 @@
 }
 
-void Variables::Add( Variable *pVar )
+void Variables::Add( Variable *pVar, bool isResetOffsetAddress )
 {
     int alignment = 0;
@@ -90 +90 @@
         }
 
-        pVar->SetOffsetAddress( allInitSize );
+        if( isResetOffsetAddress )
+        {
+            pVar->SetOffsetAddress( allInitSize );
+        }
         allInitSize += pVar->GetMemorySize();
     }
@@ -102 +105 @@
         }
 
+        if( !isResetOffsetAddress )
+        {
+            Jenga::Throw( "[Variables::Add] 初期バッファがない変数に対してisResetOffsetAddressをfalseにできない" );
+        }
+
         pVar->SetOffsetAddress( allSize | 0x80000000 );
         allSize += pVar->GetMemorySize();