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

Timestamp:

Jul 26, 2007, 3:58:18 AM (17 years ago)

Author:

dai_9181

Message:

 

Location:

trunk/abdev/BasicCompiler_Common/include

Files:

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

trunk/abdev/BasicCompiler_Common/include/CodeGenerator.h

@@ -16 +16 @@
     NativeCode *pNativeCode;
 
-    // XMLシリアライズ用
+public:
+    class PertialSchedule
+    {
+        int codePos;
+        int typeSize;
+
+        int _obpOld;
+    public:
+        PertialSchedule( int codePos, int typeSize )
+            : codePos( codePos )
+            , typeSize( typeSize )
+        {
+            extern int obp;
+            _obpOld = obp-typeSize;
+        }
+        ~PertialSchedule()
+        {
+        }
+
+        int GetCodePos() const
+        {
+            return codePos;
+        }
+        int GetTypeSize() const
+        {
+            return typeSize;
+        }
+        int GetObpOld() const
+        {
+            return _obpOld;
+        }
+    };
+
 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:
+    typedef std::vector<PertialSchedule> PertialSchedules;
+    PertialSchedules pertialSchedules;
+
+public:
+
+    CodeGenerator()
+        : pNativeCode( 0 )
+    {
+    }
+    ~CodeGenerator()
+    {
+        if( pNativeCode )
+        {
+            CheckUnresolveSchedule();
+        }
+    }
 
     void Select( NativeCode &nativeCode )
     {
+        if( pNativeCode )
+        {
+            CheckUnresolveSchedule();
+        }
         pNativeCode = &nativeCode;
     }
 
+    void CheckUnresolveSchedule();
+
+    void opfix_JmpPertialSchedule( const PertialSchedule *pPertialSchedule )
+    {
+        PertialSchedules::iterator it = pertialSchedules.begin();
+        while( it != pertialSchedules.end() )
+        {
+            if( &(*it) == pPertialSchedule )
+            {
+                pNativeCode->Overwrite( pPertialSchedule->GetCodePos(), (char)(pNativeCode->GetSize() - pPertialSchedule->GetCodePos()) );
+
+                // 未完成
+                extern int obp;
+                pNativeCode->OverwriteOld( pPertialSchedule->GetObpOld(), obp-pPertialSchedule->GetObpOld() );
+
+                pertialSchedules.erase( it );
+            }
+            else
+            {
+                it++;
+            }
+        }
+    }
+
+
+    /////////////////////////////////////////////////////////////////
+    // 32bit/64bit共通 機械語生成
+    /////////////////////////////////////////////////////////////////
+
+private:
+    PertialSchedule *__jmp_op_format( char opcode, long offset, int op_size, bool isPertialSchedule = false );
+public:
+    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) );
+    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 );
+    void op_je( long offset, int op_size = sizeof(char) );
+    void op_jmp( long offset, int op_size = sizeof(char) );
+
+
 #ifdef _AMD64_
     /////////////////////////////////////////////////////////////////
-    // 64ビット
+    // 64ビット機械語生成
     /////////////////////////////////////////////////////////////////
 private:
@@ -39 +129 @@
     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, Schedule::Type scheduleType = Schedule::None );
@@ -107 +196 @@
     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 );
@@ -124 +202 @@
 #else
     /////////////////////////////////////////////////////////////////
-    // 32ビット
+    // 32ビット機械語生成
     /////////////////////////////////////////////////////////////////
 private:
@@ -169 +247 @@
 
     void op_push(int reg);
-    void op_push_V(long data);
+    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 );

trunk/abdev/BasicCompiler_Common/include/NativeCode.h

@@ -15 +15 @@
     enum Type
     {
-        None,
+        None = 10000,
         GlobalVar,      // グローバル変数スケジュール
         LocalVar,       // ローカル変数スケジュール
+        DataTable,      // データテーブル スケジュール
         Relocation,     // リロケーション情報スケジュール
     };
@@ -127 +128 @@
     }
 
+    int GetSize() const
+    {
+        return size;
+    }
+
+    void Overwrite( int codePos, char c )
+    {
+        codeBuffer[codePos] = c;
+    }
+    void OverwriteOld( int _obpOld, char c )
+    {
+        // 未完成
+        extern char *OpBuffer;
+        extern int obp;
+        OpBuffer[_obpOld] = c;
+    }
+
     void Put( const char *codeBuffer, int size )
     {
@@ -172 +190 @@
             AddLocalVarAddrSchedule();
             break;
+        case Schedule::DataTable:
+            extern CSchedule *pobj_DataTableSchedule;
+            pobj_DataTableSchedule->add();
+            break;
         case Schedule::Relocation:
             break;