Changeset 246 in dev for trunk/abdev/BasicCompiler32

Timestamp:

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

Author:

dai_9181

Message:

 

Location:

trunk/abdev/BasicCompiler32

Files:

• Compile_ProcOp.cpp (modified) (2 diffs)
• Compile_Statement.cpp (modified) (6 diffs)
• MakePeHdr.cpp (modified) (2 diffs)
• Opcode.h (modified) (1 diff)

trunk/abdev/BasicCompiler32/Compile_ProcOp.cpp

@@ -425 +425 @@
 
     //Gotoラベルスケジュール
-    extern GOTOLABELSCHEDULE *pGotoLabelSchedule;
-    extern int GotoLabelScheduleNum;
-    pGotoLabelSchedule=(GOTOLABELSCHEDULE *)HeapAlloc(hHeap,0,1);
-    GotoLabelScheduleNum=0;
+    compiler.codeGenerator.gotoLabelSchedules.clear();
 
     //With情報のメモリを確保
@@ -608 +605 @@
     HeapDefaultFree(pLabelNames);
 
-    //Goto未知ラベルスケジュールを解放
-    for(i3=0;i3<GotoLabelScheduleNum;i3++){
-        if(pGotoLabelSchedule[i3].pName){
-            SetError(6,pGotoLabelSchedule[i3].pName,pGotoLabelSchedule[i3].now_cp);
-            HeapDefaultFree(pGotoLabelSchedule[i3].pName);
-        }
-        else{
-            sprintf(temporary,"%d",pGotoLabelSchedule[i3].line);
-            SetError(6,temporary,pGotoLabelSchedule[i3].now_cp);
-        }
-    }
-    HeapDefaultFree(pGotoLabelSchedule);
-
     //With情報のメモリを解放
     for(i3=0;i3<WithInfo.num;i3++){

trunk/abdev/BasicCompiler32/Compile_Statement.cpp

@@ -300 +300 @@
 void OpcodeGoto(char *Parameter){
     extern HANDLE hHeap;
-    extern GOTOLABELSCHEDULE *pGotoLabelSchedule;
-    extern int GotoLabelScheduleNum;
     int i,LineNum;
 
@@ -307 +305 @@
         i=GetLabelAddress(Parameter+1,0);
 
-        //jmp ...
-        OpBuffer[obp++]=(char)0xE9;
-        if(i==-1){
-            pGotoLabelSchedule=(GOTOLABELSCHEDULE *)HeapReAlloc(hHeap,0,pGotoLabelSchedule,(GotoLabelScheduleNum+1)*sizeof(GOTOLABELSCHEDULE));
-            pGotoLabelSchedule[GotoLabelScheduleNum].pName=(char *)HeapAlloc(hHeap,0,lstrlen(Parameter+1)+1);
-            lstrcpy(pGotoLabelSchedule[GotoLabelScheduleNum].pName,Parameter+1);
-            pGotoLabelSchedule[GotoLabelScheduleNum].pos=obp;
-            pGotoLabelSchedule[GotoLabelScheduleNum].now_cp=cp;
-            GotoLabelScheduleNum++;
-        }
-        *((long *)(OpBuffer+obp))=i-(obp+sizeof(long));
-        obp+=sizeof(long);
+        if( i == -1 )
+        {
+            //jmp ...(schedule)
+            compiler.codeGenerator.op_jmp_goto_schedule( GotoLabelSchedule( (const std::string)(Parameter + 1), obp, cp ) );
+        }
+        else
+        {
+            //jmp ...
+            compiler.codeGenerator.op_jmp( i-obp, sizeof(long), false, true );
+        }
     }
     else{
@@ -324 +320 @@
         i=GetLabelAddress(0,LineNum);
 
-        //jmp ...
-        OpBuffer[obp++]=(char)0xE9;
-        if(i==-1){
-            pGotoLabelSchedule=(GOTOLABELSCHEDULE *)HeapReAlloc(hHeap,0,pGotoLabelSchedule,(GotoLabelScheduleNum+1)*sizeof(GOTOLABELSCHEDULE));
-            pGotoLabelSchedule[GotoLabelScheduleNum].pName=0;
-            pGotoLabelSchedule[GotoLabelScheduleNum].line=LineNum;
-            pGotoLabelSchedule[GotoLabelScheduleNum].pos=obp;
-            pGotoLabelSchedule[GotoLabelScheduleNum].now_cp=cp;
-            GotoLabelScheduleNum++;
-        }
-        *((long *)(OpBuffer+obp))=i-(obp+sizeof(long));
-        obp+=sizeof(long);
+        if( i == -1 )
+        {
+            //jmp ...(schedule)
+            compiler.codeGenerator.op_jmp_goto_schedule( GotoLabelSchedule( LineNum, obp, cp ) );
+        }
+        else
+        {
+            //jmp ...
+            compiler.codeGenerator.op_jmp( i-obp, sizeof(long), false, true );
+        }
     }
 }
