Changeset 251 in dev for trunk/abdev/BasicCompiler_Common/src/CommonCodeGenerator.cpp

Timestamp:

Jul 30, 2007, 2:00:45 AM (17 years ago)

Author:

dai_9181

Message:

 

File:

• trunk/abdev/BasicCompiler_Common/src/CommonCodeGenerator.cpp (modified) (4 diffs)

trunk/abdev/BasicCompiler_Common/src/CommonCodeGenerator.cpp

@@ -27 +27 @@
 }
 
-
-// 分岐関連
-void CodeGenerator::opfix_JmpPertialSchedule( const PertialSchedule *pPertialSchedule )
+void CodeGenerator::opfix( const PertialSchedule *pPertialSchedule, long newValue )
 {
     bool isSuccessful = false;
@@ -38 +36 @@
         if( (*it) == pPertialSchedule )
         {
-            long newValue = pNativeCode->GetSize() - (pPertialSchedule->GetCodePos()+pPertialSchedule->GetTypeSize());
-
-            extern int obp;
-            long newValueOld = obp - (pPertialSchedule->GetObpOld()+pPertialSchedule->GetTypeSize());
-
             if( pPertialSchedule->GetTypeSize() == sizeof(char) )
             {
@@ -54 +47 @@
 
                 // TODO: 未完成（用が無くなったら消す）
+                pNativeCode->OverwriteOld( pPertialSchedule->GetObpOld(), (char)newValue );
+            }
+            else if( pPertialSchedule->GetTypeSize() == sizeof(long) )
+            {
+                pNativeCode->Overwrite( pPertialSchedule->GetCodePos(), newValue );
+
+                // TODO: 未完成（用が無くなったら消す）
+                pNativeCode->OverwriteOld( pPertialSchedule->GetObpOld(), newValue );
+            }
+            else
+            {
+                SetError();
+            }
+
+            it = pertialSchedules.erase( it );
+            delete pPertialSchedule;
+
+            isSuccessful = true;
+        }
+        else
+        {
+            it++;
+        }
+    }
+
+    if( isSuccessful == false )
+    {
+        SetError();
+    }
+}
+
+
+// 分岐関連
+void CodeGenerator::opfix_JmpPertialSchedule( const PertialSchedule *pPertialSchedule )
+{
+    bool isSuccessful = false;
+
+    PertialSchedules::iterator it = pertialSchedules.begin();
+    while( it != pertialSchedules.end() )
+    {
+        if( (*it) == pPertialSchedule )
+        {
+            long newValue = pNativeCode->GetSize() - (pPertialSchedule->GetCodePos()+pPertialSchedule->GetTypeSize());
+
+            extern int obp;
+            long newValueOld = obp - (pPertialSchedule->GetObpOld()+pPertialSchedule->GetTypeSize());
+
+            if( pPertialSchedule->GetTypeSize() == sizeof(char) )
+            {
+                if( newValue < -128 || 127 < newValue )
+                {
+                    // 範囲外
+                    SetError();
+                }
+
+                pNativeCode->Overwrite( pPertialSchedule->GetCodePos(), (char)newValue );
+
+                // TODO: 未完成（用が無くなったら消す）
                 pNativeCode->OverwriteOld( pPertialSchedule->GetObpOld(), (char)newValueOld );
             }
@@ -130 +181 @@
     {
         pertialSchedules.push_back( new PertialSchedule( pNativeCode->GetSize(), op_size ) );
-        pPertialSchedule = pertialSchedules[pertialSchedules.size()-1];
+        pPertialSchedule = pertialSchedules.back();
     }