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

Timestamp:

Jul 27, 2007, 12:06:11 AM (17 years ago)

Author:

dai_9181

Message:

 

File:

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

trunk/abdev/BasicCompiler_Common/src/CommonCodeGenerator.cpp

@@ -23 +23 @@
         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) )
             {
-                pNativeCode->Overwrite( pPertialSchedule->GetCodePos(), (char)( pNativeCode->GetSize() - (pPertialSchedule->GetCodePos()+1) ) );
+                if( newValue < -128 || 127 < newValue )
+                {
+                    // 範囲外
+                    SetError();
+                }
+
+                pNativeCode->Overwrite( pPertialSchedule->GetCodePos(), (char)newValue );
 
                 // TODO: 未完成（用が無くなったら消す）
-                extern int obp;
-                pNativeCode->OverwriteOld( pPertialSchedule->GetObpOld(), (char)( obp - (pPertialSchedule->GetObpOld()+1) ) );
+                pNativeCode->OverwriteOld( pPertialSchedule->GetObpOld(), (char)newValueOld );
+            }
+            else if( pPertialSchedule->GetTypeSize() == sizeof(long) )
+            {
+                pNativeCode->Overwrite( pPertialSchedule->GetCodePos(), newValue );
+
+                // TODO: 未完成（用が無くなったら消す）
+                pNativeCode->OverwriteOld( pPertialSchedule->GetObpOld(), newValueOld );
             }
             else
@@ -52 +69 @@
     }
 }
