Changeset 97 in dev for BasicCompiler32/Compile_Calc_PushVar.cpp

Timestamp:

Apr 16, 2007, 3:52:40 AM (18 years ago)

Author:

dai_9181

Message:

関数の戻り値オブジェクトのメンバ・メソッドを一時オブジェクトを介さずに参照できるようにした。

File:

• BasicCompiler32/Compile_Calc_PushVar.cpp (modified) (4 diffs)

BasicCompiler32/Compile_Calc_PushVar.cpp

@@ -65 +65 @@
     }
 }
-void SetReg_WholeVariable(int type,RELATIVE_VAR *pRelativeVar,int reg){
+void SetReg_WholeVariable(int type,RELATIVE_VAR *pRelativeVar,int reg, bool is64Head){
     int varSize;
 
@@ -81 +81 @@
 
         //上位32ビットをedxにロード
-        pRelativeVar->offset+=sizeof(long);
-        SetReg_WholeVariable(DEF_LONG,pRelativeVar,REG_EDX);
-        pRelativeVar->offset-=sizeof(long);
+        SetReg_WholeVariable(DEF_LONG,pRelativeVar,REG_EDX, true);
 
         return;
     }
 
+    int offsetOf64Head = 0;
+    if( is64Head ){
+        offsetOf64Head = sizeof(long);
+    }
+
     if(pRelativeVar->dwKind==VAR_GLOBAL){
         if(pRelativeVar->bOffsetOffset){
             //mov reg, ptr[ecx+offset]
-            op_mov_RM(varSize,reg,REG_ECX,(int)pRelativeVar->offset,MOD_BASE_DISP32);
+            op_mov_RM(varSize,reg,REG_ECX,(int)pRelativeVar->offset + offsetOf64Head,MOD_BASE_DISP32);
         }
         else{
             //mov reg, ptr[offset]
-            op_mov_RM(varSize,reg,0,(int)pRelativeVar->offset,MOD_DISP32);
+            op_mov_RM(varSize,reg,0,(int)pRelativeVar->offset + offsetOf64Head,MOD_DISP32);
         }
         obp-=sizeof(long);
@@ -119 +122 @@
         if(pRelativeVar->bOffsetOffset){
             //mov reg, ptr[ebp+ecx+offset]
-            op_mov_RM_ex(varSize,reg,REG_EBP,REG_ECX,(int)pRelativeVar->offset,USE_OFFSET);
+            op_mov_RM_ex(varSize,reg,REG_EBP,REG_ECX,(int)pRelativeVar->offset + offsetOf64Head,USE_OFFSET);
         }
         else{
             //mov reg, ptr[ebp+offset]
-            op_mov_RM(varSize,reg,REG_EBP,(int)pRelativeVar->offset,MOD_BASE_DISP32);
+            op_mov_RM(varSize,reg,REG_EBP,(int)pRelativeVar->offset + offsetOf64Head,MOD_BASE_DISP32);
         }
         obp-=sizeof(long);
@@ -146 +149 @@
     else if(pRelativeVar->dwKind==VAR_DIRECTMEM){
 directmem:
-        //mov reg, ptr[ecx]
-        op_mov_RM(varSize,reg,REG_ECX,0,MOD_BASE);
+        if( is64Head ){
+            //mov reg, ptr[ecx]
+            op_mov_RM(varSize,reg,REG_ECX,offsetOf64Head,MOD_BASE_DISP8);
+        }
+        else{
+            //mov reg, ptr[ecx]
+            op_mov_RM(varSize,reg,REG_ECX,0,MOD_BASE);
+        }
     }
 }