Changeset 225 in dev for trunk/abdev/BasicCompiler_Common

Timestamp:

Jul 21, 2007, 11:47:40 PM (17 years ago)

Author:

dai_9181

Message:

CodeGeneratorクラスのベースを実装

Location:

trunk/abdev/BasicCompiler_Common

Files:

• gc.cpp (modified) (2 diffs)
• include/CodeGenerator.h (modified) (1 diff)
• include/Compiler.h (modified) (2 diffs)
• include/NativeCode.h (modified) (5 diffs)
• include/Procedure.h (modified) (2 diffs)
• src/LexicalScopingImpl.cpp (modified) (2 diffs)

trunk/abdev/BasicCompiler_Common/gc.cpp

@@ -1 +1 @@
 #include "stdafx.h"
 
-#include "common.h"
+#include <Compiler.h>
 
 #ifdef _AMD64_
@@ -25 +25 @@
 
     //mov rax,rsp
-    op_mov_RR(REG_RAX,REG_RSP);
+    compiler.codeGenerator.op_mov_RR(REG_RAX,REG_RSP);
 
     //mov ptr[offset],rax/eax
-    op_mov_MR(PTR_SIZE,REG_RAX,0,(int)RelativeVar.offset,MOD_DISP32);
+    compiler.codeGenerator.op_mov_MR(PTR_SIZE,REG_RAX,0,(int)RelativeVar.offset,MOD_DISP32);
     obp-=sizeof(long);
     pobj_GlobalVarSchedule->add();

trunk/abdev/BasicCompiler_Common/include/CodeGenerator.h

@@ -1 +1 @@
 #pragma once
 
+#include <NativeCode.h>
+
+#ifdef _AMD64_
+#include "../../BasicCompiler64/MachineFixed.h"
+#else
+#include "../../BasicCompiler32/MachineFixed.h"
+#endif
+
+
 void ReallocNativeCodeBuffer();
+
+class CodeGenerator
+{
+    NativeCode *pNativeCode;
+
+    // XMLシリアライズ用
+private:
+    friend class boost::serialization::access;
+    template<class Archive> void serialize(Archive& ar, const unsigned int version)
+    {
+        ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP( NativeCode );
+    }
+
+public:
+
+    void Select( NativeCode &nativeCode )
+    {
+        pNativeCode = &nativeCode;
+    }
+
+#ifdef _AMD64_
+#else
+private:
+    void set_mod_rm_sib_disp(char mod,int reg,int scale,int index_reg,int base_reg,long disp);
+    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);
+public:
+    void op_mov_RV          (int reg,long offset);
+    void op_mov_RV          (int op_size,int reg,int offset);
+    void op_mov_RR          (int reg1,int reg2);
+    void op_mov_RM          (int op_size,int reg,int base_reg,int 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_MR          (int op_size,int reg,int base_reg,int offset,char mod);
+    void op_mov_MR_ex       (int op_size,int reg,int base_reg1,int base_reg2,long offset,BOOL bUseOffset);
+    void op_movsx_R32R16    (int reg32,int reg16 = REG_NON);
+    void op_movsx_R32R8     (int reg32,int reg8 = REG_NON);
+    void op_movsx_R16R8     (int reg16,int reg8 = REG_NON);
+    void op_inc             (int reg);
+    void op_dec             (int reg);
+    void op_add_RV8         (int reg,char cValue);
+    void op_add_RR          ( int reg1, int reg2 );
+    void op_add_RM          (int op_size,int reg,int base_reg,int offset,char mod);
+    void op_adc_RV8         (int reg,char cValue);
+    void op_adc_RR          ( int reg1, int reg2 );
+    void op_sub_RV8         (int reg,char cValue);
+    void op_sub_RR          ( int reg1, int reg2 );
+    void op_sbb_RV8         (int reg,char cValue);
+    void op_sbb_RR          ( int reg1, int reg2 );
+    void op_imul_RR         (int reg1,int reg2);
+    void op_imul_RV         (int reg,long i32data);
+    void op_imul_RV8        (int reg,char cValue);
+    void op_div_R           ( int reg );
+    void op_idiv_R          ( int reg );
+    void op_and_RV          (int reg,long value);
+    void op_and_RR          ( int reg1, int reg2 );
+    void op_or_RR           ( int op_size, int reg1, int reg2 );
+    void op_xor_RR          ( int reg1, int reg2 = REG_NON );
+    void op_neg             ( int reg );
+    void op_cdq             ();
+
+    void op_rep_movs        (int op_size);
+
+    void op_push(int reg);
+    void op_push_V(long data);
+    void op_push_M( int base_reg );
+    void op_pop(int reg = REG_NON);
+    void op_add_esp(long num);
+    void op_sub_esp(long num);
+    void op_cmp_RR( int reg1, int reg2 );
+    void op_cmp_value(int op_size,int reg,char byte_data);
+    void op_setne( int reg );
+    void op_test(int reg1,int reg2);
+    void op_test_ah( char cValue );
+    void op_fld_ptr_esp(int type);
+    void op_fld_basereg         (int type,int base_reg);
+    void op_fld_base_offset     (int type,int base_reg,long offset);
+    void op_fld_base_offset_ex  (int type,int base_reg1,int base_reg2,long offset,BOOL bUseOffset);
+    void op_fstp_basereg        (int type,int base_reg);
+    void op_fstp_base_offset    (int type,int base_reg,long offset);
+    void op_fstp_base_offset_ex (int type,int base_reg1,int base_reg2,long offset,BOOL bUseOffset);
+    void op_fistp_ptr_esp       ( int typeSize );
+    void op_fstp_push           ( Type &type );
+    void op_fcompp();
+    void op_fnstsw_ax();
+    void op_zero_reg(int reg);
+    void fpu_cast();
+    void fpu_cast_end();
+
+    void op_call(const UserProc *pUserProc);
+    void op_ret();
+#endif
+
+
+
+
+    void PutOld( char c1, char c2 )
+    {
+        pNativeCode->Put( c1 );
+        pNativeCode->Put( c2 );
+    }
+    void PutOld( char c1, char c2, char c3 )
+    {
+        pNativeCode->Put( c1 );
+        pNativeCode->Put( c2 );
+        pNativeCode->Put( c3 );
+    }
+    void PutOld( char c1, char c2, char c3, char c4 )
+    {
+        pNativeCode->Put( c1 );
+        pNativeCode->Put( c2 );
+        pNativeCode->Put( c3 );
+        pNativeCode->Put( c4 );
+    }
+    void PutOld( char c1, char c2, char c3, char c4, char c5 )
+    {
+        pNativeCode->Put( c1 );
+        pNativeCode->Put( c2 );
+        pNativeCode->Put( c3 );
+        pNativeCode->Put( c4 );
+        pNativeCode->Put( c5 );
+    }
+    void PutOld( char c1, char c2, char c3, char c4, char c5, char c6 )
+    {
+        pNativeCode->Put( c1 );
+        pNativeCode->Put( c2 );
+        pNativeCode->Put( c3 );
+        pNativeCode->Put( c4 );
+        pNativeCode->Put( c5 );
+        pNativeCode->Put( c6 );
+    }
+};

