Changeset 245 in dev for trunk/abdev/BasicCompiler_Common

Timestamp:

Jul 27, 2007, 8:02:22 PM (17 years ago)

Author:

dai_9181

Message:

 

Location:

trunk/abdev/BasicCompiler_Common

Files:

• include/CodeGenerator.h (modified) (2 diffs)
• include/NativeCode.h (modified) (1 diff)
• src/CommonCodeGenerator.cpp (modified) (4 diffs)
• src/NativeCode.cpp (modified) (2 diffs)

trunk/abdev/BasicCompiler_Common/include/CodeGenerator.h

@@ -52 +52 @@
 
 private:
-
     // 部分スケジュールの管理
-    typedef std::vector<PertialSchedule *> PertialSchedules;
+    typedef std::vector<const PertialSchedule *> PertialSchedules;
     PertialSchedules pertialSchedules;
 
@@ -128 +127 @@
 
 private:
-    PertialSchedule *__jmp_op_format( char opcode, long offset, int op_size, bool isPertialSchedule = false, bool isSelfOpcodeOffset = false );
-public:
-    PertialSchedule *op_jle( long offset, int op_size = sizeof(char), bool isPertialSchedule = false );
-    PertialSchedule *op_jbe( long offset, int op_size = sizeof(char), bool isPertialSchedule = false );
-    PertialSchedule *op_jge( long offset, int op_size = sizeof(char), bool isPertialSchedule = false );
-    PertialSchedule *op_jae( long offset, int op_size = sizeof(char), bool isPertialSchedule = false );
-    PertialSchedule *op_jl( long offset, int op_size = sizeof(char), bool isPertialSchedule = false );
-    PertialSchedule *op_jb( long offset, int op_size = sizeof(char), bool isPertialSchedule = false );
-    PertialSchedule *op_jg( long offset, int op_size = sizeof(char), bool isPertialSchedule = false );
-    PertialSchedule *op_ja( long offset, int op_size = sizeof(char), bool isPertialSchedule = false );
-    PertialSchedule *op_jne( long offset, int op_size = sizeof(char), bool isPertialSchedule = false );
-    PertialSchedule *op_je( long offset, int op_size = sizeof(char), bool isPertialSchedule = false );
-    PertialSchedule *op_jmp( long offset, int op_size = sizeof(char), bool isPertialSchedule = false, bool isSelfOpcodeOffset = false );
+    const PertialSchedule *__jmp_op_format( char opcode, long offset, int op_size, bool isPertialSchedule = false, bool isSelfOpcodeOffset = false );
+public:
+    const PertialSchedule *op_jle( long offset, int op_size = sizeof(char), bool isPertialSchedule = false );
+    const PertialSchedule *op_jbe( long offset, int op_size = sizeof(char), bool isPertialSchedule = false );
+    const PertialSchedule *op_jge( long offset, int op_size = sizeof(char), bool isPertialSchedule = false );
+    const PertialSchedule *op_jae( long offset, int op_size = sizeof(char), bool isPertialSchedule = false );
+    const PertialSchedule *op_jl( long offset, int op_size = sizeof(char), bool isPertialSchedule = false );
+    const PertialSchedule *op_jb( long offset, int op_size = sizeof(char), bool isPertialSchedule = false );
+    const PertialSchedule *op_jg( long offset, int op_size = sizeof(char), bool isPertialSchedule = false );
+    const PertialSchedule *op_ja( long offset, int op_size = sizeof(char), bool isPertialSchedule = false );
+    const PertialSchedule *op_jne( long offset, int op_size = sizeof(char), bool isPertialSchedule = false );
+    const PertialSchedule *op_je( long offset, int op_size = sizeof(char), bool isPertialSchedule = false );
+    const PertialSchedule *op_jmp( long offset, int op_size = sizeof(char), bool isPertialSchedule = false, bool isSelfOpcodeOffset = false );
     void op_jmp_continue();
 

trunk/abdev/BasicCompiler_Common/include/NativeCode.h

@@ -241 +241 @@
         ObpPlus( sizeof(long) );
     }
-    void PutUserProcSchedule( const UserProc *pUserProc, bool isCall )
-    {
-        Schedule schedule( pUserProc, size );
-        if( isCall == false )
-        {
-            schedule.SpecifyAddressOf();
-        }
-        schedules.push_back( schedule );
-
-        *((long *)(codeBuffer+size))=0;
-        size += sizeof(long);
-
-
-
-        // 未完成
-        if( isCall )
-        {
-            pobj_SubAddrSchedule->add(pUserProc,1);
-        }
-        else
-        {
-            pobj_SubAddrSchedule->add(pUserProc,0);
-        }
-        extern char *OpBuffer;
-        extern int obp;
-        *((long *)(OpBuffer+obp))=0;
-        ObpPlus( sizeof(long) );
-    }
+    void PutUserProcSchedule( const UserProc *pUserProc, bool isCall );
     void Put( short s )
     {

trunk/abdev/BasicCompiler_Common/src/CommonCodeGenerator.cpp

@@ -53 +53 @@
             }
 
-            pertialSchedules.erase( it );
+            it = pertialSchedules.erase( it );
             delete pPertialSchedule;
 
@@ -69 +69 @@
     }
 }
