Changeset 228 in dev for trunk/abdev/BasicCompiler_Common/include

Timestamp:

Jul 23, 2007, 3:24:20 AM (17 years ago)

Author:

dai_9181

Message:

 

Location:

trunk/abdev/BasicCompiler_Common/include

Files:

• CodeGenerator.h (modified) (5 diffs)
• NativeCode.h (modified) (2 diffs)

trunk/abdev/BasicCompiler_Common/include/CodeGenerator.h

@@ -32 +32 @@
 
 #ifdef _AMD64_
+    /////////////////////////////////////////////////////////////////
+    // 64ビット
+    /////////////////////////////////////////////////////////////////
 private:
     void set_rex(int op_size,int reg,int index_reg,int base_reg);
-    void set_mod_rm_sib_disp(char mod,int reg,int scale,int index_reg,int base_reg,long disp);
-    void __op_format(int op_size,char op_prefix,char opcode1,char opcode2,int reg,int base_reg,long offset,char mod);
+    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 );
+    void __op_format(int op_size,char op_prefix,char opcode1,char opcode2,int reg,int base_reg,long offset,char mod, Schedule::Type scheduleType = Schedule::None );
+    void __jmp_op_format( char opcode, long offset, int op_size );
 public:
     void op_mov_RV                  (int op_size,int reg,long i32data);
     void op_mov_RV64                (int reg,_int64 i64data);
-    void op_mov_RM                  (int op_size,int reg,int base_reg,long offset,char mod);
-    void op_mov_RM_ex               (int op_size,int reg,int base_reg1,int base_reg2,long offset,BOOL bUseOffset);
+    void op_mov_RM                  (int op_size,int reg,int base_reg,long offset,char mod, Schedule::Type scheduleType = Schedule::None );
+    void op_mov_RM_ex               (int op_size,int reg,int base_reg1,int base_reg2,long offset,BOOL bUseOffset, Schedule::Type scheduleType = Schedule::None );
     void op_mov_MR                  (int op_size,int reg,int base_reg,long offset,char mod);
     void op_mov_MR_ex               (int op_size,int reg,int base_reg1,int base_reg2,long offset,BOOL bUseOffset);
@@ -53 +57 @@
     void op_movsx32_FromReg8        (int reg32,int reg8);
     void op_movsx16_FromReg8        (int reg32,int reg8);
+    void op_cqo                     ();
     void op_inc                     (int reg);
     void op_dec                     (int reg);
-    void op_add_RM                  (int op_size,int reg,int base_reg,int offset,char mod);
+    void op_add_RM                  (int op_size,int reg,int base_reg,int offset,char mod, Schedule::Type scheduleType = Schedule::None );
     void op_add_RV                  (int reg,long offset);
-    void op_add64_reg               (int reg1,int reg2);
+    void op_add_RR              (int reg1,int reg2);
     void op_add32_reg               (int reg1,int reg2);
     void op_sub_RV                  (int op_size,int reg,long i32data);
@@ -104 +109 @@
     void op_fld_ptr_esp(int type);
     void op_zero_reg(int reg);
+    void op_jle( long offset, int op_size = sizeof(char) );
+    void op_jbe( long offset, int op_size = sizeof(char) );
+    void op_jge( long offset, int op_size = sizeof(char) );
+    void op_jae( long offset, int op_size = sizeof(char) );
+    void op_jl( long offset, int op_size = sizeof(char) );
+    void op_jb( long offset, int op_size = sizeof(char) );
+    void op_jg( long offset, int op_size = sizeof(char) );
+    void op_ja( long offset, int op_size = sizeof(char) );
+    void op_jne( long offset, int op_size = sizeof(char) );
+    void op_je( long offset, int op_size = sizeof(char) );
+    void op_jmp( long offset, int op_size = sizeof(char) );
     void op_call( const UserProc *pUserProc );
     void op_call( const DllProc *pDllProc );
@@ -109 +125 @@
 
 #else
+    /////////////////////////////////////////////////////////////////
+    // 32ビット
+    /////////////////////////////////////////////////////////////////
 private:
     void set_mod_rm_sib_disp(char mod,int reg,int scale,int index_reg,int base_reg,long disp);
@@ -200 +219 @@
         pNativeCode->Put( c4 );
     }
+    void PutOld( char c1, char c2, char c3, long l )
+    {
+        pNativeCode->Put( c1 );
+        pNativeCode->Put( c2 );
+        pNativeCode->Put( c3 );
+        pNativeCode->Put( l );
+    }
     void PutOld( char c1, char c2, char c3, char c4, char c5 )
     {

trunk/abdev/BasicCompiler_Common/include/NativeCode.h

@@ -3 +3 @@
 #include <vector>
 
+#include <jenga/include/common/Exception.h>
+
 #include <BoostSerializationSupport.h>
+
+void AddLocalVarAddrSchedule();
 
 class Schedule
@@ -156 +160 @@
 
         // 未完成
+        switch( scheduleType )
+        {
+        case Schedule::None:
+            break;
+        case Schedule::GlobalVar:
+            extern CSchedule *pobj_GlobalVarSchedule;
+            pobj_GlobalVarSchedule->add();
+            break;
+        case Schedule::LocalVar:
+            AddLocalVarAddrSchedule();
+            break;
+        case Schedule::Relocation:
+            break;
+        default:
+            Jenga::Throw( "scheduleTypeが無効な値を保持している" );
+            break;
+        }
         extern char *OpBuffer;
         extern int obp;