trunk/abdev/BasicCompiler_Common/include/Compiler.h

@@ -5 +5 @@
 #include <MetaImpl.h>
 #include <DataTable.h>
+#include <CodeGenerator.h>
 
 class Compiler
@@ -34 +35 @@
     }
 
+    // グローバル領域のネイティブコード
+    NativeCode globalNativeCode;
+
+    // コード生成機構
+    CodeGenerator codeGenerator;
+
     static bool StringToType( const std::string &typeName, Type &type );
     static const std::string TypeToString( const Type &type );

trunk/abdev/BasicCompiler_Common/include/NativeCode.h

@@ -2 +2 @@
 
 #include <vector>
+
+#include <BoostSerializationSupport.h>
 
 class Schedule
@@ -9 +11 @@
     {
         None,
+        GlobalVar,      // グローバル変数スケジュール
+        LocalVar,       // ローカル変数スケジュール
+        Relocation,     // リロケーション情報スケジュール
     };
 
@@ -123 +128 @@
         memcpy( this->codeBuffer + this->size, codeBuffer, size );
         this->size += size;
+
+        // 未完成
+        extern char *OpBuffer;
+        extern int obp;
+        memcpy( OpBuffer, codeBuffer, size );
+        obp += size;
     }
     void Put( const NativeCode &nativeCode )
@@ -132 +143 @@
         codeBuffer[size++] = c;
         Realloc();
+
+
+
+        // 未完成
+        extern char *OpBuffer;
+        extern int obp;
+        OpBuffer[obp++]=c;
     }
     void Put( long l, Schedule::Type scheduleType = Schedule::None )
@@ -142 +160 @@
         *((long *)(codeBuffer+size))=l;
         size += sizeof(long);
+
+
+
+        // 未完成
+        extern char *OpBuffer;
+        extern int obp;
+        *((long *)(OpBuffer+obp))=l;
+        obp+=sizeof(long);
     }
 };

trunk/abdev/BasicCompiler_Common/include/Procedure.h

@@ -11 +11 @@
 #include <Parameter.h>
 #include <Variable.h>
-#include <NativeCode.h>
+#include <CodeGenerator.h>
 
 class CClass;
@@ -314 +314 @@
     }
 
+    NativeCode &GetNativeCode()
+    {
+        return nativeCode;
+    }
+
     std::string GetFullName() const;
 

trunk/abdev/BasicCompiler_Common/src/LexicalScopingImpl.cpp

@@ -108 +108 @@
 
             //mov ecx,dword ptr[ebp+offset]
-            op_mov_RM(sizeof(long),REG_ECX,REG_EBP,-pVar->GetOffsetAddress(),MOD_BASE_DISP32);
+            compiler.codeGenerator.op_mov_RM(sizeof(long),REG_ECX,REG_EBP,-pVar->GetOffsetAddress(),MOD_BASE_DISP32);
             obp-=sizeof(long);
             AddLocalVarAddrSchedule();
@@ -114 +114 @@
 
             //push ecx
-            op_push(REG_ECX);
+            compiler.codeGenerator.op_push(REG_ECX);
 #endif
 
             //call free
             extern const UserProc *pSub_free;
-            op_call(pSub_free);
+            compiler.codeGenerator.op_call(pSub_free);