Changeset 253 in dev for trunk/abdev/BasicCompiler_Common/Compile.cpp

Timestamp:

Jul 30, 2007, 4:12:54 PM (17 years ago)

Author:

dai_9181

Message:

 

File:

• trunk/abdev/BasicCompiler_Common/Compile.cpp (modified) (5 diffs)

trunk/abdev/BasicCompiler_Common/Compile.cpp

@@ -88 +88 @@
     extern LINEINFO *pLineInfo;
     if(MaxLineInfoNum){
+        extern int obp;
         if(pLineInfo[MaxLineInfoNum-1].TopObp==obp){
             pLineInfo[MaxLineInfoNum-1].TopCp=cp;
@@ -95 +96 @@
     pLineInfo=(LINEINFO *)HeapReAlloc(hHeap,0,pLineInfo,(MaxLineInfoNum+1)*sizeof(LINEINFO));
     pLineInfo[MaxLineInfoNum].TopCp=cp;
+    extern int obp;
     pLineInfo[MaxLineInfoNum].TopObp=obp;
 
@@ -123 +125 @@
         pLabelNames[MaxLabelNum].pName=(char *)HeapAlloc(hHeap,0,lstrlen(Command+1)+1);
         lstrcpy(pLabelNames[MaxLabelNum].pName,Command+1);
+        extern int obp;
         pLabelNames[MaxLabelNum].address=obp;
         MaxLabelNum++;
 
         //書き込みスケジュール
-        std::vector<GotoLabelSchedule>::iterator it = compiler.codeGenerator.gotoLabelSchedules.begin();
+        GotoLabelSchedules::iterator it = compiler.codeGenerator.gotoLabelSchedules.begin();
         while( it != compiler.codeGenerator.gotoLabelSchedules.end() )
         {
-            if( it->GetName() == Command+1 )
+            if( (*it)->GetName() == Command+1 )
             {
-                *((long *)( OpBuffer + it->GetNativeCodePos() ))=obp-(it->GetNativeCodePos()+sizeof(long));
+                compiler.codeGenerator.opfix_JmpPertialSchedule( (*it) );
                 
                 //詰める
@@ -335 +338 @@
             extern BOOL bDebugCompile;
             //int 3
-            if(bDebugCompile) OpBuffer[obp++]=(char)0xCC;
+            if(bDebugCompile)
+            {
+                breakpoint;
+            }
 #if defined(_DEBUG)
-            else OpBuffer[obp++]=(char)0xCC;
+            else
+            {
+                breakpoint;
+            }
 #endif
             break;
@@ -532 +541 @@
                 pLabelNames[MaxLabelNum].pName=0;
                 pLabelNames[MaxLabelNum].line=i3;
+                extern int obp;
                 pLabelNames[MaxLabelNum].address=obp;
                 MaxLabelNum++;
 
                 //書き込みスケジュール
-                std::vector<GotoLabelSchedule>::iterator it = compiler.codeGenerator.gotoLabelSchedules.begin();
+                GotoLabelSchedules::iterator it = compiler.codeGenerator.gotoLabelSchedules.begin();
                 while( it != compiler.codeGenerator.gotoLabelSchedules.end() )
                 {
-                    if( it->GetName().size() == 0 && it->GetLineNum() == i3 )
+                    if( (*it)->GetName().size() == 0 && (*it)->GetLineNum() == i3 )
                     {
-                        *((long *)( OpBuffer + it->GetNativeCodePos() ))=obp-(it->GetNativeCodePos()+sizeof(long));
-                        
+                        compiler.codeGenerator.opfix_JmpPertialSchedule( (*it) );
+
                         //詰める
                         it = compiler.codeGenerator.gotoLabelSchedules.erase( it );