Changeset 243 in dev for trunk/abdev

Timestamp:

Jul 27, 2007, 4:20:59 AM (17 years ago)

Author:

dai_9181

Message:

 

Location:

trunk/abdev

Files:

• BasicCompiler32/Compile_Statement.cpp (modified) (1 diff)
• BasicCompiler64/CodeGenerator.cpp (modified) (2 diffs)
• BasicCompiler64/Compile_Object.cpp (modified) (1 diff)
• BasicCompiler64/Compile_Statement.cpp (modified) (1 diff)
• BasicCompiler64/Compile_Var.cpp (modified) (3 diffs)
• BasicCompiler_Common/include/CodeGenerator.h (modified) (1 diff)

trunk/abdev/BasicCompiler32/Compile_Statement.cpp

@@ -780 +780 @@
 
     //jmp ...
-    OpBuffer[obp++]=(char)0xE9;
-    int je_schedule=obp;
-    obp+=sizeof(long);
+    CodeGenerator::PertialSchedule *pTempPertialSchedule = compiler.codeGenerator.op_jmp( 0, sizeof(long), true );
 
     //レキシカルスコープをレベルダウン
     GetLexicalScopes().End();
 
-    *((long *)(OpBuffer+je_schedule))=obp-(je_schedule+sizeof(long)); //jmpジャンプ先のオフセット値
-
+    //jmpジャンプ先のオフセット値
+    compiler.codeGenerator.opfix_JmpPertialSchedule( pTempPertialSchedule );
 
     //Continueアドレスを復元

trunk/abdev/BasicCompiler64/CodeGenerator.cpp

@@ -306 +306 @@
 }
 
-void CodeGenerator::op_mov_MV(int op_size,int base_reg,int offset,BOOL bUseOffset,long i32data){
+void CodeGenerator::op_mov_MV(int op_size,int base_reg,int offset, Schedule::Type offsetScheduleType, BOOL bUseOffset,long i32data){
     //mov ptr[base_reg+offset],i32data
     //mov ptr[base_reg       ],i32data
@@ -326 +326 @@
 
         //ModR/M, SIB, disp
-        set_mod_rm_sib_disp(MOD_BASE_DISP32,0,SCALE_NON,INDEX_NON,base_reg,offset);
+        set_mod_rm_sib_disp(MOD_BASE_DISP32,0,SCALE_NON,INDEX_NON,base_reg,offset, offsetScheduleType );
     }
     else{

trunk/abdev/BasicCompiler64/Compile_Object.cpp

@@ -173 +173 @@
 
     //mov qword ptr[rax],typeSize（オブジェクトのサイズ）
-    compiler.codeGenerator.op_mov_MV(sizeof(_int64),REG_RAX,0,NON_OFFSET,typeSize);
+    compiler.codeGenerator.op_mov_MV(sizeof(_int64),REG_RAX,0, Schedule::None, NON_OFFSET,typeSize);
 
     //add rax,PTR_SIZE

trunk/abdev/BasicCompiler64/Compile_Statement.cpp

@@ -522 +522 @@
 
     //jmp ...
-    OpBuffer[obp++]=(char)0xE9;
-    int je_schedule=obp;
-    obp+=sizeof(long);
+    CodeGenerator::PertialSchedule *pTempPertialSchedule = compiler.codeGenerator.op_jmp( 0, sizeof(long), true );
 
     //レキシカルスコープをレベルダウン
     GetLexicalScopes().End();
 
-    *((long *)(OpBuffer+je_schedule))=obp-(je_schedule+sizeof(long)); //jmpジャンプ先のオフセット値
+    //jmpジャンプ先のオフセット値
+    compiler.codeGenerator.opfix_JmpPertialSchedule( pTempPertialSchedule );
 
     //Continueアドレスを復元

trunk/abdev/BasicCompiler64/Compile_Var.cpp

@@ -999 +999 @@
 
         //mov dword ptr[rsp+offset],value
-        compiler.codeGenerator.op_mov_MV(sizeof(long),REG_RSP,offset,USE_OFFSET,*(int *)&flt);
-        obp-=sizeof(long)+sizeof(long);
-        AddLocalVarAddrSchedule();
-        obp+=sizeof(long)+sizeof(long);
+        compiler.codeGenerator.op_mov_MV(sizeof(long),REG_RSP,offset, Schedule::LocalVar, USE_OFFSET,*(int *)&flt);
     }
     else if( type.Is64() || type.IsPointer() ){
@@ -1029 +1026 @@
             else{
                 //mov qword ptr[rsp+offset],value
-                compiler.codeGenerator.op_mov_MV(sizeof(_int64),REG_RSP,offset,USE_OFFSET,(int)i64data);
-                obp-=sizeof(long)+sizeof(long);
-                AddLocalVarAddrSchedule();
-                obp+=sizeof(long)+sizeof(long);
+                compiler.codeGenerator.op_mov_MV(sizeof(_int64),REG_RSP,offset, Schedule::LocalVar, USE_OFFSET,(int)i64data);
             }
         }
@@ -1038 +1032 @@
     else if( type.IsDWord() || type.IsLong() ){
         //mov dword ptr[rsp+offset],value
-        compiler.codeGenerator.op_mov_MV(sizeof(long),REG_RSP,offset,USE_OFFSET,(int)i64data);
-        obp-=sizeof(long)+sizeof(long);
-        AddLocalVarAddrSchedule();
-        obp+=sizeof(long)+sizeof(long);
+        compiler.codeGenerator.op_mov_MV(sizeof(long),REG_RSP,offset, Schedule::LocalVar,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,USE_OFFSET,(int)i64data);
-        obp-=sizeof(long)+sizeof(short);
-        AddLocalVarAddrSchedule();
-        obp+=sizeof(long)+sizeof(short);
+        compiler.codeGenerator.op_mov_MV(sizeof(short),REG_RSP,offset, Schedule::LocalVar,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,USE_OFFSET,(int)i64data);
-        obp-=sizeof(long)+sizeof(char);
-        AddLocalVarAddrSchedule();
-        obp+=sizeof(long)+sizeof(char);
+        compiler.codeGenerator.op_mov_MV(sizeof(char),REG_RSP,offset, Schedule::LocalVar,USE_OFFSET,(int)i64data);
     }
     return true;

trunk/abdev/BasicCompiler_Common/include/CodeGenerator.h

@@ -159 +159 @@
     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_MV                  (int op_size,int base_reg,int offset, Schedule::Type offsetScheduleType, BOOL bUseOffset,long i32data);
     void op_mov_RR                  (int reg1,int reg2);
     void op_movsxd                  (int reg64,int reg32);