@@ -1126 +1120 @@
 void OpcodeGosub(char *Parameter){
     extern HANDLE hHeap;
-    extern GOTOLABELSCHEDULE *pGotoLabelSchedule;
-    extern int GotoLabelScheduleNum;
     int i,LineNum;
 
@@ -1133 +1125 @@
         i=GetLabelAddress(Parameter+1,0);
 
-        //call ...
-        OpBuffer[obp++]=(char)0xE8;
-        if(i==-1){
-            pGotoLabelSchedule=(GOTOLABELSCHEDULE *)HeapReAlloc(hHeap,0,pGotoLabelSchedule,(GotoLabelScheduleNum+1)*sizeof(GOTOLABELSCHEDULE));
-            pGotoLabelSchedule[GotoLabelScheduleNum].pName=(char *)HeapAlloc(hHeap,0,lstrlen(Parameter+1)+1);
-            lstrcpy(pGotoLabelSchedule[GotoLabelScheduleNum].pName,Parameter+1);
-            pGotoLabelSchedule[GotoLabelScheduleNum].pos=obp;
-            pGotoLabelSchedule[GotoLabelScheduleNum].now_cp=cp;
-            GotoLabelScheduleNum++;
-        }
-        *((long *)(OpBuffer+obp))=i-(obp+sizeof(long));
-        obp+=sizeof(long);
+        if( i == -1 )
+        {
+            //jmp ...(schedule)
+            compiler.codeGenerator.op_jmp_goto_schedule( GotoLabelSchedule( (const std::string)(Parameter + 1), obp, cp ) );
+        }
+        else
+        {
+            //jmp ...
+            compiler.codeGenerator.op_jmp( i-obp, sizeof(long), false, true );
+        }
     }
     else{
@@ -1150 +1140 @@
         i=GetLabelAddress(0,LineNum);
 
-        //call ...
-        OpBuffer[obp++]=(char)0xE8;
-        if(i==-1){
-            pGotoLabelSchedule=(GOTOLABELSCHEDULE *)HeapReAlloc(hHeap,0,pGotoLabelSchedule,(GotoLabelScheduleNum+1)*sizeof(GOTOLABELSCHEDULE));
-            pGotoLabelSchedule[GotoLabelScheduleNum].pName=0;
-            pGotoLabelSchedule[GotoLabelScheduleNum].line=LineNum;
-            pGotoLabelSchedule[GotoLabelScheduleNum].pos=obp;
-            pGotoLabelSchedule[GotoLabelScheduleNum].now_cp=cp;
-            GotoLabelScheduleNum++;
-        }
-        *((long *)(OpBuffer+obp))=i-(obp+sizeof(long));
-        obp+=sizeof(long);
+        if( i == -1 )
+        {
+            //jmp ...(schedule)
+            compiler.codeGenerator.op_jmp_goto_schedule( GotoLabelSchedule( LineNum, obp, cp ) );
+        }
+        else
+        {
+            //jmp ...
+            compiler.codeGenerator.op_jmp( i-obp, sizeof(long), false, true );
+        }
     }
 }

trunk/abdev/BasicCompiler32/MakePeHdr.cpp

@@ -422 +422 @@
 
         //Gotoラベルスケジュール
-        extern GOTOLABELSCHEDULE *pGotoLabelSchedule;
-        extern int GotoLabelScheduleNum;
-        pGotoLabelSchedule=(GOTOLABELSCHEDULE *)HeapAlloc(hHeap,0,1);
-        GotoLabelScheduleNum=0;
+        compiler.codeGenerator.gotoLabelSchedules.clear();
 
         //With情報のメモリを確保
@@ -473 +470 @@
         HeapDefaultFree(pLabelNames);
 
-        //Goto未知ラベルスケジュールを解放
-        for(i=0;i<GotoLabelScheduleNum;i++){
-            if(pGotoLabelSchedule[i].pName){
-                SetError(6,pGotoLabelSchedule[i].pName,pGotoLabelSchedule[i].now_cp);
-                HeapDefaultFree(pGotoLabelSchedule[i].pName);
+        //Goto未知ラベルスケジュールが存在したらエラーにする
+        BOOST_FOREACH( const GotoLabelSchedule &gotoLabelSchedule, compiler.codeGenerator.gotoLabelSchedules )
+        {
+            if(gotoLabelSchedule.GetName().size()>0){
+                SetError(6,gotoLabelSchedule.GetName(),gotoLabelSchedule.GetSourceCodePos());
             }
             else{
-                sprintf(temporary,"%d",pGotoLabelSchedule[i].line);
-                SetError(6,temporary,pGotoLabelSchedule[i].now_cp);
+                sprintf(temporary,"%d",gotoLabelSchedule.GetLineNum());
+                SetError(6,temporary,gotoLabelSchedule.GetSourceCodePos());
             }
         }
-        HeapDefaultFree(pGotoLabelSchedule);
 
 

trunk/abdev/BasicCompiler32/Opcode.h

@@ -27 +27 @@
     int line;
     DWORD address;
-};
-
-//Goto未知ラベル
-struct GOTOLABELSCHEDULE{
-    char *pName;
-    int line;
-    DWORD pos;
-    DWORD now_cp;
 };