Changeset 250 in dev for trunk/abdev/BasicCompiler32/Compile_Statement.cpp

Timestamp:

Jul 29, 2007, 9:30:14 PM (17 years ago)

Author:

dai_9181

Message:

Selectステートメントのスケジュール機構をリファクタリング

File:

• trunk/abdev/BasicCompiler32/Compile_Statement.cpp (modified) (13 diffs)

trunk/abdev/BasicCompiler32/Compile_Statement.cpp

@@ -798 +798 @@
 }
 
-void AddCaseSchedule(void){
-    extern DWORD *pCaseSchedule;
-    extern int CaseScheduleNum;
-    extern HANDLE hHeap;
-
-    pCaseSchedule=(DWORD *)HeapReAlloc(hHeap,0,pCaseSchedule,(CaseScheduleNum+1)*sizeof(DWORD));
-    pCaseSchedule[CaseScheduleNum]=obp;
-    CaseScheduleNum++;
-}
-
-int CaseTypeSize;
+//Caseスケジュール
+class SelectSchedule
+{
+public:
+    SelectSchedule( int typeSize )
+        : typeSize( typeSize )
+        , nowCaseSchedule( 0 )
+    {
+    }
+
+    PertialSchedules casePertialSchedules;
+    int typeSize;
+    int nowCaseSchedule;
+};
+std::vector<SelectSchedule> selectSchedules;
+
 void OpcodeSelect(const char *lpszParms){
-    extern DWORD *pCaseSchedule;
-    extern int CaseScheduleNum;
-    extern int NowCaseSchedule;
-    extern int CaseTypeSize;
     extern HANDLE hHeap;
     extern char *basbuf;
     int i,i2,i3,sw,NowCaseCp;
     char temporary[VN_SIZE];
-
-    DWORD *temp_pCaseSchedule;
-    int temp_CaseScheduleNum;
-    int temp_NowCaseSchedule;
-    int temp_CaseTypeSize;
-
-    temp_pCaseSchedule=pCaseSchedule;
-    temp_CaseScheduleNum=CaseScheduleNum;
-    temp_NowCaseSchedule=NowCaseSchedule;
-    temp_CaseTypeSize=CaseTypeSize;
-    pCaseSchedule=(DWORD *)HeapAlloc(hHeap,0,1);
-    CaseScheduleNum=0;
-    NowCaseSchedule=0;
-
+    
     Type type1;
     if( !NumOpe(lpszParms,Type(), type1 ) ){
@@ -837 +825 @@
     }
 
-    CaseTypeSize = type1.GetSize();
-    if( CaseTypeSize < sizeof(long) ){
-        CaseTypeSize=sizeof(long);
+    selectSchedules.push_back( SelectSchedule( type1.GetSize() ) );
+
+    if( selectSchedules.back().typeSize < sizeof(long) ){
+        selectSchedules.back().typeSize = sizeof(long);
     }
 
     for(i=cp,sw=0;;i++){
         if(basbuf[i]=='\0'){
-            HeapDefaultFree(pCaseSchedule);
-            pCaseSchedule=temp_pCaseSchedule;
-            CaseScheduleNum=temp_CaseScheduleNum;
-            NowCaseSchedule=temp_NowCaseSchedule;
-            CaseTypeSize=temp_CaseTypeSize;
+            selectSchedules.pop_back();
             SetError(22,"Select",cp);
             return;
@@ -865 +850 @@
             if(sw==0){
                 //add esp,CaseTypeSize
-                compiler.codeGenerator.op_add_esp(CaseTypeSize);
+                compiler.codeGenerator.op_add_esp( selectSchedules.back().typeSize );
             }
             break;
@@ -957 +942 @@
 
                     //jne ...
-                    OpBuffer[obp++]=(char)0x0F;
-                    OpBuffer[obp++]=(char)0x85;
-                    AddCaseSchedule();
-                    obp+=sizeof(long);
+                    selectSchedules.back().casePertialSchedules.push_back(
+                        compiler.codeGenerator.op_jne( 0, sizeof(long), true )
+                    );
                 }
                 else if(type1.IsDouble()){
@@ -969 +953 @@
 
                     //add esp,CaseTypeSize
-                    compiler.codeGenerator.op_add_esp(CaseTypeSize);
+                    compiler.codeGenerator.op_add_esp(selectSchedules.back().typeSize);
 
                     //fld qword ptr[esp]
@@ -984 +968 @@
 
                     //jne ...
-                    OpBuffer[obp++]=(char)0x0F;
-                    OpBuffer[obp++]=(char)0x85;
-                    AddCaseSchedule();
-                    obp+=sizeof(long);
+                    selectSchedules.back().casePertialSchedules.push_back(
+                        compiler.codeGenerator.op_jne( 0, sizeof(long), true )
+                    );
                 }
                 else if(type1.IsSingle()){
@@ -996 +979 @@
 
                     //add esp,CaseTypeSize
-                    compiler.codeGenerator.op_add_esp(CaseTypeSize);
+                    compiler.codeGenerator.op_add_esp(selectSchedules.back().typeSize);
 
                     //fld dword ptr[esp]
@@ -1011 +994 @@
 
                     //jne ...
-                    OpBuffer[obp++]=(char)0x0F;
-                    OpBuffer[obp++]=(char)0x85;
-                    AddCaseSchedule();
-                    obp+=sizeof(long);
+                    selectSchedules.back().casePertialSchedules.push_back(
+                        compiler.codeGenerator.op_jne( 0, sizeof(long), true )
+                    );
                 }
                 else{
@@ -1029 +1011 @@
 
                     //je ...
-                    OpBuffer[obp++]=(char)0x0F;
-                    OpBuffer[obp++]=(char)0x84;
-                    AddCaseSchedule();
-                    obp+=sizeof(long);
+                    selectSchedules.back().casePertialSchedules.push_back(
+                        compiler.codeGenerator.op_je( 0, sizeof(long), true )
+                    );
                 }
 
@@ -1042 +1023 @@
 
             //jmp ...
-            OpBuffer[obp++]=(char)0xE9;
-            AddCaseSchedule();
-            obp+=sizeof(long);
+            selectSchedules.back().casePertialSchedules.push_back(
+                compiler.codeGenerator.op_jmp( 0, sizeof(long), true )
+            );
         }
     }
@@ -1055 +1036 @@
 
     //jmp EndSelect
-    OpBuffer[obp++]=(char)0xE9;
-    AddCaseSchedule();
-    obp+=sizeof(long);
+    selectSchedules.back().casePertialSchedules.push_back(
+        compiler.codeGenerator.op_jmp( 0, sizeof(long), true )
+    );
 
     //最終スケジュール
-    for(i=NowCaseSchedule;i<CaseScheduleNum;i++){
-        *(long *)(OpBuffer+pCaseSchedule[i])=obp-(pCaseSchedule[i]+sizeof(long));
-    }
-    HeapDefaultFree(pCaseSchedule);
+    for(i=selectSchedules.back().nowCaseSchedule;i<(int)selectSchedules.back().casePertialSchedules.size();i++){
+        compiler.codeGenerator.opfix_JmpPertialSchedule( selectSchedules.back().casePertialSchedules[i] );
+    }
 
     //レキシカルスコープをレベルダウン
     compiler.codeGenerator.lexicalScopes.End();
 
-    pCaseSchedule=temp_pCaseSchedule;
-    CaseScheduleNum=temp_CaseScheduleNum;
-    NowCaseSchedule=temp_NowCaseSchedule;
-    CaseTypeSize=temp_CaseTypeSize;
+    selectSchedules.pop_back();
 }
 void OpcodeCase(char *Parameter){
-    extern DWORD *pCaseSchedule;
-    extern int NowCaseSchedule;
-    extern int CaseTypeSize;
     int i;
 
-    if(!pCaseSchedule){
+    if(selectSchedules.back().typeSize==-1){
         SetError(30,"Case",cp);
         return;
@@ -1085 +1059 @@
 
     //jmp EndSelect
-    OpBuffer[obp++]=(char)0xE9;
-    AddCaseSchedule();
-    obp+=sizeof(long);
+    selectSchedules.back().casePertialSchedules.push_back(
+        compiler.codeGenerator.op_jmp( 0, sizeof(long), true )
+    );
 
     i=0;
     while(1){
         //Caseスケジュール
-        *(long *)(OpBuffer+pCaseSchedule[NowCaseSchedule])=obp-(pCaseSchedule[NowCaseSchedule]+sizeof(long));
-        NowCaseSchedule++;
+        compiler.codeGenerator.opfix_JmpPertialSchedule( selectSchedules.back().casePertialSchedules[selectSchedules.back().nowCaseSchedule] );
+        selectSchedules.back().nowCaseSchedule++;
 
         i=JumpOneParameter(Parameter,i);
@@ -1100 +1074 @@
 
     //add esp,CaseTypeSize
-    compiler.codeGenerator.op_add_esp(CaseTypeSize);
+    compiler.codeGenerator.op_add_esp(selectSchedules.back().typeSize);
 }