Changeset 247 in dev for trunk/abdev

Timestamp:

Jul 28, 2007, 4:17:56 PM (17 years ago)

Author:

dai_9181

Message:

Exit Subスケジュールをリファクタリングした

Location:

trunk/abdev

Files:

• BasicCompiler32/Compile_ProcOp.cpp (modified) (2 diffs)
• BasicCompiler32/Compile_Statement.cpp (modified) (7 diffs)
• BasicCompiler_Common/Compile.cpp (modified) (1 diff)
• BasicCompiler_Common/include/CodeGenerator.h (modified) (3 diffs)
• BasicCompiler_Common/src/CommonCodeGenerator.cpp (modified) (2 diffs)

trunk/abdev/BasicCompiler32/Compile_ProcOp.cpp

@@ -413 +413 @@
 
     //プロシージャ抜け出しスケジュール（Exit Sub/Function）
-    extern DWORD *pExitSubSchedule;
-    extern int ExitSubScheduleNum;
-    pExitSubSchedule=(DWORD *)HeapAlloc(hHeap,0,1);
-    ExitSubScheduleNum=0;
+    compiler.codeGenerator.exitSubCodePositions.clear();
+    compiler.codeGenerator._exitSubCodePositions_ObpOld.clear();
 
     //ラベル用のメモリを確保
@@ -620 +618 @@
 
     //プロシージャ抜け出しスケジュール（Exit Sub/Function）
-    for(i3=0;i3<ExitSubScheduleNum;i3++){
-        *((long *)(OpBuffer+pExitSubSchedule[i3]))=obp-(pExitSubSchedule[i3]+sizeof(long));
-    }
-    HeapDefaultFree(pExitSubSchedule);
+    compiler.codeGenerator.ResolveExitSubSchedule();
 
     if(bDebugCompile&&bDebugSupportProc==0){

trunk/abdev/BasicCompiler32/Compile_Statement.cpp

@@ -580 +580 @@
 void OpcodeDo(char *Parameter){
     extern HANDLE hHeap;
-    int i,i2,i3,i4;
+    int i,i2,i3;
 
     if(Parameter[0]) SetError(10,"Do",cp);
@@ -702 +702 @@
 
                 //jne
-                OpBuffer[obp++]=(char)0x0F;
-                OpBuffer[obp++]=(char)0x85;
-                obp+=sizeof(long);
-                i2=obp;
-
+                const CodeGenerator::PertialSchedule *pTempPertialSchedule1 = compiler.codeGenerator.op_jne( 0, sizeof(char), true );
 
                 //cmp ebx,0
@@ -712 +708 @@
 
                 //jne
-                OpBuffer[obp++]=(char)0x0F;
-                OpBuffer[obp++]=(char)0x85;
-                obp+=sizeof(long);
-                i4=obp;
-
+                const CodeGenerator::PertialSchedule *pTempPertialSchedule2 = compiler.codeGenerator.op_jne( 0, sizeof(char), true );
 
                 if(basbuf[i3]=='0'){
@@ -724 +716 @@
                     pDoPertialSchedule = compiler.codeGenerator.op_jmp( 0, sizeof(char), true );
 
-                    *((long *)(OpBuffer+i2-sizeof(long)))=obp-i2;
-                    *((long *)(OpBuffer+i4-sizeof(long)))=obp-i4;
+                    compiler.codeGenerator.opfix_JmpPertialSchedule( pTempPertialSchedule1 );
+                    compiler.codeGenerator.opfix_JmpPertialSchedule( pTempPertialSchedule2 );
                 }
                 else if(basbuf[i3]=='1'){
@@ -731 +723 @@
 
                     //jmp 2（ループを続ける）
-                    OpBuffer[obp++]=(char)0xEB;
-                    OpBuffer[obp++]=(char)0x02;
-
-                    *((long *)(OpBuffer+i2-sizeof(long)))=obp-i2;
-                    *((long *)(OpBuffer+i4-sizeof(long)))=obp-i4;
+                    const CodeGenerator::PertialSchedule *pTempPertialSchedule3 = compiler.codeGenerator.op_jmp( 0, sizeof(char), true );
+
+                    compiler.codeGenerator.opfix_JmpPertialSchedule( pTempPertialSchedule1 );
+                    compiler.codeGenerator.opfix_JmpPertialSchedule( pTempPertialSchedule2 );
 
                     //jmp 5（ループ終了）
                     pDoPertialSchedule = compiler.codeGenerator.op_jmp( 0, sizeof(char), true );
+
+                    compiler.codeGenerator.opfix_JmpPertialSchedule( pTempPertialSchedule3 );
                 }
             }
@@ -791 +784 @@
 
 void OpcodeExitSub(void){
-    extern DWORD *pExitSubSchedule;
-    extern int ExitSubScheduleNum;
     extern HANDLE hHeap;
 
@@ -804 +795 @@
 
     //jmp ...(End Sub/Function)
-    OpBuffer[obp++]=(char)0xE9;
-
-    pExitSubSchedule=(DWORD *)HeapReAlloc(hHeap,0,pExitSubSchedule,(ExitSubScheduleNum+1)*sizeof(DWORD));
-    pExitSubSchedule[ExitSubScheduleNum]=obp;
-    ExitSubScheduleNum++;
-
-    obp+=sizeof(long);
+    compiler.codeGenerator.op_jmp_exitsub();
 }
 

trunk/abdev/BasicCompiler_Common/Compile.cpp

@@ -28 +28 @@
 int CaseScheduleNum;
 int NowCaseSchedule;
-
-//プロシージャ抜け出しスケジュール（Exit Sub/Function）
-DWORD *pExitSubSchedule;
-int ExitSubScheduleNum;
 
 //グローバル変数初期バッファ

trunk/abdev/BasicCompiler_Common/include/CodeGenerator.h

@@ -101 +101 @@
 public:
 
+    // Exit Subスケジュールの管理
+    std::vector<long> exitSubCodePositions;
+    std::vector<int> _exitSubCodePositions_ObpOld;
+
     // Gotoスケジュールの管理
     std::vector<GotoLabelSchedule> gotoLabelSchedules;
@@ -158 +162 @@
         return _continueCodePositions_ObpOld[_continueCodePositions_ObpOld.size()-1];
     }
