Changeset 246 in dev for trunk/abdev/BasicCompiler_Common

Timestamp:

Jul 28, 2007, 1:30:22 PM (17 years ago)

Author:

dai_9181

Message:

 

Location:

trunk/abdev/BasicCompiler_Common

Files:

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

trunk/abdev/BasicCompiler_Common/Compile.cpp

@@ -32 +32 @@
 DWORD *pExitSubSchedule;
 int ExitSubScheduleNum;
-
-//Goto未知ラベル スケジュール
-GOTOLABELSCHEDULE *pGotoLabelSchedule;
-int GotoLabelScheduleNum;
 
 //グローバル変数初期バッファ
@@ -123 +119 @@
 void ChangeOpcode(char *Command){
     extern HANDLE hHeap;
-    int i,i2;
 
     if(Command[0]=='\0')
@@ -141 +136 @@
 
         //書き込みスケジュール
-        for(i=0;i<GotoLabelScheduleNum;i++){
-            if(lstrcmp(pGotoLabelSchedule[i].pName,Command+1)==0){
-                *((long *)(OpBuffer+pGotoLabelSchedule[i].pos))=obp-(pGotoLabelSchedule[i].pos+sizeof(long));
-
-                HeapDefaultFree(pGotoLabelSchedule[i].pName);
-
+        std::vector<GotoLabelSchedule>::iterator it = compiler.codeGenerator.gotoLabelSchedules.begin();
+        while( it != compiler.codeGenerator.gotoLabelSchedules.end() )
+        {
+            if( it->GetName() == Command+1 )
+            {
+                *((long *)( OpBuffer + it->GetNativeCodePos() ))=obp-(it->GetNativeCodePos()+sizeof(long));
+                
                 //詰める
-                GotoLabelScheduleNum--;
-                for(i2=i;i2<GotoLabelScheduleNum;i2++){
-                    pGotoLabelSchedule[i2].pName=pGotoLabelSchedule[i2+1].pName;
-                    pGotoLabelSchedule[i2].line=pGotoLabelSchedule[i2+1].line;
-                    pGotoLabelSchedule[i2].pos=pGotoLabelSchedule[i2+1].pos;
-                }
-                i--;
-                continue;
+                it = compiler.codeGenerator.gotoLabelSchedules.erase( it );
+            }
+            else
+            {
+                it++;
             }
         }
@@ -552 +545 @@
 
                 //書き込みスケジュール
-                for(i=0;i<GotoLabelScheduleNum;i++){
-                    if(pGotoLabelSchedule[i].pName==0&&
-                        pGotoLabelSchedule[i].line==i3){
-                        *((long *)(OpBuffer+pGotoLabelSchedule[i].pos))=obp-(pGotoLabelSchedule[i].pos+sizeof(long));
-
+                std::vector<GotoLabelSchedule>::iterator it = compiler.codeGenerator.gotoLabelSchedules.begin();
+                while( it != compiler.codeGenerator.gotoLabelSchedules.end() )
+                {
+                    if( it->GetName().size() == 0 && it->GetLineNum() == i3 )
+                    {
+                        *((long *)( OpBuffer + it->GetNativeCodePos() ))=obp-(it->GetNativeCodePos()+sizeof(long));
+                        
                         //詰める
-                        GotoLabelScheduleNum--;
-                        for(i2=i;i2<GotoLabelScheduleNum;i2++){
-                            pGotoLabelSchedule[i2].pName=pGotoLabelSchedule[i2+1].pName;
-                            pGotoLabelSchedule[i2].line=pGotoLabelSchedule[i2+1].line;
-                            pGotoLabelSchedule[i2].pos=pGotoLabelSchedule[i2+1].pos;
-                        }
-                        i--;
+                        it = compiler.codeGenerator.gotoLabelSchedules.erase( it );
+                    }
+                    else
+                    {
+                        it++;
                     }
                 }

trunk/abdev/BasicCompiler_Common/include/CodeGenerator.h

@@ -12 +12 @@
 void ReallocNativeCodeBuffer();
 
+//Goto未知ラベル
+class GotoLabelSchedule
+{
+    std::string name;
+    int line;
+    int nativeCodePos;
+    int sourceCodePos;
+public:
+    GotoLabelSchedule( const std::string &name, int nativeCodePos, int sourceCodePos )
+        : name( name )
+        , line( -1 )
+        , nativeCodePos( nativeCodePos )
+        , sourceCodePos( sourceCodePos )
+    {
+    }
+    GotoLabelSchedule( int line, int nativeCodePos, int sourceCodePos )
+        : line( line )
+        , nativeCodePos( nativeCodePos )
+        , sourceCodePos( sourceCodePos )
+    {
+    }
+    const std::string &GetName() const
+    {
+        return name;
+    }
+    int GetLineNum() const
+    {
+        return line;
+    }
+    int GetNativeCodePos() const
+    {
+        return nativeCodePos;
+    }
+    int GetSourceCodePos() const
+    {
+        return sourceCodePos;
+    }
+};
+
 class CodeGenerator
 {
@@ -61 +100 @@
 
 public:
+
+    // Gotoスケジュールの管理
+    std::vector<GotoLabelSchedule> gotoLabelSchedules;
 
     CodeGenerator()
@@ -141 +183 @@
     const PertialSchedule *op_jmp( long offset, int op_size = sizeof(char), bool isPertialSchedule = false, bool isSelfOpcodeOffset = false );
     void op_jmp_continue();
+    void op_jmp_goto_schedule( const GotoLabelSchedule &gotoLabelSchedule );
 
 

trunk/abdev/BasicCompiler_Common/src/CommonCodeGenerator.cpp

@@ -202 +202 @@
     op_jmp( GetContinueCodePosOld()-obp, sizeof(long), false, true );
 }
+void CodeGenerator::op_jmp_goto_schedule( const GotoLabelSchedule &gotoLabelSchedule )
+{
+    // オペコード
+    pNativeCode->Put( (char)0xE9 );
+
+    gotoLabelSchedules.push_back( gotoLabelSchedule );
+
+    pNativeCode->Put( (long)0 );
+}