Changeset 355 in dev for trunk/abdev/BasicCompiler32/MakePeHdr.cpp

Timestamp:

Nov 2, 2007, 2:53:56 AM (16 years ago)

Author:

dai_9181

Message:

静的領域に初期オブジェクトを配置可能にした

File:

• trunk/abdev/BasicCompiler32/MakePeHdr.cpp (modified) (5 diffs)

trunk/abdev/BasicCompiler32/MakePeHdr.cpp

@@ -42 +42 @@
     *pSub_System_GC_free_for_SweepingDelete,
     *pSubStaticMethod_System_TypeBase_InitializeUserTypes,
+    *pSubStaticMethod_System_TypeBase_InitializeUserTypesForBaseType,
 
     *pSub_allrem,
@@ -282 +283 @@
         pSubStaticMethod_System_TypeBase_InitializeUserTypes->Using();
         pSubStaticMethod_System_TypeBase_InitializeUserTypes->ThisIsAutoGenerationProc();
+    }
+    
+    if( pSubStaticMethod_System_TypeBase_InitializeUserTypesForBaseType = GetSubHash( "ActiveBasic.Core._System_TypeBase.InitializeUserTypesForBaseType",1 ) ){
+        pSubStaticMethod_System_TypeBase_InitializeUserTypesForBaseType->Using();
+        pSubStaticMethod_System_TypeBase_InitializeUserTypesForBaseType->ThisIsAutoGenerationProc();
     }
 
@@ -1069 +1075 @@
     }
 
+    compiler.linker.SetDataTable( compiler.GetObjectModule().dataTable );
 
     compiler.linker.SetImageBase( ImageBase );
@@ -1076 +1083 @@
     compiler.linker.ResolveGlobalVarSchedules( MemPos_RWSection );
     compiler.linker.ResolveVtblSchedule( MemPos_DataSection );
+    compiler.linker.ResolveTypeInfoSchedule( MemPos_DataSection );
 
 
@@ -1543 +1551 @@
     if(bUse_DataSection){
         //データ テーブル
-        WriteFile(hFile,compiler.GetObjectModule().dataTable.GetPtr(),compiler.GetObjectModule().dataTable.GetSize(),(DWORD *)&i2,NULL);
+        WriteFile(
+            hFile,
+            compiler.linker.GetDataTable().GetPtr(),
+            compiler.linker.GetDataTable().GetSize(),
+            (DWORD *)&i2,
+            NULL
+        );
         i+=i2;
     }