Changeset 347 in dev for trunk

Timestamp:

Oct 11, 2007, 3:23:51 AM (17 years ago)

Author:

dai_9181

Message:

 

Location:

trunk/abdev

Files:

• BasicCompiler32/Compile_CallProc.cpp (modified) (1 diff)
• BasicCompiler32/NumOpe.cpp (modified) (1 diff)
• BasicCompiler64/Compile_CallProc.cpp (modified) (1 diff)
• BasicCompiler64/NumOpe.cpp (modified) (1 diff)
• BasicCompiler_Common/NumOpe_GetType.cpp (modified) (1 diff)
• BasicCompiler_Common/hash.cpp (modified) (3 diffs)
• BasicCompiler_Common/include/Class.h (modified) (2 diffs)
• BasicCompiler_Common/include/Method.h (modified) (1 diff)
• BasicCompiler_Common/src/Class.cpp (modified) (7 diffs)
• BasicCompiler_Common/src/Method.cpp (modified) (1 diff)

trunk/abdev/BasicCompiler32/Compile_CallProc.cpp

@@ -156 +156 @@
         /////////////////////////////////
         pMethod = NULL;
-        if( ! isStatic ) pMethod = pobj_c->GetDynamicMethods().GetMethodPtr( pUserProc );
+        if( ! isStatic ) pMethod = pobj_c->GetDynamicMethodOfInterfaceMethod( pUserProc );
         if( ! pMethod ){
             //動的メソッドが取得できなかったときは静的メソッドを当たる

trunk/abdev/BasicCompiler32/NumOpe.cpp

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

trunk/abdev/BasicCompiler64/Compile_CallProc.cpp

@@ -164 +164 @@
         /////////////////////////////////
         pMethod = NULL;
-        if( ! isStatic ) pMethod = pobj_c->GetDynamicMethods().GetMethodPtr( pUserProc );
+        if( ! isStatic ) pMethod = pobj_c->GetDynamicMethodOfInterfaceMethod( pUserProc );
         if( ! pMethod ){
             //動的メソッドが取得できなかったときは静的メソッドを当たる

trunk/abdev/BasicCompiler64/NumOpe.cpp

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

trunk/abdev/BasicCompiler_Common/NumOpe_GetType.cpp

@@ -342 +342 @@
 
     vector<const UserProc *> userProcs;
-    leftType.GetClass().GetDynamicMethods().Enum( methodName, userProcs );
+    leftType.GetClass().EnumDynamicMethodsOfInterfaceMethods( methodName, userProcs );
     if(userProcs.size()){
         //オーバーロードを解決

trunk/abdev/BasicCompiler_Common/hash.cpp

@@ -90 +90 @@
             else{
                 //動的メソッドから列挙
-                pobj_c->GetDynamicMethods().Enum( NestMember, subs );
+                pobj_c->EnumDynamicMethodsOfInterfaceMethods( NestMember, subs );
             }
 
@@ -105 +105 @@
 
         // 動的メソッド
-        compiler.pCompilingClass->GetDynamicMethods().Enum( name, subs );
+        compiler.pCompilingClass->EnumDynamicMethodsOfInterfaceMethods( name, subs );
     }
 
@@ -157 +157 @@
     if( pClass ){
         vector<const UserProc *> userProcs;
-        pClass->GetDynamicMethods().Enum( methodName, userProcs );
+        pClass->EnumDynamicMethodsOfInterfaceMethods( methodName, userProcs );
         if( userProcs.size() == 1 ){
             return userProcs[0];

trunk/abdev/BasicCompiler_Common/include/Class.h

@@ -409 +409 @@
     }
 
+    void EnumDynamicMethodsOfInterfaceMethods( const char *methodName, std::vector<const UserProc *> &subs ) const;
+    const CMethod *GetDynamicMethodOfInterfaceMethod( const UserProc *pUserProc ) const;
+
     const Methods &GetStaticMethods() const
     {
@@ -493 +496 @@
     int GetFuncNumInVtbl( const UserProc *pUserProc ) const;
     long GetVtblMasterListOffset() const;
-    void GenerateVTablePart( long &vtableDataTableOffset ) const;
     void GenerateVTableMasterList( const std::vector<long> &vtableMasterList, long &offset );
     void GenerateFullVTables();

trunk/abdev/BasicCompiler_Common/include/Method.h

@@ -204 +204 @@
     virtual void Enum( const char *methodName, vector<const UserProc *> &subs ) const;
     virtual void Enum( BYTE idOperatorCalc, vector<const UserProc *> &subs ) const;
-};
+
+    // 仮想メソッドの個数を取得
+    int GetVtblNum() const;
+
+    // vtblを生成
+    void GenerateVTablePart( long &vtableDataTableOffset ) const;
+};

trunk/abdev/BasicCompiler_Common/src/Class.cpp

@@ -665 +665 @@
 }
 
+void CClass::EnumDynamicMethodsOfInterfaceMethods( const char *methodName, std::vector<const UserProc *> &subs ) const
+{
+    // 動的メソッド
+    GetDynamicMethods().Enum( methodName, subs );
+
+    // インターフェイス メソッド
+    BOOST_FOREACH( ::Interface *pInterface, GetInterfaces() )
+    {
+        pInterface->GetDynamicMethods().Enum( methodName, subs );
+    }
+}
+const CMethod *CClass::GetDynamicMethodOfInterfaceMethod( const UserProc *pUserProc ) const
+{
+    // 動的メソッド
+    const CMethod *result = GetDynamicMethods().GetMethodPtr( pUserProc );
+
+    if( !result )
+    {
+        // インターフェイス メソッド
+        BOOST_FOREACH( ::Interface *pInterface, GetInterfaces() )
+        {
+            result = pInterface->GetDynamicMethods().GetMethodPtr( pUserProc );
+        }
+    }
+
+    return result;
+}
+
 const ::Delegate &CClass::GetDelegate() const
 {
@@ -803 +831 @@
         index++;
 
-        BOOST_FOREACH( const CMethod *pMethod, pInterface->GetClass().GetDynamicMethods() ){
+        BOOST_FOREACH( const CMethod *pMethod, pInterface->GetDynamicMethods() ){
             if( &pMethod->GetUserProc() == pUserProc )
             {
@@ -833 +861 @@
     return vtblMasterListOffset;
 }
-void CClass::GenerateVTablePart( long &vtableDataTableOffset ) const
-{
-    const UserProc **ppsi = (const UserProc **)malloc(GetVtblNum()*sizeof(UserProc *));
-
-    //関数テーブルに値をセット
-    int i2 = 0;
-    BOOST_FOREACH( const CMethod *pMethod, GetDynamicMethods() ){
-        if(pMethod->IsVirtual()){
-            if( !pMethod->GetUserProc().IsUsing() )
-            {
-                ts((char *)pMethod->GetUserProc().GetFullName().c_str());
-            }
-            pMethod->GetUserProc().Using();
-
-            if(pMethod->IsAbstract()){
-                extern int cp;
-                SmoothieException::Throw(300,NULL,cp);
-
-                ppsi[i2]=0;
-            }
-            else{
-                ppsi[i2]=&pMethod->GetUserProc();
-            }
-            i2++;
-        }
-    }
-
-    vtableDataTableOffset = compiler.GetObjectModule().dataTable.AddBinary( (void *)ppsi, GetVtblNum()*sizeof(LONG_PTR) );
-
-    for( int i=0; i < GetVtblNum(); i++ ){
-        pobj_Reloc->AddSchedule_DataSection(static_cast<DWORD>(vtableDataTableOffset+i*sizeof(LONG_PTR)));
-    }
-
-    free(ppsi);
-}
 void CClass::GenerateVTableMasterList( const std::vector<long> &vtableMasterList, long &offset )
 {
@@ -895 +888 @@
 
     // 自身のクラスのvtblを生成
-    GenerateVTablePart( this->vtbl_offset );
+    GetDynamicMethods().GenerateVTablePart( this->vtbl_offset );
     vtblMasterList.push_back( this->vtbl_offset );
 
@@ -902 +895 @@
     {
         long tempVtblOffset;
-        pInterface->GetClass().GenerateVTablePart( tempVtblOffset );
+        pInterface->GetDynamicMethods().GenerateVTablePart( tempVtblOffset );
         vtblMasterList.push_back( tempVtblOffset );
 
@@ -946 +939 @@
     BOOST_FOREACH( const ::Interface *pInterface, interfaces )
     {
-        LONG_PTR *pVtbl = (LONG_PTR *)((char *)compiler.GetObjectModule().dataTable.GetPtr() + pInterface->GetClass().vtbl_offset);
+        LONG_PTR *pVtbl = (LONG_PTR *)((char *)compiler.GetObjectModule().dataTable.GetPtr() + pInterface->GetVtblOffset());
 
         for( int i=0; i<pInterface->GetClass().GetVtblNum(); i++ ){
@@ -1945 +1938 @@
         }
 
-        pCompilingMethod = pParentClass->GetDynamicMethods().GetMethodPtr( pUserProc );
+        pCompilingMethod = pParentClass->GetDynamicMethodOfInterfaceMethod( pUserProc );
         if( !pCompilingMethod ){
             pCompilingMethod = pParentClass->GetStaticMethods().GetMethodPtr( pUserProc );

trunk/abdev/BasicCompiler_Common/src/Method.cpp

@@ -103 +103 @@
     }
 }
+
+int Methods::GetVtblNum() const
+{
+    int count = 0;
+    const Methods &methods = *this;
+    BOOST_FOREACH( const CMethod *pMethod, methods )
+    {
+        if( pMethod->IsVirtual() )
+        {
+            count++;
+        }
+    }
+    return count;
+}
+
+void Methods::GenerateVTablePart( long &vtableDataTableOffset ) const
+{
+    const UserProc **ppsi = (const UserProc **)malloc(GetVtblNum()*sizeof(UserProc *));
+
+    //関数テーブルに値をセット
+    int i2 = 0;
+    const Methods &methods = *this;
+    BOOST_FOREACH( const CMethod *pMethod, methods ){
+        if(pMethod->IsVirtual()){
+            if( !pMethod->GetUserProc().IsUsing() )
+            {
+                ts((char *)pMethod->GetUserProc().GetFullName().c_str());
+            }
+            pMethod->GetUserProc().Using();
+
+            if(pMethod->IsAbstract()){
+                SetError();
+
+                ppsi[i2]=0;
+            }
+            else{
+                ppsi[i2]=&pMethod->GetUserProc();
+            }
+            i2++;
+        }
+    }
+
+    vtableDataTableOffset = compiler.GetObjectModule().dataTable.AddBinary( (void *)ppsi, GetVtblNum()*sizeof(LONG_PTR) );
+
+    for( int i=0; i < GetVtblNum(); i++ ){
+        pobj_Reloc->AddSchedule_DataSection(static_cast<DWORD>(vtableDataTableOffset+i*sizeof(LONG_PTR)));
+    }
+
+    free(ppsi);
+}