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

Timestamp:

Jul 25, 2007, 4:04:11 AM (17 years ago)

Author:

dai_9181

Message:

 

Location:

trunk/abdev/BasicCompiler_Common/include

Files:

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

trunk/abdev/BasicCompiler_Common/include/Class.h

@@ -71 +71 @@
     // 静的メソッド
     Methods staticMethods;
+
+    //アラインメント値
+    int fixedAlignment;
 
     // XMLシリアライズ用
@@ -93 +96 @@
         ar & BOOST_SERIALIZATION_NVP( vtblNum );
         ar & BOOST_SERIALIZATION_NVP( staticMethods );
+        ar & BOOST_SERIALIZATION_NVP( fixedAlignment );
     }
 
     bool isReady;
 public:
-
-    //アラインメント値
-    int iAlign;
 
     CClass( const NamespaceScopes &namespaceScopes, const NamespaceScopesCollection &importedNamespaces, const string &name )
@@ -107 +108 @@
         , pSuperClass( NULL )
         , isReady( false )
-        , iAlign( 0 )
+        , fixedAlignment( 0 )
         , ConstructorMemberSubIndex( -1 )
         , DestructorMemberSubIndex( -1 )
@@ -123 +124 @@
         , pSuperClass( NULL )
         , isReady( false )
-        , iAlign( 0 )
+        , fixedAlignment( 0 )
         , ConstructorMemberSubIndex( -1 )
         , DestructorMemberSubIndex( -1 )
@@ -320 +321 @@
     }
 
+    // ユーザ指定のアラインメント固定値
+    int GetFixedAlignment() const
+    {
+        return fixedAlignment;
+    }
+    void SetFixedAlignment( int fixedAlignment )
+    {
+        this->fixedAlignment = fixedAlignment;
+    }
+
     // メンバの総合サイズを取得
     int GetSize() const;

trunk/abdev/BasicCompiler_Common/include/CodeGenerator.h

@@ -41 +41 @@
     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_RV                  (int op_size,int reg,long i32data, Schedule::Type scheduleType = Schedule::None );
     void op_mov_RV64                (int reg,_int64 i64data);
     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);
+    void op_mov_MR                  (int op_size,int reg,int base_reg,long offset,char mod, Schedule::Type scheduleType = Schedule::None );
+    void op_mov_MR_ex               (int op_size,int reg,int base_reg1,int base_reg2,long offset,BOOL bUseOffset, Schedule::Type scheduleType = Schedule::None );
     void op_mov_MV                  (int op_size,int base_reg,int offset,BOOL bUseOffset,long i32data);
     void op_mov_RR                  (int reg1,int reg2);
-    void op_mov64_ToReg             (int reg,_int64 i64data);
-    void op_mov64_ToReg             (int reg,long i32data);
     void op_movsxd                  (int reg64,int reg32);
     void op_movsx64_FromReg16       (int reg64,int reg16);
@@ -61 +59 @@
     void op_dec                     (int reg);
     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_add_RV                  (int reg,long offset, Schedule::Type scheduleType = Schedule::None );
     void op_add_RR              (int reg1,int reg2);
     void op_add32_reg               (int reg1,int reg2);
@@ -86 +84 @@
     void op_cmp_value               (int op_size,int reg,char byte_data);
     void op_setne                   (int reg);
-    void op_movlpd_MR               (int xmm_reg,int base_reg,int offset,char mod);
-    void op_movlpd_RM               (int xmm_reg,int base_reg,int offset,char mod);
+    void op_movlpd_MR               (int xmm_reg,int base_reg,int offset,char mod, Schedule::Type scheduleType = Schedule::None );
+    void op_movlpd_RM               (int xmm_reg,int base_reg,int offset,char mod, Schedule::Type scheduleType = Schedule::None );
     void op_movsd_RR                (int xmm_reg1,int xmm_reg2);
-    void op_movsd_MR                (int xmm_reg,int base_reg,int offset,char mod);
+    void op_movsd_MR                (int xmm_reg,int base_reg,int offset,char mod, Schedule::Type scheduleType = Schedule::None );
     void op_movss_RR                (int xmm_reg1,int xmm_reg2);
-    void op_movss_RM                (int xmm_reg,int base_reg,int offset,char mod);
-    void op_movss_MR                (int xmm_reg,int base_reg,int offset,char mod);
+    void op_movss_RM                (int xmm_reg,int base_reg,int offset,char mod, Schedule::Type scheduleType = Schedule::None );
+    void op_movss_MR                (int xmm_reg,int base_reg,int offset,char mod, Schedule::Type scheduleType = Schedule::None );
     void op_movd_RX                 (int reg,int xmm_reg);
     void op_cvtsd2ss                (int xmm_reg1,int xmm_reg2);

trunk/abdev/BasicCompiler_Common/include/NativeCode.h

@@ -8 +8 @@
 
 void AddLocalVarAddrSchedule();
+void ObpPlus( int step = 1 );
 
 class Schedule
@@ -137 +138 @@
         extern int obp;
         memcpy( OpBuffer + obp, codeBuffer, size );
-        obp += size;
+        ObpPlus( size );
     }
     void Put( const NativeCode &nativeCode )
@@ -180 +181 @@
         extern int obp;
         *((long *)(OpBuffer+obp))=l;
-        obp+=sizeof(long);
+        ObpPlus( sizeof(long) );
     }
     void Put( short s )
@@ -196 +197 @@
         extern char *OpBuffer;
         extern int obp;
-        OpBuffer[obp++]=c;
+        OpBuffer[obp]=c;
+        ObpPlus();
     }
 };