Changeset 244 in dev for trunk/abdev

Timestamp:

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

Author:

dai_9181

Message:

 

Location:

trunk/abdev

Files:

• BasicCompiler32/Compile_Object.cpp (modified) (1 diff)
• BasicCompiler32/MakePeHdr.cpp (modified) (3 diffs)
• BasicCompiler32/x86CodeGenerator.cpp (modified) (2 diffs)
• BasicCompiler_Common/include/CodeGenerator.h (modified) (1 diff)
• BasicCompiler_Common/include/NativeCode.h (modified) (6 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 );
+}

trunk/abdev/BasicCompiler_Common/include/CodeGenerator.h

@@ -300 +300 @@
     void op_ret();
     void op_ret( short stackFrameSize );
+    void op_addressof( int reg, const UserProc *pUserProc );
 #endif
 

trunk/abdev/BasicCompiler_Common/include/NativeCode.h

@@ -9 +9 @@
 void AddLocalVarAddrSchedule();
 void ObpPlus( int step = 1 );
+
+class UserProc;
 
 class Schedule
@@ -20 +22 @@
         DataTable,      // データテーブル スケジュール
         Relocation,     // リロケーション情報スケジュール
+        UserProc,       // ユーザ定義関数呼び出し側スケジュール
+        AddressOf,      // ユーザ定義関数位置スケジュール
     };
 
 private:
     Type type;
-    int offset;
+    long offset;
+
+    union{
+        LONG_PTR lpValue;
+        const ::UserProc *pUserProc;
+    };
 
     // XMLシリアライズ用
@@ -39 +48 @@
     {
     }
-    Schedule( Type type, int offset )
+    Schedule( Type type, long offset )
         : type( type )
         , offset( offset )
+        , lpValue( 0 )
+    {
+    }
+    Schedule( const ::UserProc *pUserProc, long offest )
+        : type( Schedule::UserProc )
+        , offset( offset )
+        , pUserProc( pUserProc )
     {
     }
     ~Schedule()
     {
+    }
+
+    void SpecifyAddressOf()
+    {
+        if( type != Schedule::UserProc )
+        {
+            SetError();
+        }
+        type = Schedule::AddressOf;
     }
 };
@@ -191 +216 @@
         {
         case Schedule::None:
+            // 何もしない
             break;
         case Schedule::GlobalVar:
@@ -204 +230 @@
             break;
         case Schedule::Relocation:
+            // 未完成
             break;
         default:
@@ -214 +241 @@
         ObpPlus( sizeof(long) );
     }
+    void PutUserProcSchedule( const UserProc *pUserProc, bool isCall )
+    {
+        Schedule schedule( pUserProc, size );
+        if( isCall == false )
+        {
+            schedule.SpecifyAddressOf();
+        }
+        schedules.push_back( schedule );
+
+        *((long *)(codeBuffer+size))=0;
+        size += sizeof(long);
+
+
+
+        // 未完成
+        if( isCall )
+        {
+            pobj_SubAddrSchedule->add(pUserProc,1);
+        }
+        else
+        {
+            pobj_SubAddrSchedule->add(pUserProc,0);
+        }
+        extern char *OpBuffer;
+        extern int obp;
+        *((long *)(OpBuffer+obp))=0;
+        ObpPlus( sizeof(long) );
+    }
     void Put( short s )
     {