Changeset 75 in dev for BasicCompiler64/Compile_Set_Var.cpp

Timestamp:

Mar 20, 2007, 4:36:16 AM (18 years ago)

Author:

dai_9181

Message:

TYPEINFO→Typeへのリファクタリングを実施。64bitはほぼ完了。32bitが全般的に未完成。

File:

• BasicCompiler64/Compile_Set_Var.cpp (modified) (6 diffs)

BasicCompiler64/Compile_Set_Var.cpp

@@ -7 +7 @@
 }
 
-void SetStructVariableFromRax(LONG_PTR lpVarIndex,int CalcType,LONG_PTR lpCalcIndex,RELATIVE_VAR *pRelativeVar,BOOL bUseHeap){
+void SetStructVariableFromRax( const Type &varType, const Type &calcType, RELATIVE_VAR *pRelativeVar,BOOL bUseHeap){
     int RightTermReg;
     pobj_reg=new CRegister(REG_RCX);
@@ -17 +17 @@
 
     //右辺
-    if(IsRealNumberType(CalcType)){
+    if( calcType.IsReal() ){
         RightTermReg=pobj_reg->LockXmmReg();
 
-        if(CalcType==DEF_DOUBLE){
+        if( calcType.IsDouble() ){
             //movlsd RightTermReg,xmm0
             op_movsd_RR(RightTermReg,REG_XMM0);
         }
-        else if(CalcType==DEF_SINGLE){
+        else if( calcType.IsSingle() ){
             //movlss RightTermReg,xmm0
             op_movss_RR(RightTermReg,REG_XMM0);
@@ -62 +62 @@
 */
     //右辺用レジスタを解除
-    if(IsRealNumberType(CalcType)) pobj_reg->UnlockXmmReg();
+    if( calcType.IsReal() ) pobj_reg->UnlockXmmReg();
     else pobj_reg->UnlockReg();
 
@@ -73 +73 @@
 
 
-    if( CalcType == DEF_STRUCT ){
-        CClass *pVarClass = (CClass *)lpVarIndex;
-        CClass *pCalcClass = (CClass *)lpCalcIndex;
-
-        if( pVarClass->IsEquals( pCalcClass ) ){            //等しい
+    if( calcType.IsStruct() ){
+        if( varType.GetClass().IsEquals( &calcType.GetClass() ) ){          //等しい
 
                 //双方のオブジェクト型が一致、または派生・継承関係にあるとき
@@ -88 +85 @@
                 op_mov_RR(REG_RDI,VarReg);
 
-                CClass *pClass = (CClass *)lpVarIndex;
-                int object_size = pClass->GetSize();
+                int object_size = varType.GetClass().GetSize();
 
                 //mov rcx,object_size
@@ -107 +103 @@
 
                     //call free
-                    extern SubInfo *pSub_free;
+                    extern UserProc *pSub_free;
                     op_call(pSub_free);
                 }