Changeset 234 in dev

Timestamp:

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

Author:

dai_9181

Message:

 

Location:

trunk/abdev

Files:

• BasicCompiler32/CodeGenerator.cpp (modified) (2 diffs)
• BasicCompiler32/Compile_Var.cpp (modified) (2 diffs)
• BasicCompiler32/MakePeHdr.cpp (modified) (1 diff)
• BasicCompiler_Common/include/CodeGenerator.h (modified) (1 diff)
• BasicCompiler_Common/src/LexicalScopingImpl.cpp (modified) (1 diff)

trunk/abdev/BasicCompiler32/CodeGenerator.cpp

@@ -99 +99 @@
 ///////////////////
 
+void CodeGenerator::op_mov_MV( int op_size, int base_reg, long offset, Schedule::Type offsetScheduleType, long value, Schedule::Type valueScheduleType )
+{
+    //mov ptr[base_reg+offset],value
+
+    if( op_size == sizeof(char) )
+    {
+        pNativeCode->Put( (char)0xC6 );
+        pNativeCode->Put( (char)(0x80|REGISTER_OPERAND(base_reg)) );
+        pNativeCode->Put( offset, offsetScheduleType );
+        pNativeCode->Put( (char)value );
+    }
+    else if( op_size == sizeof(short) )
+    {
+        pNativeCode->Put( (char)0x66 );
+        pNativeCode->Put( (char)0xC7 );
+        pNativeCode->Put( (char)(0x80|REGISTER_OPERAND(base_reg)) );
+        pNativeCode->Put( offset, offsetScheduleType );
+        pNativeCode->Put( (short)value );
+    }
+    else if( op_size == sizeof(long) )
+    {
+        pNativeCode->Put( (char)0xC7 );
+        pNativeCode->Put( (char)(0x80|REGISTER_OPERAND(base_reg)) );
+        pNativeCode->Put( offset, offsetScheduleType );
+        pNativeCode->Put( value, valueScheduleType );
+    }
+}
 void CodeGenerator::op_mov_RV(int reg,long offset, Schedule::Type scheduleType ){
     //mov reg,value
@@ -359 +386 @@
 {
     // add reg,offset
-    pNativeCode->Put( (char)0x81 );
-    pNativeCode->Put( (char)(0xC0|REGISTER_OPERAND(reg)) );
-    pNativeCode->Put( offset, scheduleType );
+
+    if( reg == REG_EAX )
+    {
+        // eaxのみ特殊
+        pNativeCode->Put( (char)0x05 );
+        pNativeCode->Put( offset, scheduleType );
+    }
+    else
+    {
+        pNativeCode->Put( (char)0x81 );
+        pNativeCode->Put( (char)(0xC0|REGISTER_OPERAND(reg)) );
+        pNativeCode->Put( offset, scheduleType );
+    }
 }
 void CodeGenerator::op_add_RR( int reg1, int reg2 )

trunk/abdev/BasicCompiler32/Compile_Var.cpp

@@ -1033 +1033 @@
     }
     else if( type.IsWord() || type.IsInteger() ){
-        //mov ax,InitValue
-        OpBuffer[obp++]=(char)0x66;
-        OpBuffer[obp++]=(char)0xB8;
-        *((WORD *)(OpBuffer+obp))=(WORD)i64data;
-        obp+=sizeof(WORD);
-
-        //mov word ptr[ebp+offset],ax
-        compiler.codeGenerator.op_mov_MR( sizeof(short), REG_EAX, REG_EBP, offset, MOD_BASE_DISP32, Schedule::LocalVar );
+        //mov word ptr[ebp+offset],InitValue
+        compiler.codeGenerator.op_mov_MV( sizeof(short), REG_EBP, offset, Schedule::LocalVar, (long)i64data );
     }
     else if( type.IsSByte() || type.IsByte() || type.IsBoolean() ){
         //mov byte ptr[ebp+offset],InitValue
-        OpBuffer[obp++]=(char)0xC6;
-        OpBuffer[obp++]=(char)0x85;
-        *((long *)(OpBuffer+obp))=offset;
-        AddLocalVarAddrSchedule();
-        obp+=sizeof(long);
-        *((BYTE *)(OpBuffer+obp))=(BYTE)i64data;
-        obp+=sizeof(BYTE);
+        compiler.codeGenerator.op_mov_MV( sizeof(char), REG_EBP, offset, Schedule::LocalVar, (long)i64data );
     }
 
@@ -1161 +1149 @@
 
             //add eax,offset
-            OpBuffer[obp++]=(char)0x05;
-            *((long *)(OpBuffer+obp))=-pVar->GetOffsetAddress();
-            AddLocalVarAddrSchedule();
-            obp+=sizeof(long);
+            compiler.codeGenerator.op_add_RV( REG_EAX, -pVar->GetOffsetAddress(), Schedule::LocalVar );
 
             //push eax

trunk/abdev/BasicCompiler32/MakePeHdr.cpp

@@ -445 +445 @@
         //未完成
         //OpBuffer[obp++]=(char)0xCC;
+
 
 

trunk/abdev/BasicCompiler_Common/include/CodeGenerator.h

@@ -131 +131 @@
     void __op_format(char op_prefix,char opcode1,char opcode2,int reg,int base_reg,int offset,char mod, Schedule::Type scheduleType = Schedule::None );
 public:
+    void op_mov_MV          ( int op_size, int base_reg, long offset, Schedule::Type offsetScheduleType, long value, Schedule::Type valueScheduleType = Schedule::None );
     void op_mov_RV          (int reg,long offset, Schedule::Type scheduleType = Schedule::None );
     void op_mov_RR          (int reg1,int reg2);

trunk/abdev/BasicCompiler_Common/src/LexicalScopingImpl.cpp

@@ -100 +100 @@
             compiler.codeGenerator.op_mov_RM(sizeof(_int64),REG_RCX,REG_RSP,
                 -pVar->GetOffsetAddress(),
-                MOD_BASE_DISP32);
-            obp-=sizeof(long);
-            AddLocalVarAddrSchedule();
-            obp+=sizeof(long);
+                MOD_BASE_DISP32,
+                Schedule::LocalVar);
 #else
             //x86コード
 
             //mov ecx,dword ptr[ebp+offset]
-            compiler.codeGenerator.op_mov_RM(sizeof(long),REG_ECX,REG_EBP,-pVar->GetOffsetAddress(),MOD_BASE_DISP32);
-            obp-=sizeof(long);
-            AddLocalVarAddrSchedule();
-            obp+=sizeof(long);
+            compiler.codeGenerator.op_mov_RM(sizeof(long),REG_ECX,REG_EBP,-pVar->GetOffsetAddress(),MOD_BASE_DISP32, Schedule::LocalVar );
 
             //push ecx