Changeset 263 in dev for trunk/abdev/BasicCompiler64/MakePeHdr.cpp

Timestamp:

Aug 5, 2007, 3:47:49 AM (17 years ago)

Author:

dai_9181

Message:

 

File:

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

trunk/abdev/BasicCompiler64/MakePeHdr.cpp

@@ -222 +222 @@
 
     //コードと行番号の関係
-    extern LINEINFO *pLineInfo;
-    extern int MaxLineInfoNum;
-    pLineInfo=(LINEINFO *)HeapAlloc(hHeap,0,1);
-    MaxLineInfoNum=0;
+    extern SourceLines oldSourceLines;
+    oldSourceLines.clear();
 
 
@@ -387 +385 @@
 
         //未完成
-        //OpBuffer[obp++]=(char)0xCC;
+        //breakpoint;
 
         //sub rsp,スタックフレームサイズ
@@ -503 +501 @@
     //////////////////////////////////////////////////////////
 
+
+
+    trace( "コード生成が終了しました。" );
+
+    vector<ObjectModule *> masterObjectModules;
+    masterObjectModules.push_back( &compiler.objectModule );
+    compiler.linker.Link( masterObjectModules );
 
 
@@ -836 +841 @@
 
     //機械語コードとBasicコードの関係を整理
-    extern LINEINFO *pLineInfo;
-    extern int MaxLineInfoNum;
+    extern SourceLines oldSourceLines;
     int MinObp,MaxObp;
-    LINEINFO *pTempLineInfo;
-    pTempLineInfo=(LINEINFO *)HeapAlloc(hHeap,0,MaxLineInfoNum*sizeof(LINEINFO));
-    i2=0;
+    SourceLines tempSourceLines;
     MaxObp=0;
     while(1){
-        for(i3=0,MinObp=0x0FFFFFFF;i3<MaxLineInfoNum;i3++){
-            if(pLineInfo[i3].TopObp<MinObp&&MaxObp<pLineInfo[i3].TopObp){
-                MinObp=pLineInfo[i3].TopObp;
+        for(i3=0,MinObp=0x0FFFFFFF;i3<oldSourceLines.size();i3++){
+            if(oldSourceLines[i3].GetNativeCodePos()<MinObp&&MaxObp<oldSourceLines[i3].GetNativeCodePos()){
+                MinObp=oldSourceLines[i3].GetNativeCodePos();
                 i4=i3;
             }
         }
         if(MinObp==0x0FFFFFFF) break;
-        pTempLineInfo[i2]=pLineInfo[i4];
-        MaxObp=pTempLineInfo[i2].TopObp;
-        i2++;
-    }
-    HeapDefaultFree(pLineInfo);
-    pLineInfo=(LINEINFO *)HeapAlloc(hHeap,0,i2*sizeof(LINEINFO));
-    memcpy(pLineInfo,pTempLineInfo,i2*sizeof(LINEINFO));
-    MaxLineInfoNum=i2;
-    HeapDefaultFree(pTempLineInfo);
+        tempSourceLines.push_back( oldSourceLines[i4] );
+        MaxObp=tempSourceLines.back().GetNativeCodePos();
+    }
+    oldSourceLines = tempSourceLines;
 
     //デバッグセクションを生成
@@ -1165 +1162 @@
 
 
+
+    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.ResolveGlobalVarSchedules( MemPos_RWSection );
+
+    if( obp == compiler.linker.GetNativeCode().GetSize() )
+    {
+        memcpy( OpBuffer, compiler.linker.GetNativeCode().GetCodeBuffer(), compiler.linker.GetNativeCode().GetSize() );
+    }
+    else
+    {
+        SetError();
+    }
+
+
     ////////////////////////////////
     // リソースアドレススケジュール