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

Timestamp:

Jul 31, 2007, 4:30:31 AM (17 years ago)

Author:

dai_9181

Message:

 

File:

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

trunk/abdev/BasicCompiler64/Compile_Var.cpp

@@ -4 +4 @@
 #include <jenga/include/smoothie/LexicalAnalysis.h>
 
-#include <LexicalScopingImpl.h>
 #include <CodeGenerator.h>
 #include <Compiler.h>
@@ -989 +988 @@
 
         //mov qword ptr[rsp+offset],rax
-        compiler.codeGenerator.op_mov_MR(sizeof(_int64),REG_RAX,REG_RSP,offset,MOD_BASE_DISP32);
-        obp-=sizeof(long);
-        AddLocalVarAddrSchedule();
-        obp+=sizeof(long);
+        compiler.codeGenerator.localVarPertialSchedules.push_back(
+            compiler.codeGenerator.op_mov_MR(sizeof(_int64),REG_RAX,REG_RSP,offset,MOD_BASE_DISP32, Schedule::None, true )
+        );
     }
     else if( type.IsSingle() ){
@@ -999 +997 @@
 
         //mov dword ptr[rsp+offset],value
-        compiler.codeGenerator.op_mov_MV(sizeof(long),REG_RSP,offset, Schedule::LocalVar, USE_OFFSET,*(int *)&flt);
+        compiler.codeGenerator.localVarPertialSchedules.push_back(
+            compiler.codeGenerator.op_mov_MV(sizeof(long),REG_RSP,offset, Schedule::None, true, USE_OFFSET,*(int *)&flt)
+        );
     }
     else if( type.Is64() || type.IsPointer() ){
@@ -1014 +1014 @@
 
             //mov qword ptr[rsp+offset],rax
-            compiler.codeGenerator.op_mov_MR(sizeof(_int64),REG_RAX,REG_RSP,offset,MOD_BASE_DISP32, Schedule::LocalVar );
+            compiler.codeGenerator.localVarPertialSchedules.push_back(
+                compiler.codeGenerator.op_mov_MR(sizeof(_int64),REG_RAX,REG_RSP,offset,MOD_BASE_DISP32, Schedule::None, true )
+            );
         }
         else{
@@ -1022 +1024 @@
 
                 //mov qword ptr[rsp+offset],rax
-                compiler.codeGenerator.op_mov_MR(sizeof(_int64),REG_RAX,REG_RSP,offset,MOD_BASE_DISP32, Schedule::LocalVar );
+                compiler.codeGenerator.localVarPertialSchedules.push_back(
+                    compiler.codeGenerator.op_mov_MR(sizeof(_int64),REG_RAX,REG_RSP,offset,MOD_BASE_DISP32, Schedule::None, true )
+                );
             }
             else{
                 //mov qword ptr[rsp+offset],value
-                compiler.codeGenerator.op_mov_MV(sizeof(_int64),REG_RSP,offset, Schedule::LocalVar, USE_OFFSET,(int)i64data);
+                compiler.codeGenerator.localVarPertialSchedules.push_back(
+                    compiler.codeGenerator.op_mov_MV(sizeof(_int64),REG_RSP,offset, Schedule::None, true, USE_OFFSET,(int)i64data)
+                );
             }
         }
@@ -1032 +1038 @@
     else if( type.IsDWord() || type.IsLong() ){
         //mov dword ptr[rsp+offset],value
-        compiler.codeGenerator.op_mov_MV(sizeof(long),REG_RSP,offset, Schedule::LocalVar,USE_OFFSET,(int)i64data);
+        compiler.codeGenerator.localVarPertialSchedules.push_back(
+            compiler.codeGenerator.op_mov_MV(sizeof(long),REG_RSP,offset, Schedule::None, true, USE_OFFSET,(int)i64data)
+        );
     }
     else if( type.IsWord() || type.IsInteger() ){
         //mov word ptr[rsp+offset],value
-        compiler.codeGenerator.op_mov_MV(sizeof(short),REG_RSP,offset, Schedule::LocalVar,USE_OFFSET,(int)i64data);
+        compiler.codeGenerator.localVarPertialSchedules.push_back(
+            compiler.codeGenerator.op_mov_MV(sizeof(short),REG_RSP,offset, Schedule::None, true, USE_OFFSET,(int)i64data)
+        );
     }
     else if( type.IsSByte() || type.IsByte() || type.IsBoolean() ){
         //mov byte ptr[rsp+offset],value
-        compiler.codeGenerator.op_mov_MV(sizeof(char),REG_RSP,offset, Schedule::LocalVar,USE_OFFSET,(int)i64data);
+        compiler.codeGenerator.localVarPertialSchedules.push_back(
+            compiler.codeGenerator.op_mov_MV(sizeof(char),REG_RSP,offset, Schedule::None, true, USE_OFFSET,(int)i64data)
+        );
     }
     return true;
