Changeset 244 in dev for trunk/abdev/BasicCompiler32

Timestamp:

Jul 27, 2007, 12:14:00 PM (17 years ago)

Author:

dai_9181

Message:

 

Location:

trunk/abdev/BasicCompiler32

Files:

• Compile_Object.cpp (modified) (1 diff)
• MakePeHdr.cpp (modified) (3 diffs)
• x86CodeGenerator.cpp (modified) (2 diffs)

trunk/abdev/BasicCompiler32/Compile_Object.cpp

@@ -191 +191 @@
 
     //mov ecx,DestructorProcAddr
-    OpBuffer[obp++]=(char)0xB9;
-    pobj_SubAddrSchedule->add(&method->GetUserProc(),0);
-    method->GetUserProc().Using();
-    obp+=sizeof(long);
+    compiler.codeGenerator.op_addressof( REG_ECX, &method->GetUserProc() );
 
     //mov dword ptr[eax],ecx（デストラクタの関数ポインタ）

trunk/abdev/BasicCompiler32/MakePeHdr.cpp

@@ -206 +206 @@
     compiler.GetMeta().GetDllProcs().Iterator_Init();
 
-
+/*
     if( !compiler.GetMeta().WriteXml( Jenga::Common::Environment::GetAppDir() + "\\meta_test.xml" ) )
     {
@@ -216 +216 @@
         MessageBox(0,"XML読み込みに失敗","test",0);
     }
-/*
+
     if( !compiler.GetMeta().WriteBinaly( Jenga::Common::Environment::GetAppDir() + "\\meta_test.dat" ) )
     {
@@ -234 +234 @@
     {
         MessageBox(0,"バイナリ読み込みに失敗","test",0);
-    }*/
-    compiler.GetMeta() = (*pTempMeta);
+    }
+    compiler.GetMeta() = (*pTempMeta);*/
 
 

trunk/abdev/BasicCompiler32/x86CodeGenerator.cpp

@@ -1183 +1183 @@
 
     pNativeCode->Put( (char)0xE8 );
-    pobj_SubAddrSchedule->add(pUserProc,1);
-    pNativeCode->Put( (long)0 );
+    pNativeCode->PutUserProcSchedule( pUserProc, true );
 }
 void CodeGenerator::op_ret(){
@@ -1194 +1193 @@
     pNativeCode->Put( stackFrameSize );
 }
+void CodeGenerator::op_addressof( int reg, const UserProc *pUserProc )
+{
+    //mov reg,userProcAddress
+
+    //オペコード、レジスタ
+    pNativeCode->Put( (char)(0xB8|REGISTER_OPERAND(reg)) );
+
+    //DISP32
+    pNativeCode->PutUserProcSchedule( pUserProc, false );
+}