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

Timestamp:

Aug 2, 2007, 11:23:36 PM (17 years ago)

Author:

dai_9181

Message:

Linkerの骨格を作成した

Location:

trunk/abdev/BasicCompiler_Common/src

Files:

• Linker.cpp (modified) (4 diffs)
• NativeCode.cpp (modified) (2 diffs)

trunk/abdev/BasicCompiler_Common/src/Linker.cpp

@@ -20 +20 @@
 
 // DLL関数スケジュール
-void Linker::ResolveDllProcSchedules( long codeSectionBaseOffset, long importSectionBaseOffset )
+void Linker::ResolveDllProcSchedules( long codeSectionBaseOffset, long importSectionBaseOffset, long lookupSize, long hintSize )
 {
     BOOST_FOREACH( const Schedule &schedule, nativeCode.GetSchedules() )
@@ -33 +33 @@
             );
 #else
-            // TODO: 未完成
-            SetError();
+            nativeCode.Overwrite(
+                schedule.GetOffset(),
+                static_cast<long>( imageBase + importSectionBaseOffset + lookupSize + hintSize
+                    + schedule.GetDllProc().GetLookupAddress() )
+            );
 #endif
         }
@@ -106 +109 @@
     ObjectModule &masterObjectModule = *objectModules[0];
 
-    nativeCode.Put( masterObjectModule.globalNativeCode );
+    nativeCode.Put( masterObjectModule.globalNativeCode, false );
 
     masterObjectModule.meta.GetUserProcs().Iterator_Reset();
@@ -117 +120 @@
             pUserProc->SetBeginOpAddress( nativeCode.GetSize() );
 
-            nativeCode.Put( pUserProc->GetNativeCode() );
+            nativeCode.Put( pUserProc->GetNativeCode(), false );
 
             pUserProc->SetEndOpAddress( nativeCode.GetSize() );

trunk/abdev/BasicCompiler_Common/src/NativeCode.cpp

@@ -18 +18 @@
 }
 
-void NativeCode::Put( const NativeCode &nativeCode )
+void NativeCode::Put( const NativeCode &nativeCode, bool isOpBuffer )
 {
     long baseOffset = size;
 
-    Put( nativeCode.codeBuffer, nativeCode.size );
+    Put( nativeCode.codeBuffer, nativeCode.size, isOpBuffer );
 
     BOOST_FOREACH( const Schedule &schedule, nativeCode.schedules )
@@ -29 +29 @@
             Schedule(
                 schedule.GetType(),
-                baseOffset + schedule.GetOffset()
+                baseOffset + schedule.GetOffset(),
+                schedule.GetLongPtrValue()
             )
         );