@@ -1074 +1086 @@
 
         //レキシカルスコープ
-        pVar->SetScopeLevel( GetLexicalScopes().GetNowLevel() );
-        pVar->SetScopeStartAddress( GetLexicalScopes().GetStartAddress() );
+        pVar->SetScopeLevel( compiler.codeGenerator.lexicalScopes.GetNowLevel() );
+        pVar->SetScopeStartAddress( compiler.codeGenerator.lexicalScopes.GetStartAddress() );
         pVar->bLiving=TRUE;
 
@@ -1109 +1121 @@
 
         //レキシカルスコープ
-        pVar->SetScopeLevel( GetLexicalScopes().GetNowLevel() );
-        pVar->SetScopeStartAddress( GetLexicalScopes().GetStartAddress() );
+        pVar->SetScopeLevel( compiler.codeGenerator.lexicalScopes.GetNowLevel() );
+        pVar->SetScopeStartAddress( compiler.codeGenerator.lexicalScopes.GetStartAddress() );
         pVar->bLiving=TRUE;
 
@@ -1151 +1163 @@
 
             //add rcx, offset
-            compiler.codeGenerator.op_add_RV( REG_RCX, -pVar->GetOffsetAddress() );
-            obp-=sizeof(long);
-            AddLocalVarAddrSchedule();
-            obp+=sizeof(long);
+            compiler.codeGenerator.localVarPertialSchedules.push_back(
+                compiler.codeGenerator.op_add_RV( REG_RCX, -pVar->GetOffsetAddress(), Schedule::None, true )
+            );
 
             //call FillMemory
@@ -1217 +1228 @@
         if(pRelativeVar->bOffsetOffset){
             //add r11,offset
-            compiler.codeGenerator.op_add_RV( REG_R11, (long)pRelativeVar->offset, Schedule::LocalVar );
+            compiler.codeGenerator.localVarPertialSchedules.push_back(
+                compiler.codeGenerator.op_add_RV( REG_R11, (long)pRelativeVar->offset, Schedule::None, true )
+            );
 
             //add r11,rsp
@@ -1230 +1243 @@
 
             //add reg,offset
-            compiler.codeGenerator.op_add_RV(reg,(long)pRelativeVar->offset, Schedule::LocalVar );
+            compiler.codeGenerator.localVarPertialSchedules.push_back(
+                compiler.codeGenerator.op_add_RV(reg,(long)pRelativeVar->offset, Schedule::None, true )
+            );
         }
     }
@@ -1236 +1251 @@
         if(pRelativeVar->bOffsetOffset){
             //add r11,qword ptr[rsp+offset]
-            compiler.codeGenerator.op_add_RM( sizeof(_int64), REG_R11, REG_RSP, (long)pRelativeVar->offset, MOD_BASE_DISP32, Schedule::LocalVar );
+            compiler.codeGenerator.localVarPertialSchedules.push_back(
+                compiler.codeGenerator.op_add_RM( sizeof(_int64), REG_R11, REG_RSP, (long)pRelativeVar->offset, MOD_BASE_DISP32, Schedule::None, true )
+            );
         }
         else{
             //mov r11,qword ptr[rsp+offset]
-            compiler.codeGenerator.op_mov_RM(sizeof(_int64),REG_R11,REG_RSP,(int)pRelativeVar->offset,MOD_BASE_DISP32, Schedule::LocalVar );
+            compiler.codeGenerator.localVarPertialSchedules.push_back(
+                compiler.codeGenerator.op_mov_RM(sizeof(_int64),REG_R11,REG_RSP,(int)pRelativeVar->offset,MOD_BASE_DISP32, Schedule::None, true )
+            );
         }