-CodeGenerator::PertialSchedule *CodeGenerator::__jmp_op_format( char opcode, long offset, int op_size, bool isPertialSchedule )
-{
-    pNativeCode->Put( opcode );
+CodeGenerator::PertialSchedule *CodeGenerator::__jmp_op_format( char opcode, long offset, int op_size, bool isPertialSchedule, bool isSelfOpcodeOffset )
+{
+    long beginCodePos = pNativeCode->GetSize();
+    {
+        // TODO: 未完成
+        extern int obp;
+        beginCodePos = obp;
+    }
+
+    if( opcode == (char)0xEB )
+    {
+        // jmp命令のとき
+        if( op_size == sizeof(char) )
+        {
+            pNativeCode->Put( (char)opcode );
+        }
+        else if( op_size == sizeof(long) )
+        {
+            pNativeCode->Put( (char)0xE9 );
+        }
+        else
+        {
+            SetError();
+        }
+    }
+    else
+    {
+        if( op_size == sizeof(char) )
+        {
+            pNativeCode->Put( (char)((char)0x70 | opcode) );
+        }
+        else if( op_size == sizeof(long) )
+        {
+            pNativeCode->Put( (char)0x0F );
+            pNativeCode->Put( (char)((char)0x80 | opcode) );
+        }
+        else
+        {
+            SetError();
+        }
+    }
 
     PertialSchedule *pPertialSchedule = NULL;
@@ -63 +118 @@
     }
 
+    if( isSelfOpcodeOffset )
+    {
+        // 自分自身の命令サイズを考慮する場合
+        //offset += ( pNativeCode->GetSize() - beginCodePos ) + op_size;
+
+        // TODO: 未完成
+        extern int obp;
+        offset -= ( obp - beginCodePos ) + op_size;
+    }
+
     if( op_size == sizeof(char) )
     {
@@ -69 +134 @@
     else if( op_size == sizeof(long) )
     {
+        pNativeCode->Put( offset );
+    }
+    else
+    {
         SetError();
-        pNativeCode->Put( offset );
-    }
-    else
-    {
-        SetError();
     }
 
@@ -81 +145 @@
 CodeGenerator::PertialSchedule *CodeGenerator::op_jle( long offset, int op_size, bool isPertialSchedule )
 {
-    return __jmp_op_format( (char)0x7E, offset, op_size, isPertialSchedule );
+    return __jmp_op_format( (char)0x0E, offset, op_size, isPertialSchedule );
 }
 CodeGenerator::PertialSchedule *CodeGenerator::op_jbe( long offset, int op_size, bool isPertialSchedule )
 {
-    return __jmp_op_format( (char)0x76, offset, op_size, isPertialSchedule );
+    return __jmp_op_format( (char)0x06, offset, op_size, isPertialSchedule );
 }
 CodeGenerator::PertialSchedule *CodeGenerator::op_jge( long offset, int op_size, bool isPertialSchedule )
 {
-    return __jmp_op_format( (char)0x7D, offset, op_size, isPertialSchedule );
+    return __jmp_op_format( (char)0x0D, offset, op_size, isPertialSchedule );
 }
 CodeGenerator::PertialSchedule *CodeGenerator::op_jae( long offset, int op_size, bool isPertialSchedule )
 {
-    return __jmp_op_format( (char)0x73, offset, op_size, isPertialSchedule );
+    return __jmp_op_format( (char)0x03, offset, op_size, isPertialSchedule );
 }
 CodeGenerator::PertialSchedule *CodeGenerator::op_jl( long offset, int op_size, bool isPertialSchedule )
 {
-    return __jmp_op_format( (char)0x7C, offset, op_size, isPertialSchedule );
+    return __jmp_op_format( (char)0x0C, offset, op_size, isPertialSchedule );
 }
 CodeGenerator::PertialSchedule *CodeGenerator::op_jb( long offset, int op_size, bool isPertialSchedule )
 {
-    return __jmp_op_format( (char)0x72, offset, op_size, isPertialSchedule );
+    return __jmp_op_format( (char)0x02, offset, op_size, isPertialSchedule );
 }
 CodeGenerator::PertialSchedule *CodeGenerator::op_jg( long offset, int op_size, bool isPertialSchedule )
 {
-    return __jmp_op_format( (char)0x7F, offset, op_size, isPertialSchedule );
+    return __jmp_op_format( (char)0x0F, offset, op_size, isPertialSchedule );
 }
 CodeGenerator::PertialSchedule *CodeGenerator::op_ja( long offset, int op_size, bool isPertialSchedule )
 {
-    return __jmp_op_format( (char)0x77, offset, op_size, isPertialSchedule );
+    return __jmp_op_format( (char)0x07, offset, op_size, isPertialSchedule );
 }
 CodeGenerator::PertialSchedule *CodeGenerator::op_jne( long offset, int op_size, bool isPertialSchedule )
 {
-    return __jmp_op_format( (char)0x75, offset, op_size, isPertialSchedule );
+    return __jmp_op_format( (char)0x05, offset, op_size, isPertialSchedule );
 }
 CodeGenerator::PertialSchedule *CodeGenerator::op_je( long offset, int op_size, bool isPertialSchedule )
 {
-    return __jmp_op_format( (char)0x74, offset, op_size, isPertialSchedule );
-}
-CodeGenerator::PertialSchedule *CodeGenerator::op_jmp( long offset, int op_size, bool isPertialSchedule )
-{
-    return __jmp_op_format( (char)0xEB, offset, op_size, isPertialSchedule );
-}
+    return __jmp_op_format( (char)0x04, offset, op_size, isPertialSchedule );
+}
+CodeGenerator::PertialSchedule *CodeGenerator::op_jmp( long offset, int op_size, bool isPertialSchedule, bool isSelfOpcodeOffset )
+{
+    return __jmp_op_format( (char)0xEB, offset, op_size, isPertialSchedule, isSelfOpcodeOffset );
+}
+void CodeGenerator::op_jmp_continue()
+{
+    //op_jmp( GetContinueCodePos()-(pNativeCode->GetSize()+sizeof(long)), sizeof(long) );
+
+    // TODO: 未完成（OpBuffer/obp廃止が整ったら上記のコードを有効にすべし）
+
+    if( GetContinueCodePosOld() == -1 )
+    {
+        SetError(12,"Continue",cp);
+        return;
+    }
+
+    extern int obp;
+    op_jmp( GetContinueCodePosOld()-obp, sizeof(long), false, true );
+}