Changeset 232 in dev for trunk/abdev/BasicCompiler64/Compile_Var.cpp

Timestamp:

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

Author:

dai_9181

Message:

 

File:

• trunk/abdev/BasicCompiler64/Compile_Var.cpp (modified) (11 diffs)

trunk/abdev/BasicCompiler64/Compile_Var.cpp

@@ -868 +868 @@
 
             //mov qword ptr[offset],rax
-            compiler.codeGenerator.op_mov_MR(sizeof(_int64),REG_RAX,0,offset,MOD_DISP32);
-            obp-=sizeof(long);
-            pobj_GlobalVarSchedule->add();
-            obp+=sizeof(long);
+            compiler.codeGenerator.op_mov_MR(sizeof(_int64),REG_RAX,0,offset,MOD_DISP32, Schedule::GlobalVar );
         }
         else{
@@ -992 +989 @@
 
         //mov rax,i64data
-        compiler.codeGenerator.op_mov64_ToReg(REG_RAX,i64data);
+        compiler.codeGenerator.op_mov_RV64(REG_RAX,i64data);
 
         //mov qword ptr[rsp+offset],rax
@@ -1034 +1031 @@
             if(i64data&0xFFFFFFFF00000000){
                 //mov rax,i64data
-                compiler.codeGenerator.op_mov64_ToReg(REG_RAX,i64data);
+                compiler.codeGenerator.op_mov_RV64(REG_RAX,i64data);
 
                 //mov qword ptr[rsp+offset],rax
@@ -1116 +1113 @@
         //アラインメントを考慮
         if( pVar->GetType().IsStruct() ){
-            int alignment = pVar->GetType().GetClass().iAlign;
+            int alignment = pVar->GetType().GetClass().GetFixedAlignment();
 
             if( alignment ){
@@ -1222 +1219 @@
         if(pRelativeVar->bOffsetOffset){
             //add r11,offset
-            OpBuffer[obp++]=(char)0x49;
-            OpBuffer[obp++]=(char)0x81;
-            OpBuffer[obp++]=(char)0xC3;
-            *((long *)(OpBuffer+obp))=(int)pRelativeVar->offset;
-            pobj_GlobalVarSchedule->add();
-            obp+=sizeof(long);
+            compiler.codeGenerator.op_add_RV( REG_R11, (long)pRelativeVar->offset, Schedule::GlobalVar );
 
             //mov reg,r11
@@ -1234 +1226 @@
         else{
             //mov reg,offset
-            compiler.codeGenerator.op_mov64_ToReg(reg,(long)pRelativeVar->offset);
-            obp-=sizeof(long);
-            pobj_GlobalVarSchedule->add();
-            obp+=sizeof(long);
+            compiler.codeGenerator.op_mov_RV( sizeof(_int64), reg, (long)pRelativeVar->offset, Schedule::GlobalVar );
         }
     }
@@ -1243 +1232 @@
         if(pRelativeVar->bOffsetOffset){
             //add r11,qword ptr[offset]
-            compiler.codeGenerator.op_add_RM( sizeof(_int64), REG_R11, REG_NON, (int)pRelativeVar->offset, MOD_DISP32 );
-            obp-=sizeof(long);
-            pobj_GlobalVarSchedule->add();
-            obp+=sizeof(long);
+            compiler.codeGenerator.op_add_RM( sizeof(_int64), REG_R11, REG_NON, (int)pRelativeVar->offset, MOD_DISP32, Schedule::GlobalVar );
         }
         else{
             //mov r11,qword ptr[offset]
-            compiler.codeGenerator.op_mov_RM(sizeof(_int64),REG_R11,REG_NON,(int)pRelativeVar->offset,MOD_DISP32);
-            obp-=sizeof(long);
-            pobj_GlobalVarSchedule->add();
-            obp+=sizeof(long);
+            compiler.codeGenerator.op_mov_RM(sizeof(_int64),REG_R11,REG_NON,(int)pRelativeVar->offset,MOD_DISP32, Schedule::GlobalVar );
         }
 
@@ -1261 +1244 @@
         if(pRelativeVar->bOffsetOffset){
             //add r11,offset
-            OpBuffer[obp++]=(char)0x49;
-            OpBuffer[obp++]=(char)0x81;
-            OpBuffer[obp++]=(char)0xC3;
-            *((long *)(OpBuffer+obp))=(int)pRelativeVar->offset;
-            AddLocalVarAddrSchedule();
-            obp+=sizeof(long);
+            compiler.codeGenerator.op_add_RV( REG_R11, (long)pRelativeVar->offset, Schedule::LocalVar );
 
             //add r11,rsp
@@ -1279 +1257 @@
 
             //add reg,offset
-            compiler.codeGenerator.op_add_RV(reg,(int)pRelativeVar->offset);
-            obp-=sizeof(long);
-            AddLocalVarAddrSchedule();
-            obp+=sizeof(long);
+            compiler.codeGenerator.op_add_RV(reg,(long)pRelativeVar->offset, Schedule::LocalVar );
         }
     }
@@ -1288 +1263 @@
         if(pRelativeVar->bOffsetOffset){
             //add r11,qword ptr[rsp+offset]
-            OpBuffer[obp++]=(char)0x4C;
-            OpBuffer[obp++]=(char)0x03;
-            OpBuffer[obp++]=(char)0x9C;
-            OpBuffer[obp++]=(char)0x24;
-            *((long *)(OpBuffer+obp))=(int)pRelativeVar->offset;
-            AddLocalVarAddrSchedule();
-            obp+=sizeof(long);
+            compiler.codeGenerator.op_add_RM( REG_R11, REG_RSP, (long)pRelativeVar->offset, MOD_BASE_DISP32, Schedule::LocalVar );
         }
         else{
             //mov r11,qword ptr[rsp+offset]
-            compiler.codeGenerator.op_mov_RM(sizeof(_int64),REG_R11,REG_RSP,(int)pRelativeVar->offset,MOD_BASE_DISP32);
-            obp-=sizeof(long);
-            AddLocalVarAddrSchedule();
-            obp+=sizeof(long);
+            compiler.codeGenerator.op_mov_RM(sizeof(_int64),REG_R11,REG_RSP,(int)pRelativeVar->offset,MOD_BASE_DISP32, Schedule::LocalVar );
         }
 
@@ -1331 +1297 @@
             // ルートポインタを引き渡す
             //mov rdx,offset
-            compiler.codeGenerator.op_mov_RV(sizeof(_int64), REG_RDX,(int)pVar->GetOffsetAddress());
-            obp-=sizeof(long);
-            pobj_GlobalVarSchedule->add();
-            obp+=sizeof(long);
+            compiler.codeGenerator.op_mov_RV(sizeof(_int64), REG_RDX,(int)pVar->GetOffsetAddress(), Schedule::GlobalVar );
 
             // Thisポインタを引き渡す