+    
+    void ResolveExitSubSchedule();
 
     void CheckUnresolveSchedule();
@@ -183 +189 @@
     const PertialSchedule *op_jmp( long offset, int op_size = sizeof(char), bool isPertialSchedule = false, bool isSelfOpcodeOffset = false );
     void op_jmp_continue();
+    void op_jmp_exitsub();
     void op_jmp_goto_schedule( const GotoLabelSchedule &gotoLabelSchedule );
 

trunk/abdev/BasicCompiler_Common/src/CommonCodeGenerator.cpp

@@ -3 +3 @@
 #include <CodeGenerator.h>
 
+
+void CodeGenerator::ResolveExitSubSchedule()
+{
+    BOOST_FOREACH( long exitSubCodePosition, exitSubCodePositions )
+    {
+        pNativeCode->Overwrite( exitSubCodePosition, (long)( pNativeCode->GetSize()-(exitSubCodePosition+sizeof(long)) ) );
+    }
+    
+    // TODO: 未完成
+    BOOST_FOREACH( long exitSubCodePositionOld, _exitSubCodePositions_ObpOld )
+    {
+        extern int obp;
+        pNativeCode->OverwriteOld( exitSubCodePositionOld, (long)( obp-(exitSubCodePositionOld+sizeof(long)) ) );
+    }
+}
 
 void CodeGenerator::CheckUnresolveSchedule()
@@ -202 +217 @@
     op_jmp( GetContinueCodePosOld()-obp, sizeof(long), false, true );
 }
-void CodeGenerator::op_jmp_goto_schedule( const GotoLabelSchedule &gotoLabelSchedule )
+void CodeGenerator::op_jmp_exitsub()
 {
     // オペコード
     pNativeCode->Put( (char)0xE9 );
 
+    exitSubCodePositions.push_back( pNativeCode->GetSize() );
+    
+    extern int obp;
+    _exitSubCodePositions_ObpOld.push_back( obp );
+
+    pNativeCode->Put( (long)0 );
+}
+void CodeGenerator::op_jmp_goto_schedule( const GotoLabelSchedule &gotoLabelSchedule )
+{
+    // オペコード
+    pNativeCode->Put( (char)0xE9 );
+
     gotoLabelSchedules.push_back( gotoLabelSchedule );