Changeset 258 in dev for trunk/abdev

Timestamp:

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

Author:

dai_9181

Message:

Linkerの骨格を作成した

Location:

trunk/abdev

Files:

• BasicCompiler32/MakePeHdr.cpp (modified) (2 diffs)
• BasicCompiler_Common/include/CodeGenerator.h (modified) (1 diff)
• BasicCompiler_Common/include/Linker.h (modified) (2 diffs)
• BasicCompiler_Common/include/NativeCode.h (modified) (8 diffs)
• BasicCompiler_Common/src/Linker.cpp (modified) (4 diffs)
• BasicCompiler_Common/src/NativeCode.cpp (modified) (2 diffs)

trunk/abdev/BasicCompiler32/MakePeHdr.cpp

@@ -551 +551 @@
 
     trace( "コード生成が終了しました。" );
+
+    vector<ObjectModule *> masterObjectModules;
+    masterObjectModules.push_back( &compiler.objectModule );
+    //compiler.linker.Link( masterObjectModules );
 
 
@@ -1221 +1225 @@
     delete pobj_GlobalVarSchedule;
 
+/*
+    compiler.linker.SetImageBase( ImageBase );
+    compiler.linker.ResolveDataTableSchedules( MemPos_DataSection );
+    compiler.linker.ResolveDllProcSchedules( MemPos_CodeSection, MemPos_ImportSection, LookupSize, HintSize );
+    compiler.linker.ResolveUserProcSchedules( MemPos_CodeSection );
+    compiler.linker.ResolveDataTableSchedules( MemPos_RWSection );
+*/
 
 

trunk/abdev/BasicCompiler_Common/include/CodeGenerator.h

@@ -459 +459 @@
     void PutOld( const NativeCode &nativeCode )
     {
-        pNativeCode->Put( nativeCode );
+        pNativeCode->Put( nativeCode, true );
     }
     void PutOld( char c )

trunk/abdev/BasicCompiler_Common/include/Linker.h

@@ -32 +32 @@
 class Linker
 {
-    // データテーブルスケジュール
-    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()
     {
@@ -58 +46 @@
     }
 
+    // データテーブルスケジュール
+    void ResolveDataTableSchedules( long dataSectionBaseOffset );
+
+    // DLL関数スケジュール
+    void ResolveDllProcSchedules( long codeSectionBaseOffset, long importSectionBaseOffset, long lookupSize, long hintSize );
+
+    // ユーザ定義関数スケジュール
+    void ResolveUserProcSchedules( long codeSectionBaseOffset );
+
+    // グローバル変数スケジュール
+    void ResolveGlobalVarSchedules( long rwSectionBaseOffset );
+
     // リンク
     void Link( vector<ObjectModule *> &objectModules );

trunk/abdev/BasicCompiler_Common/include/NativeCode.h

@@ -50 +50 @@
     {
     }
-    Schedule( Type type, long offset )
+    Schedule( Type type, long offset, LONG_PTR lpValue = 0 )
         : type( type )
         , offset( offset )
-        , lpValue( 0 )
-    {
-    }
-    Schedule( const ::UserProc *pUserProc, long offest )
+        , lpValue( lpValue )
+    {
+    }
+    Schedule( const ::UserProc *pUserProc, long offset )
         : type( Schedule::UserProc )
         , offset( offset )
@@ -62 +62 @@
     {
     }
-    Schedule( const ::DllProc *pDllProc, long offest )
+    Schedule( const ::DllProc *pDllProc, long offset )
         : type( Schedule::DllProc )
         , offset( offset )
@@ -80 +80 @@
         return offset;
     }
+    LONG_PTR GetLongPtrValue() const
+    {
+        return lpValue;
+    }
     const ::DllProc &GetDllProc() const
     {
@@ -90 +94 @@
     const ::UserProc &GetUserProc() const
     {
-        if( type != Schedule::UserProc )
+        if( !( type == Schedule::UserProc || type == Schedule::AddressOf ) )
         {
             SetError();
@@ -181 +185 @@
     {
     }
-    NativeCode( const NativeCode &nativeCode )
+    NativeCode( const NativeCode &nativeCode, bool isOpBuffer )
         : allocateSize( 8192 )
         , codeBuffer( (char *)malloc( allocateSize ) )
         , size( 0 )
     {
-        Put( nativeCode );
+        Put( nativeCode, isOpBuffer );
     }
     NativeCode( const char *codeBuffer, int size )
@@ -207 +211 @@
     {
         Clear();
-        Put( nativeCode );
+        Put( nativeCode, false );
     }
 
@@ -250 +254 @@
     }
 
-    void Put( const char *codeBuffer, int size )
+    void Put( const char *codeBuffer, int size, bool isOpBuffer = true )
     {
         Realloc( this->size + size );
@@ -258 +262 @@
 
         // 未完成
-        extern char *OpBuffer;
-        extern int obp;
-        memcpy( OpBuffer + obp, codeBuffer, size );
-        ObpPlus( size );
-    }
-    void Put( const NativeCode &nativeCode );
+        if( isOpBuffer )
+        {
+            extern char *OpBuffer;
+            extern int obp;
+            memcpy( OpBuffer + obp, codeBuffer, size );
+            ObpPlus( size );
+        }
+    }
+    void Put( const NativeCode &nativeCode, bool isOpBuffer );
     void Put( _int64 i64data )
     {

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