Changeset 345 in dev for trunk/abdev/BasicCompiler64

Timestamp:

Oct 10, 2007, 1:52:43 AM (17 years ago)

Author:

dai_9181

Message:

64ビット版でもインターフェイスのベース実装周りをコンパイルできるようにした（インターフェイス機構自体はまだ未完成）

Location:

trunk/abdev/BasicCompiler64

Files:

• BasicCompiler.vcproj (modified) (1 diff)
• Compile_CallProc.cpp (modified) (4 diffs)
• Compile_Func.cpp (modified) (1 diff)
• Compile_Object.cpp (modified) (3 diffs)
• Compile_Statement.cpp (modified) (1 diff)
• MakePeHdr.cpp (modified) (1 diff)
• NumOpe.cpp (modified) (1 diff)
• OperatorProc.cpp (modified) (2 diffs)

trunk/abdev/BasicCompiler64/BasicCompiler.vcproj

@@ -91 +91 @@
                 ProgramDatabaseFile=".\Debug/BasicCompiler64.pdb"
                 SubSystem="2"
+                StackReserveSize="4194304"
                 TargetMachine="0"
             />

trunk/abdev/BasicCompiler64/Compile_CallProc.cpp

@@ -89 +89 @@
 }
 
-bool Opcode_CallProc(const char *Parameter,const UserProc *pUserProc,DWORD dwFlags,const char *ObjectName){
-    int i2;
-
+bool Opcode_CallProc(const char *Parameter,const UserProc *pUserProc,DWORD dwFlags,const char *ObjectName)
+{
     if( pUserProc->IsMacro() ){
         if( lstrcmpi( pUserProc->GetName().c_str(), "Print" ) == 0 ){
@@ -165 +164 @@
         /////////////////////////////////
         pMethod = NULL;
-        if( ! isStatic ) pMethod = pobj_c->GetMethods().GetMethodPtr( pUserProc );
+        if( ! isStatic ) pMethod = pobj_c->GetDynamicMethods().GetMethodPtr( pUserProc );
         if( ! pMethod ){
             //動的メソッドが取得できなかったときは静的メソッドを当たる
@@ -362 +361 @@
         //                ->func3
 
+        // vtblマスターリストのポインタを取得
         //mov r11,qword ptr[rcx]
         compiler.codeGenerator.op_mov_RM(sizeof(_int64),REG_R11,REG_RCX,0,MOD_BASE);
 
-        i2 = pobj_c->GetFuncNumInVtbl( pUserProc );
+        // vtblのポインタを取得
+        //mov r11,dword ptr[r11+vtblMasterListIndex]
+        int vtblMasterListIndex = pobj_c->GetVtblMasterListIndex( pUserProc );
+        compiler.codeGenerator.op_mov_RM( sizeof(_int64), REG_R11, REG_R11, vtblMasterListIndex, MOD_BASE_DISP32 );
+
+        int vtblIndex = pobj_c->GetFuncNumInVtbl( pUserProc );
 
         //call qword ptr[r11+func_index]
-        if(i2*PTR_SIZE<=0x7F){
+        if( vtblIndex * PTR_SIZE <= 0x7F ){
             compiler.codeGenerator.PutOld(
                 (char)0x41,
                 (char)0xFF,
                 (char)0x53,
-                (char)(i2*PTR_SIZE)
+                (char)(vtblIndex*PTR_SIZE)
             );
         }
@@ -381 +386 @@
                 (char)0xFF,
                 (char)0x93,
-                (long)(i2*PTR_SIZE)
+                (long)(vtblIndex*PTR_SIZE)
             );
         }

trunk/abdev/BasicCompiler64/Compile_Func.cpp

@@ -121 +121 @@
         //                ->func3
 
+        // vtblマスターリストのポインタを取得
         //mov r11,qword ptr[rcx]
         compiler.codeGenerator.op_mov_RM(sizeof(_int64),REG_R11,REG_RCX,0,MOD_BASE);
 
-        int i2 = pobj_c->GetFuncNumInVtbl( &userProc );
+        // vtblのポインタを取得
+        //mov r11,dword ptr[r11+vtblMasterListIndex]
+        int vtblMasterListIndex = pobj_c->GetVtblMasterListIndex( &userProc );
+        compiler.codeGenerator.op_mov_RM( sizeof(_int64), REG_R11, REG_R11, vtblMasterListIndex, MOD_BASE_DISP32 );
+
+        int vtblIndex = pobj_c->GetFuncNumInVtbl( &userProc );
 
         //mov rax,qword ptr[r11+func_index]
-        if(i2*PTR_SIZE<=0x7F){
-            compiler.codeGenerator.op_mov_RM(sizeof(_int64),REG_RAX,REG_R11,i2*PTR_SIZE,MOD_BASE_DISP8);
-        }
-        else{
-            compiler.codeGenerator.op_mov_RM(sizeof(_int64),REG_RAX,REG_R11,i2*PTR_SIZE,MOD_BASE_DISP32);
+        if( vtblIndex * PTR_SIZE <= 0x7F )
+        {
+            compiler.codeGenerator.op_mov_RM(sizeof(_int64),REG_RAX,REG_R11,vtblIndex*PTR_SIZE,MOD_BASE_DISP8);
+        }
+        else
+        {
+            compiler.codeGenerator.op_mov_RM(sizeof(_int64),REG_RAX,REG_R11,vtblIndex*PTR_SIZE,MOD_BASE_DISP32);
         }
     }

trunk/abdev/BasicCompiler64/Compile_Object.cpp

@@ -37 +37 @@
 
     std::vector<const UserProc *> subs;
-    pobj_c->GetMethods().Enum( pobj_c->GetName().c_str(), subs );
+    pobj_c->GetDynamicMethods().Enum( pobj_c->GetName().c_str(), subs );
 
     const UserProc *pUserProc;
@@ -57 +57 @@
         // obj._System_SetType( _System_TypeBase.Search( strNamespace, name ) )
         subs.clear();
-        pobj_c->GetMethods().Enum( "_System_SetType", subs );
+        pobj_c->GetDynamicMethods().Enum( "_System_SetType", subs );
         if( subs.size() == 1 ){
             char temporary[VN_SIZE];
@@ -212 +212 @@
 
         // 仮想関数になるメソッドに使用チェックをつける
-        BOOST_FOREACH( const CMethod *pMethod, classObj.GetMethods() )
+        BOOST_FOREACH( const CMethod *pMethod, classObj.GetDynamicMethods() )
         {
             if( pMethod->IsVirtual() )
             {
                 pMethod->GetUserProc().Using();
+            }
+        }
+        BOOST_FOREACH( const ::Interface &objInterface, classObj.GetInterfaces() )
+        {
+            BOOST_FOREACH( const CMethod *pMethod, objInterface.GetDynamicMethods() )
+            {
+                if( pMethod->IsVirtual() )
+                {
+                    pMethod->GetUserProc().Using();
+                }
             }
         }

trunk/abdev/BasicCompiler64/Compile_Statement.cpp

@@ -684 +684 @@
                 if(type1.IsObject()){
                     std::vector<const UserProc *> subs;
-                    type1.GetClass().GetMethods().Enum( CALC_EQUAL, subs );
+                    type1.GetClass().GetDynamicMethods().Enum( CALC_EQUAL, subs );
                     if( subs.size() == 0 ){
                         return;

trunk/abdev/BasicCompiler64/MakePeHdr.cpp

@@ -1059 +1059 @@
     ////////////////////////////////////////
     //仮想関数データテーブルスケジュール
-    compiler.GetObjectModule().meta.GetClasses().ActionVtblSchedule(ImageBase,MemPos_CodeSection);
+    compiler.GetObjectModule().meta.GetClasses().ActionVtblSchedule( ImageBase, MemPos_CodeSection, MemPos_DataSection );
 
 

trunk/abdev/BasicCompiler64/NumOpe.cpp

@@ -233 +233 @@
     GetVarFormatString(methodName,parameter,lpPtrOffset,dummy,refType);
 
-    objClass.GetMethods().Enum( methodName, userProcs );
+    objClass.GetDynamicMethods().Enum( methodName, userProcs );
     if(userProcs.size()){
         //オーバーロードを解決

trunk/abdev/BasicCompiler64/OperatorProc.cpp

@@ -39 +39 @@
 
     std::vector<const UserProc *> subs;
-    pobj_c->GetMethods().Enum( idCalc, subs );
+    pobj_c->GetDynamicMethods().Enum( idCalc, subs );
     if( subs.size() == 0 ){
         return 0;
@@ -324 +324 @@
 
     std::vector<const UserProc *> subs;
-    classType.GetClass().GetMethods().Enum( CALC_ARRAY_GET, subs );
+    classType.GetClass().GetDynamicMethods().Enum( CALC_ARRAY_GET, subs );
     if( subs.size() == 0 ){
         return;