Changeset 247 in dev for trunk/abdev/BasicCompiler_Common

Timestamp:

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

Author:

dai_9181

Message:

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

Location:

trunk/abdev/BasicCompiler_Common

Files:

• Compile.cpp (modified) (1 diff)
• include/CodeGenerator.h (modified) (3 diffs)
• src/CommonCodeGenerator.cpp (modified) (2 diffs)

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