Changeset 348 in dev for trunk

Timestamp:

Oct 12, 2007, 3:25:54 AM (17 years ago)

Author:

dai_9181

Message:

 

Location:

trunk/abdev

Files:

• BasicCompiler32/Compile_CallProc.cpp (modified) (2 diffs)
• BasicCompiler32/Compile_Func.cpp (modified) (2 diffs)
• BasicCompiler64/Compile_CallProc.cpp (modified) (2 diffs)
• BasicCompiler64/Compile_Func.cpp (modified) (2 diffs)
• BasicCompiler_Common/include/Class.h (modified) (1 diff)
• BasicCompiler_Common/include/Symbol.h (modified) (1 diff)
• BasicCompiler_Common/src/Class.cpp (modified) (4 diffs)
• BasicCompiler_Common/src/Symbol.cpp (modified) (1 diff)

trunk/abdev/BasicCompiler32/Compile_CallProc.cpp

@@ -330 +330 @@
         //                ->func3
 
+        int vtblMasterListIndex, vtblIndex;
+        pobj_c->GetVtblMasterListIndexAndVtblIndex( pUserProc, vtblMasterListIndex, vtblIndex );
+
         // vtblマスターリストのポインタを取得
         //mov edx,dword ptr[ecx]
@@ -336 +339 @@
         // vtblのポインタを取得
         //mov edx,dword ptr[edx+vtblMasterListIndex]
-        int vtblMasterListIndex = pobj_c->GetVtblMasterListIndex( pUserProc );
         compiler.codeGenerator.op_mov_RM( sizeof(long), REG_EDX, REG_EDX, vtblMasterListIndex, MOD_BASE_DISP32 );
-
-        int vtblIndex = pobj_c->GetFuncNumInVtbl( pUserProc );
 
         //call dword ptr[edx+func_index]

trunk/abdev/BasicCompiler32/Compile_Func.cpp

@@ -274 +274 @@
         //                ->func3
 
+        int vtblMasterListIndex, vtblIndex;
+        pobj_c->GetVtblMasterListIndexAndVtblIndex( &userProc, vtblMasterListIndex, vtblIndex );
+
         // vtblマスターリストのポインタを取得
         //mov edx,dword ptr[ecx]
@@ -280 +283 @@
         // vtblのポインタを取得
         //mov edx,dword ptr[edx+vtblMasterListIndex]
-        int vtblMasterListIndex = pobj_c->GetVtblMasterListIndex( &userProc );
         compiler.codeGenerator.op_mov_RM( sizeof(long), REG_EDX, REG_EDX, vtblMasterListIndex, MOD_BASE_DISP32 );
-
-        int vtblIndex = pobj_c->GetFuncNumInVtbl( &userProc );
 
         //mov eax,dword ptr[edx+func_index]

trunk/abdev/BasicCompiler64/Compile_CallProc.cpp

@@ -361 +361 @@
         //                ->func3
 
+        int vtblMasterListIndex, vtblIndex;
+        pobj_c->GetVtblMasterListIndexAndVtblIndex( pUserProc, vtblMasterListIndex, vtblIndex );
+
         // vtblマスターリストのポインタを取得
         //mov r11,qword ptr[rcx]
@@ -367 +370 @@
         // 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 );
+        compiler.codeGenerator.op_mov_RM( sizeof(_int64), REG_R11, REG_R11, vtblMasterListIndex*PTR_SIZE, MOD_BASE_DISP32 );
 
         //call qword ptr[r11+func_index]

trunk/abdev/BasicCompiler64/Compile_Func.cpp

@@ -121 +121 @@
         //                ->func3
 
+        int vtblMasterListIndex, vtblIndex;
+        pobj_c->GetVtblMasterListIndexAndVtblIndex( &userProc, vtblMasterListIndex, vtblIndex );
+
         // vtblマスターリストのポインタを取得
         //mov r11,qword ptr[rcx]
@@ -127 +130 @@
         // 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]

trunk/abdev/BasicCompiler_Common/include/Class.h

@@ -493 +493 @@
     std::vector<long> vtblMasterList;
 public:
-    int GetVtblMasterListIndex( const UserProc *pUserProc ) const;
-    int GetFuncNumInVtbl( const UserProc *pUserProc ) const;
+    void GetVtblMasterListIndexAndVtblIndex( const UserProc *pUserProc, int &vtblMasterListIndex, int &vtblIndex ) const;
     long GetVtblMasterListOffset() const;
     void GenerateVTableMasterList( const std::vector<long> &vtableMasterList, long &offset );

trunk/abdev/BasicCompiler_Common/include/Symbol.h

@@ -69 +69 @@
         return name;
     }
+    std::string GetFullName() const;
 
     // シンボル比較

trunk/abdev/BasicCompiler_Common/src/Class.cpp

@@ -817 +817 @@
 }
 
-int CClass::GetVtblMasterListIndex( const UserProc *pUserProc ) const
-{
-    int index = 0;
+void CClass::GetVtblMasterListIndexAndVtblIndex( const UserProc *pUserProc, int &vtblMasterListIndex, int &vtblIndex ) const
+{
+    vtblMasterListIndex = 0;
+
+    vtblIndex = 0;
     BOOST_FOREACH( const CMethod *pMethod, GetDynamicMethods() ){
         if( &pMethod->GetUserProc() == pUserProc )
         {
-            return index;
+            return;
+        }
+
+        if( pMethod->IsVirtual() )
+        {
+            vtblIndex++;
         }
     }
@@ -829 +836 @@
     BOOST_FOREACH( const ::Interface *pInterface, interfaces )
     {
-        index++;
-
+        vtblMasterListIndex++;
+
+        vtblIndex = 0;
         BOOST_FOREACH( const CMethod *pMethod, pInterface->GetDynamicMethods() ){
             if( &pMethod->GetUserProc() == pUserProc )
             {
-                return index;
+                return;
+            }
+
+            if( pMethod->IsVirtual() )
+            {
+                vtblIndex++;
             }
         }
@@ -840 +853 @@
 
     SetError();
-    return 0;
-}
-int CClass::GetFuncNumInVtbl( const UserProc *pUserProc ) const
-{
-    int n = 0;
-    BOOST_FOREACH( const CMethod *pMethod, GetDynamicMethods() ){
-        if( &pMethod->GetUserProc() == pUserProc ) break;
-        if( pMethod->IsVirtual() ) n++;
-    }
-    return n;
+    return;
 }
 long CClass::GetVtblMasterListOffset() const
@@ -1523 +1527 @@
             }
 
-            if( pobj_c->GetName() == "Object" || dwClassType == ESC_TYPE ){
+            if( pobj_c->GetName() == "Object"
+                || pobj_c->GetFullName() == "ActiveBasic.Core.InterfaceInfo"
+                || dwClassType == ESC_TYPE )
+            {
+                // 何も継承しない
+
                 if( &pobj_c->GetSuperClass() || pobj_c->GetVtblNum() )
                 {

trunk/abdev/BasicCompiler_Common/src/Symbol.cpp

@@ -26 +26 @@
     namespaceScopes = NamespaceScopes( areaName );
     name = nestName;
+}
+
+std::string Symbol::GetFullName() const
+{
+    if( namespaceScopes.size() )
+    {
+        return namespaceScopes.ToString() + "." + name;
+    }
+
+    return name;
 }