Changeset 257 in dev for trunk/abdev/BasicCompiler_Common

Timestamp:

Aug 2, 2007, 4:17:27 AM (17 years ago)

Author:

dai_9181

Message:

 

Location:

trunk/abdev/BasicCompiler_Common

Files:

• include/Linker.h (modified) (1 diff)
• include/NativeCode.h (modified) (5 diffs)
• include/Procedure.h (modified) (1 diff)
• src/Linker.cpp (added)
• src/NativeCode.cpp (modified) (1 diff)

trunk/abdev/BasicCompiler_Common/include/Linker.h

@@ -32 +32 @@
 class Linker
 {
-    // メタ情報
-    vector<const ObjectModule *> objectModules;
+    // データテーブルスケジュール
+    void ResolveDataTableSchedules( long dataSectionBaseOffset );
+
+    // DLL関数スケジュール
+    void ResolveDllProcSchedules( long codeSectionBaseOffset, long importSectionBaseOffset );
+
+    // ユーザ定義関数スケジュール
+    void ResolveUserProcSchedules( long codeSectionBaseOffset );
+
+    // グローバル変数スケジュール
+    void ResolveGlobalVarSchedules( long rwSectionBaseOffset );
+
+    NativeCode nativeCode;
+
+    DWORD imageBase;
+
+public:
+    Linker()
+    {
+    }
+
+    void SetImageBase( DWORD imageBase )
+    {
+        this->imageBase = imageBase;
+    }
+
+    // リンク
+    void Link( vector<ObjectModule *> &objectModules );
 };

trunk/abdev/BasicCompiler_Common/include/NativeCode.h

@@ -22 +22 @@
         UserProc,       // ユーザ定義関数呼び出し側スケジュール
         AddressOf,      // ユーザ定義関数位置スケジュール
+        DllProc,        // DLL関数位置スケジュール
     };
 
@@ -62 +63 @@
     }
     Schedule( const ::DllProc *pDllProc, long offest )
-        : type( Schedule::UserProc )
+        : type( Schedule::DllProc )
         , offset( offset )
         , pDllProc( pDllProc )
@@ -69 +70 @@
     ~Schedule()
     {
+    }
+
+    Type GetType() const
+    {
+        return type;
+    }
+    long GetOffset() const
+    {
+        return offset;
+    }
+    const ::DllProc &GetDllProc() const
+    {
+        if( type != Schedule::DllProc )
+        {
+            SetError();
+        }
+        return *pDllProc;
+    }
+    const ::UserProc &GetUserProc() const
+    {
+        if( type != Schedule::UserProc )
+        {
+            SetError();
+        }
+        return *pUserProc;
     }
 
@@ -188 +214 @@
         return size;
     }
+    const Schedules &GetSchedules() const
+    {
+        return schedules;
+    }
 
     long GetLong( int codePos ) const
@@ -233 +263 @@
         ObpPlus( size );
     }
-    void Put( const NativeCode &nativeCode )
-    {
-        Put( nativeCode.codeBuffer, nativeCode.size );
-    }
+    void Put( const NativeCode &nativeCode );
     void Put( _int64 i64data )
     {

trunk/abdev/BasicCompiler_Common/include/Procedure.h

@@ -314 +314 @@
     }
 
+    const NativeCode &GetNativeCode() const
+    {
+        return nativeCode;
+    }
     NativeCode &GetNativeCode()
     {

trunk/abdev/BasicCompiler_Common/src/NativeCode.cpp

@@ -15 +15 @@
     {
         int test=0;
+    }
+}
+
+void NativeCode::Put( const NativeCode &nativeCode )
+{
+    long baseOffset = size;
+
+    Put( nativeCode.codeBuffer, nativeCode.size );
+
+    BOOST_FOREACH( const Schedule &schedule, nativeCode.schedules )
+    {
+        this->schedules.push_back(
+            Schedule(
+                schedule.GetType(),
+                baseOffset + schedule.GetOffset()
+            )
+        );
     }
 }