Changeset 263 in dev for trunk/abdev/BasicCompiler64

Timestamp:

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

Author:

dai_9181

Message:

 

Location:

trunk/abdev/BasicCompiler64

Files:

• Compile_Object.cpp (modified) (3 diffs)
• Compile_ProcOp.cpp (modified) (2 diffs)
• Compile_Statement.cpp (modified) (2 diffs)
• MakePeHdr.cpp (modified) (5 diffs)
• Opcode.h (modified) (1 diff)
• stack_frame.cpp (modified) (5 diffs)

trunk/abdev/BasicCompiler64/Compile_Object.cpp

@@ -60 +60 @@
         if( subs.size() == 1 ){
             char temporary[VN_SIZE];
-            sprintf( temporary, "ActiveBasic.Core._System_TypeBase.Search(\"\",\"%s\"))", pobj_c->GetName().c_str() );
+            sprintf( temporary, "_System_TypeBase_Search(\"\",\"%s\"))", pobj_c->GetName().c_str() );
 
             Opcode_CallProc(temporary,
@@ -258 +258 @@
 
     //jnzの番地
-    int jnz_back;
-    jnz_back=obp;
+    //int jnz_back=obp;
 
     //mov qword ptr[rsp+offset],rcx     ※スタックフレームを利用
@@ -280 +279 @@
 
     //jnz ↑
-    compiler.codeGenerator.op_jne( jnz_back-obp, sizeof(long), false, true );
+    //compiler.codeGenerator.op_jne( jnz_back-obp, sizeof(long), false, true );
 
 

trunk/abdev/BasicCompiler64/Compile_ProcOp.cpp

@@ -140 +140 @@
         && userProc.HasParentClass()
         && userProc.GetParentClass().GetName() == "_System_TypeBase" ){
-
             compiler.objectModule.meta.GetClasses().Compile_System_InitializeUserTypes();
     }
@@ -670 +669 @@
 
 
-    pUserProc->SetEndOpAddress( obp );
+    pUserProc->_endOpAddressOld = obp;
 
 

trunk/abdev/BasicCompiler64/Compile_Statement.cpp

@@ -272 +272 @@
         {
             //jmp ...(schedule)
-            extern int obp;
             compiler.codeGenerator.op_jmp_goto_schedule( (const std::string)(Parameter + 1), 0, cp );
         }
@@ -289 +288 @@
         {
             //jmp ...(schedule)
-            extern int obp;
             compiler.codeGenerator.op_jmp_goto_schedule( "", LineNum, cp );
         }

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();
+    }
+
+
     ////////////////////////////////
     // リソースアドレススケジュール

trunk/abdev/BasicCompiler64/Opcode.h

@@ -45 +45 @@
 
 
-class CStackFrame:public CSchedule{
+class CStackFrame
+{
     ///////////////////////////
     // スタックフレーム管理
     ///////////////////////////
+
+    PertialSchedules pertialSchedules;
 
     int lowest_sp;          //スタックポインタの最下位位置

trunk/abdev/BasicCompiler64/stack_frame.cpp

@@ -39 +39 @@
 
     //add reg,now_sp
-    compiler.codeGenerator.op_add_RV( reg, now_sp );
-
-    //スケジュールをセット
-    obp-=sizeof(long);
-    add();
-    obp+=sizeof(long);
+    pertialSchedules.push_back(
+        compiler.codeGenerator.op_add_RV( reg, now_sp, Schedule::None, true )
+    );
 }
 int CStackFrame::push(int reg){
@@ -53 +50 @@
 
     //mov qword ptr[rsp+offset],reg
-    compiler.codeGenerator.op_mov_MR(sizeof(_int64),reg,REG_RSP,now_sp,MOD_BASE_DISP32);
-
-    //スケジュールをセット
-    obp-=sizeof(long);
-    add();
-    obp+=sizeof(long);
+    pertialSchedules.push_back(
+        compiler.codeGenerator.op_mov_MR(sizeof(_int64),reg,REG_RSP,now_sp,MOD_BASE_DISP32, Schedule::None, true)
+    );
 
     return now_sp;
@@ -68 +62 @@
     if(varSize==sizeof(double)){
         //movlpd qword ptr[rsp+offset],xmm_reg
-        compiler.codeGenerator.op_movlpd_MR(xmm_reg,REG_RSP,now_sp,MOD_BASE_DISP32);
+        pertialSchedules.push_back(
+            compiler.codeGenerator.op_movlpd_MR(xmm_reg,REG_RSP,now_sp,MOD_BASE_DISP32, Schedule::None, true )
+        );
     }
     if(varSize==sizeof(float)){
         //movss dword ptr[rsp+offset],xmm_reg
-        compiler.codeGenerator.op_movss_MR( xmm_reg, REG_RSP, now_sp, MOD_BASE_DISP32 );
+        pertialSchedules.push_back(
+            compiler.codeGenerator.op_movss_MR( xmm_reg, REG_RSP, now_sp, MOD_BASE_DISP32, Schedule::None, true )
+        );
     }
-
-    //スケジュールをセット
-    obp-=sizeof(long);
-    add();
-    obp+=sizeof(long);
 }
 void CStackFrame::ref_offset_data( int reg, int sp_offset ){
     //mov reg,qword ptr[rsp+offset]     ※スタックフレームを利用
-    compiler.codeGenerator.op_mov_RM(sizeof(_int64),reg,REG_RSP,sp_offset,MOD_BASE_DISP32);
-
-    //スケジュールをセット
-    obp-=sizeof(long);
-    add();
-    obp+=sizeof(long);
+    pertialSchedules.push_back(
+        compiler.codeGenerator.op_mov_RM(sizeof(_int64),reg,REG_RSP,sp_offset,MOD_BASE_DISP32, Schedule::None, true )
+    );
 }
 void CStackFrame::ref(int reg){
@@ -95 +85 @@
     if(varSize==sizeof(double)){
         //movlpd xmm_reg,qword ptr[rsp+offset]
-        compiler.codeGenerator.op_movlpd_RM(xmm_reg,REG_RSP,now_sp,MOD_BASE_DISP32);
+        pertialSchedules.push_back(
+            compiler.codeGenerator.op_movlpd_RM(xmm_reg,REG_RSP,now_sp,MOD_BASE_DISP32, Schedule::None, true )
+        );
     }
     if(varSize==sizeof(float)){
         //movss xmm_reg,dword ptr[rsp+offset]
-        compiler.codeGenerator.op_movss_MR( xmm_reg, REG_RSP, now_sp, MOD_BASE_DISP32 );
+        pertialSchedules.push_back(
+            compiler.codeGenerator.op_movss_MR( xmm_reg, REG_RSP, now_sp, MOD_BASE_DISP32, Schedule::None, true )
+        );
     }
-
-    //スケジュールをセット
-    obp-=sizeof(long);
-    add();
-    obp+=sizeof(long);
 }
 void CStackFrame::pop(int reg){
@@ -121 +110 @@
 }
 void CStackFrame::RunningSchedule( int stackFrameSize ){
-    for(int i=0;i<num;i++){
-        *((long *)(OpBuffer+pObpValues[i])) += stackFrameSize;
+    BOOST_FOREACH( const PertialSchedule *pPertialSchedule, pertialSchedules )
+    {
+        compiler.codeGenerator.opfix_offset( pPertialSchedule, stackFrameSize );
     }
 }