-CodeGenerator::PertialSchedule *CodeGenerator::__jmp_op_format( char opcode, long offset, int op_size, bool isPertialSchedule, bool isSelfOpcodeOffset )
+const CodeGenerator::PertialSchedule *CodeGenerator::__jmp_op_format( char opcode, long offset, int op_size, bool isPertialSchedule, bool isSelfOpcodeOffset )
 {
     long beginCodePos = pNativeCode->GetSize();
@@ -111 +111 @@
     }
 
-    PertialSchedule *pPertialSchedule = NULL;
+    const PertialSchedule *pPertialSchedule = NULL;
     if( isPertialSchedule )
     {
@@ -143 +143 @@
     return pPertialSchedule;
 }
-CodeGenerator::PertialSchedule *CodeGenerator::op_jle( long offset, int op_size, bool isPertialSchedule )
+const CodeGenerator::PertialSchedule *CodeGenerator::op_jle( long offset, int op_size, bool isPertialSchedule )
 {
     return __jmp_op_format( (char)0x0E, offset, op_size, isPertialSchedule );
 }
-CodeGenerator::PertialSchedule *CodeGenerator::op_jbe( long offset, int op_size, bool isPertialSchedule )
+const CodeGenerator::PertialSchedule *CodeGenerator::op_jbe( long offset, int op_size, bool isPertialSchedule )
 {
     return __jmp_op_format( (char)0x06, offset, op_size, isPertialSchedule );
 }
-CodeGenerator::PertialSchedule *CodeGenerator::op_jge( long offset, int op_size, bool isPertialSchedule )
+const CodeGenerator::PertialSchedule *CodeGenerator::op_jge( long offset, int op_size, bool isPertialSchedule )
 {
     return __jmp_op_format( (char)0x0D, offset, op_size, isPertialSchedule );
 }
-CodeGenerator::PertialSchedule *CodeGenerator::op_jae( long offset, int op_size, bool isPertialSchedule )
+const CodeGenerator::PertialSchedule *CodeGenerator::op_jae( long offset, int op_size, bool isPertialSchedule )
 {
     return __jmp_op_format( (char)0x03, offset, op_size, isPertialSchedule );
 }
-CodeGenerator::PertialSchedule *CodeGenerator::op_jl( long offset, int op_size, bool isPertialSchedule )
+const CodeGenerator::PertialSchedule *CodeGenerator::op_jl( long offset, int op_size, bool isPertialSchedule )
 {
     return __jmp_op_format( (char)0x0C, offset, op_size, isPertialSchedule );
 }
-CodeGenerator::PertialSchedule *CodeGenerator::op_jb( long offset, int op_size, bool isPertialSchedule )
+const CodeGenerator::PertialSchedule *CodeGenerator::op_jb( long offset, int op_size, bool isPertialSchedule )
 {
     return __jmp_op_format( (char)0x02, offset, op_size, isPertialSchedule );
 }
-CodeGenerator::PertialSchedule *CodeGenerator::op_jg( long offset, int op_size, bool isPertialSchedule )
+const CodeGenerator::PertialSchedule *CodeGenerator::op_jg( long offset, int op_size, bool isPertialSchedule )
 {
     return __jmp_op_format( (char)0x0F, offset, op_size, isPertialSchedule );
 }
-CodeGenerator::PertialSchedule *CodeGenerator::op_ja( long offset, int op_size, bool isPertialSchedule )
+const CodeGenerator::PertialSchedule *CodeGenerator::op_ja( long offset, int op_size, bool isPertialSchedule )
 {
     return __jmp_op_format( (char)0x07, offset, op_size, isPertialSchedule );
 }
-CodeGenerator::PertialSchedule *CodeGenerator::op_jne( long offset, int op_size, bool isPertialSchedule )
+const CodeGenerator::PertialSchedule *CodeGenerator::op_jne( long offset, int op_size, bool isPertialSchedule )
 {
     return __jmp_op_format( (char)0x05, offset, op_size, isPertialSchedule );
 }
-CodeGenerator::PertialSchedule *CodeGenerator::op_je( long offset, int op_size, bool isPertialSchedule )
+const CodeGenerator::PertialSchedule *CodeGenerator::op_je( long offset, int op_size, bool 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 )
+const 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 );

trunk/abdev/BasicCompiler_Common/src/NativeCode.cpp

@@ -1 +1 @@
 #include "stdafx.h"
+
+#include <NativeCode.h>
+#include <Procedure.h>
 
 #define BREAK_EIP(checkEip)  (obp+0x00401000>=checkEip)
@@ -14 +17 @@
     }
 }
+
+void NativeCode::PutUserProcSchedule( const UserProc *pUserProc, bool isCall )
+{
+    pUserProc->Using();
+
+    Schedule schedule( pUserProc, size );
+    if( isCall == false )
+    {
+        schedule.SpecifyAddressOf();
+    }
+    schedules.push_back( schedule );
+
+    *((long *)(codeBuffer+size))=0;
+    size += sizeof(long);
+
+
+
+    // 未完成
+    if( isCall )
+    {
+        pobj_SubAddrSchedule->add(pUserProc,1);
+    }
+    else
+    {
+        pobj_SubAddrSchedule->add(pUserProc,0);
+    }
+    extern char *OpBuffer;
+    extern int obp;
+    *((long *)(OpBuffer+obp))=0;
+    ObpPlus( sizeof(long) );
+}