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

Timestamp:

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

Author:

dai_9181

Message:

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

File:

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

trunk/abdev/BasicCompiler_Common/src/Linker.cpp

@@ -17 +17 @@
         }
     }
+
+    BOOST_FOREACH( const Schedule &schedule, dataTable.schedules )
+    {
+        if( schedule.GetType() == Schedule::DataTable )
+        {
+#ifdef _WIN64
+            dataTable.OverwriteInt64(
+                schedule.GetOffset(),
+                dataTable.GetInt64( schedule.GetOffset() ) + imageBase + dataSectionBaseOffset
+            );
+#else
+            dataTable.Overwrite(
+                schedule.GetOffset(),
+                dataTable.GetLong( schedule.GetOffset() ) + imageBase + dataSectionBaseOffset
+            );
+#endif
+        }
+    }
 }
 
@@ -116 +134 @@
         }
     }
+
+    BOOST_FOREACH( const Schedule &schedule, dataTable.schedules )
+    {
+        if( schedule.GetType() == Schedule::Vtbl )
+        {
+            LONG_PTR vtblMasterListOffset = schedule.GetClass().GetVtblMasterListOffset();
+
+#ifdef _WIN64
+            dataTable.OverwriteInt64(
+                schedule.GetOffset(),
+                vtblMasterListOffset + imageBase + dataSectionBaseOffset
+            );
+#else
+            dataTable.Overwrite(
+                schedule.GetOffset(),
+                vtblMasterListOffset + imageBase + dataSectionBaseOffset
+            );
+#endif
+        }
+    }
+}
+
+void Linker::ResolveTypeInfoSchedule( long dataSectionBaseOffset )
+{
+    BOOST_FOREACH( const Schedule &schedule, dataTable.schedules )
+    {
+        if( schedule.GetType() == Schedule::TypeInfo )
+        {
+            LONG_PTR typeInfoDataTableOffset = schedule.GetClass().GetTypeInfoDataTableOffset();
+
+#ifdef _WIN64
+            dataTable.OverwriteInt64(
+                schedule.GetOffset(),
+                typeInfoDataTableOffset + imageBase + dataSectionBaseOffset
+            );
+#else
+            dataTable.Overwrite(
+                schedule.GetOffset(),
+                typeInfoDataTableOffset + imageBase + dataSectionBaseOffset
+            );
+#endif
+        }
+    }
 }
 
@@ -143 +204 @@
     }
 }
+
+void Linker::SetDataTable( DataTable &dataTable )
+{
+    this->dataTable.Add( dataTable );
+}