Changeset 251 in dev for trunk/abdev/BasicCompiler_Common

Timestamp:

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

Author:

dai_9181

Message:

 

Location:

trunk/abdev/BasicCompiler_Common

Files:

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

trunk/abdev/BasicCompiler_Common/include/CodeGenerator.h

@@ -255 +255 @@
     void CheckUnresolveSchedule();
 
+    void opfix( const PertialSchedule *pPertialSchedule, long newValue );
     void opfix_JmpPertialSchedule( const PertialSchedule *pPertialSchedule );
 
@@ -365 +366 @@
     /////////////////////////////////////////////////////////////////
 private:
-    void set_mod_rm_sib_disp(char mod,int reg,int scale,int index_reg,int base_reg,long disp, Schedule::Type scheduleType = Schedule::None );
+    const PertialSchedule *set_mod_rm_sib_disp(char mod,int reg,int scale,int index_reg,int base_reg,long disp, Schedule::Type scheduleType, bool isPertialSchedule );
     void __op_format(char op_prefix,char opcode,int reg);
-    void __op_format(char op_prefix,char opcode1,char opcode2,int reg,int base_reg,int offset,char mod, Schedule::Type scheduleType = Schedule::None );
+    const PertialSchedule *__op_format(char op_prefix,char opcode1,char opcode2,int reg,int base_reg,int offset,char mod, Schedule::Type scheduleType = Schedule::None, bool isPertialSchedule = false );
 public:
     void op_mov_MV          ( int op_size, int base_reg, long offset, Schedule::Type offsetScheduleType, long value, Schedule::Type valueScheduleType = Schedule::None );
@@ -409 +410 @@
     void op_push_V( long data, Schedule::Type scheduleType = Schedule::None );
     void op_push_M( int base_reg );
-    void op_push_M( int base_reg, long offset, Schedule::Type scheduleType = Schedule::None );
+    const PertialSchedule *op_push_M( int base_reg, long offset, Schedule::Type scheduleType = Schedule::None, bool isPertialSchedule = false );
     void op_pop(int reg = REG_NON);
     void op_add_esp(long num);

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();
     }