Changeset 273 in dev for trunk/abdev/BasicCompiler_Common/src/Linker.cpp

Timestamp:

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

Author:

dai_9181

Message:

 

File:

• trunk/abdev/BasicCompiler_Common/src/Linker.cpp (modified) (4 diffs)

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 );