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

Timestamp:

Aug 11, 2007, 4:03:49 PM (17 years ago)

Author:

dai_9181

Message:

 

Location:

trunk/abdev/BasicCompiler_Common/src

Files:

• Compiler.cpp (modified) (1 diff)
• DataTable.cpp (modified) (1 diff)
• Linker.cpp (modified) (4 diffs)
• Meta.cpp (modified) (2 diffs)
• NativeCode.cpp (modified) (1 diff)
• Variable.cpp (modified) (1 diff)

trunk/abdev/BasicCompiler_Common/src/Compiler.cpp

@@ -13 +13 @@
     {
         // メタ情報
-        pNowObjectModule->meta.StaticLink( pStaticLibrary->meta );
+        pNowObjectModule->StaticLink( *pStaticLibrary );
     }
 }

trunk/abdev/BasicCompiler_Common/src/DataTable.cpp

@@ -7 +7 @@
 #include <memory.h>
 #include <stdlib.h>
-
-void DataTable::Realloc( int size )
-{
-    this->buffer = (char *)realloc( this->buffer, size + 100 );
-    this->size = size;
-}
 
 int DataTable::AddBinary( const void *buffer, int size ){

trunk/abdev/BasicCompiler_Common/src/Linker.cpp

@@ -78 +78 @@
 void Linker::ResolveGlobalVarSchedules( long rwSectionBaseOffset )
 {
+    int allInitVarSize = compiler.GetObjectModule().meta.GetGlobalVars().GetAllInitSize();
+
     BOOST_FOREACH( const Schedule &schedule, nativeCode.GetSchedules() )
     {
@@ -84 +86 @@
             if( nativeCode.GetLong( schedule.GetOffset() ) & 0x80000000 )
             {
-                extern int AllInitGlobalVarSize;
                 nativeCode.Overwrite(
                     schedule.GetOffset(),
-                    static_cast<long>( AllInitGlobalVarSize + (nativeCode.GetLong( schedule.GetOffset() ) & 0x7FFFFFFF) + imageBase + rwSectionBaseOffset )
+                    static_cast<long>( allInitVarSize + (nativeCode.GetLong( schedule.GetOffset() ) & 0x7FFFFFFF) + imageBase + rwSectionBaseOffset )
                 );
             }
@@ -101 +102 @@
 }
 
-void Linker::Link( vector<ObjectModule *> &objectModules )
+void Linker::Link( ObjectModule &masterObjectModule )
 {
     // nativeCodeは初期状態でなければならない
@@ -108 +109 @@
         SetError();
     }
-
-    /*
-    BOOST_FOREACH( ObjectModule *pObjectModule, objectModules )
-    {
-    }*/
-    ObjectModule &masterObjectModule = *objectModules[0];
 
     nativeCode.Put( masterObjectModule.globalNativeCode, false );

trunk/abdev/BasicCompiler_Common/src/Meta.cpp

@@ -36 +36 @@
 }
 
-void Meta::StaticLink( Meta &meta )
+void Meta::StaticLink( Meta &meta, long dataSectionBaseOffset )
 {
     // 名前空間
@@ -53 +53 @@
         UserProc *pUserProc = meta.GetUserProcs().Iterator_GetNext();
         pUserProc->isTargetObjectModule = false;
+
+        pUserProc->GetNativeCode().ResetDataSectionBaseOffset( dataSectionBaseOffset );
+
         this->userProcs.Put( pUserProc );
     }

trunk/abdev/BasicCompiler_Common/src/NativeCode.cpp

@@ -125 +125 @@
     sourceLines.push_back( SourceLine( (long)sourceLines.size(), size, cp, sourceLineType ) );
 }
+
+void NativeCode::ResetDataSectionBaseOffset( long dataSectionBaseOffset )
+{
+    BOOST_FOREACH( const Schedule &schedule, schedules )
+    {
+        if( schedule.GetType() == Schedule::DataTable )
+        {
+            Overwrite(
+                schedule.GetOffset(),
+                GetLong( schedule.GetOffset() ) + dataSectionBaseOffset
+            );
+        }
+    }
+}

trunk/abdev/BasicCompiler_Common/src/Variable.cpp

@@ -73 +73 @@
     return NULL;
 }
+
+void Variables::Add( Variable *pVar, bool isInitArea )
+{
+    int alignment = 0;
+    if( pVar->GetType().IsStruct() ){
+        alignment = pVar->GetType().GetClass().GetFixedAlignment();
+    }
+
+    if( isInitArea ){
+        //初期バッファがあるとき
+
+        if( alignment ){
+            if( allInitSize % alignment ){
+                allInitSize += alignment - (allInitSize % alignment);
+            }
+        }
+
+        pVar->SetOffsetAddress( allInitSize );
+        allInitSize += pVar->GetMemorySize();
+    }
+    else{
+        //初期バッファがないとき
+
+        if( alignment ){
+            if( allSize % alignment ){
+                allSize += alignment - (allSize % alignment);
+            }
+        }
+
+        pVar->SetOffsetAddress( allSize | 0x80000000 );
+        allSize += pVar->GetMemorySize();
+    }
+
+    push_back( pVar );
+}