Changeset 342 in dev for trunk/abdev/BasicCompiler_Common/include

Timestamp:

Oct 9, 2007, 1:10:33 AM (17 years ago)

Author:

dai_9181

Message:

vtblの構造を変更。vtblMasterListをはさんでvtblを表現した。
その他メンバ名変更。
ClassPrototypeクラスを追加。

File:

• trunk/abdev/BasicCompiler_Common/include/Class.h (modified) (14 diffs)

trunk/abdev/BasicCompiler_Common/include/Class.h

@@ -12 +12 @@
 class Delegate;
 
-class InheritedInterface
+class ClassPrototype : public Prototype
 {
-    CClass *pInterfaceClass;
-    int vtblOffset;
-public:
-    InheritedInterface( CClass *pInterfaceClass, int vtblOffset )
+    // 動的メソッド
+    Methods dynamicMethods;
+
+    // XMLシリアライズ用
+private:
+    friend class boost::serialization::access;
+    template<class Archive> void serialize(Archive& ar, const unsigned int version)
+    {
+        ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP( Prototype );
+        ar & BOOST_SERIALIZATION_NVP( dynamicMethods );
+    }
+
+public:
+    ClassPrototype( const NamespaceScopes &namespaceScopes, const string &name )
+        : Prototype( namespaceScopes, name )
+    {
+    }
+    ClassPrototype()
+        : Prototype()
+    {
+    }
+    const Methods &GetDynamicMethods() const
+    {
+        return dynamicMethods;
+    }
+    Methods &GetDynamicMethods()
+    {
+        return dynamicMethods;
+    }
+};
+
+class Interface : public ClassPrototype
+{
+    const CClass *pInterfaceClass;
+    mutable int vtblOffset;
+public:
+    Interface( const CClass *pInterfaceClass )
         : pInterfaceClass( pInterfaceClass )
-        , vtblOffset( vtblOffset )
-    {
-    }
-
-    CClass &GetInterfaceClass() const{
+        , vtblOffset( -1 )
+    {
+    }
+
+    const CClass &GetClass() const{
         return *pInterfaceClass;
     }
-    int GetVtblOffset() const
+    LONG_PTR GetVtblOffset() const
     {
         return vtblOffset;
     }
+    void SetVtblOffset( LONG_PTR vtblOffset ) const
+    {
+        this->vtblOffset = vtblOffset;
+    }
 };
-typedef vector<InheritedInterface> Interfaces;
-
-class CClass: public Prototype, public Jenga::Common::ObjectInHashmap<CClass>
+typedef std::vector<Interface> Interfaces;
+
+class CClass: public ClassPrototype, public Jenga::Common::ObjectInHashmap<CClass>
 {
 public:
@@ -73 +110 @@
 
     // 動的メソッド
-    Methods methods;
     int ConstructorMemberSubIndex;
     int DestructorMemberSubIndex;
@@ -92 +128 @@
         trace_for_serialize( "serializing - CClass" );
 
-        ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP( Prototype );
+        ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP( ClassPrototype );
         ar & BOOST_SERIALIZATION_NVP( classType );
         ar & BOOST_SERIALIZATION_NVP( importedNamespaces );
@@ -102 +138 @@
         ar & BOOST_SERIALIZATION_NVP( dynamicMembers );
         ar & BOOST_SERIALIZATION_NVP( staticMembers );
-        ar & BOOST_SERIALIZATION_NVP( methods );
         ar & BOOST_SERIALIZATION_NVP( ConstructorMemberSubIndex );
         ar & BOOST_SERIALIZATION_NVP( DestructorMemberSubIndex );
@@ -114 +149 @@
 
     CClass( const NamespaceScopes &namespaceScopes, const NamespaceScopesCollection &importedNamespaces, const string &name )
-        : Prototype( namespaceScopes, name )
+        : ClassPrototype( namespaceScopes, name )
         , importedNamespaces( importedNamespaces )
         , classType( Class )
@@ -131 +166 @@
     }
     CClass()
-        : Prototype()
+        : ClassPrototype()
         , importedNamespaces()
         , classType()
@@ -292 +327 @@
         return ( interfaces.size() != 0 );
     }
+    const Interfaces &GetInterfaces() const
+    {
+        return interfaces;
+    }
     bool IsInheritsInterface( const CClass *pInterfaceClass ) const;
 
@@ -300 +339 @@
 
     // インターフェイス実装
+    bool Implements( const CClass &interfaceClass, int nowLine );
     bool Implements( const char *interfaceNames, int nowLine );
 
@@ -331 +371 @@
     }
 
-    const Methods &GetMethods() const
-    {
-        return methods;
-    }
     const Methods &GetStaticMethods() const
     {
         return staticMethods;
-    }
-    Methods &GetMethods()
-    {
-        return methods;
     }
     Methods &GetStaticMethods()
@@ -352 +384 @@
     {
         if( ConstructorMemberSubIndex == -1 ) return NULL;
-        return methods[ConstructorMemberSubIndex];
+        return GetDynamicMethods()[ConstructorMemberSubIndex];
     }
     void SetConstructorMemberSubIndex( int constructorMemberSubIndex )
@@ -363 +395 @@
     {
         if( DestructorMemberSubIndex == -1 ) return NULL;
-        return methods[DestructorMemberSubIndex];
+        return GetDynamicMethods()[DestructorMemberSubIndex];
     }
     void SetDestructorMemberSubIndex( int destructorMemberSubIndex )
@@ -373 +405 @@
     const ::Delegate &GetDelegate() const;
 
+    // ユーザ指定のアラインメント固定値
+    int GetFixedAlignment() const
+    {
+        return fixedAlignment;
+    }
+    void SetFixedAlignment( int fixedAlignment )
+    {
+        this->fixedAlignment = fixedAlignment;
+    }
+
+    // メンバの総合サイズを取得
+    int GetSize() const;
+
+    // メンバのオフセットを取得
+    int GetMemberOffset( const char *memberName, int *pMemberNum = NULL ) const;
+private:
+    // アラインメント値を取得
+    int GetAlignment() const;
+
+
+    /////////////////////////////////////////////////////////////////
+    // vtbl
+    /////////////////////////////////////////////////////////////////
+public:
     // vtblに存在する仮想関数の数
     int GetVtblNum() const
@@ -390 +446 @@
         return ( vtblNum > 0 );
     }
-
-    // ユーザ指定のアラインメント固定値
-    int GetFixedAlignment() const
-    {
-        return fixedAlignment;
-    }
-    void SetFixedAlignment( int fixedAlignment )
-    {
-        this->fixedAlignment = fixedAlignment;
-    }
-
-    // メンバの総合サイズを取得
-    int GetSize() const;
-
-    // メンバのオフセットを取得
-    int GetMemberOffset( const char *memberName, int *pMemberNum = NULL ) const;
-private:
-    // アラインメント値を取得
-    int GetAlignment() const;
-
-    //vtbl
-protected:
-    mutable long vtbl_offset;
-public:
+    
+private:
+    long vtbl_offset;
+    long vtblMasterListOffset;
+    std::vector<LONG_PTR> vtblMasterList;
+public:
+    int GetVtblMasterListIndex( const UserProc *pUserProc ) const;
     int GetFuncNumInVtbl( const UserProc *pUserProc ) const;
-    LONG_PTR GetVtblGlobalOffset(void) const;
-    void GenerateVTables();
-    void ActionVtblSchedule(LONG_PTR ImageBase, LONG_PTR MemPos_CodeSection);
+    LONG_PTR GetVtblMasterListOffset() const;
+    void GenerateVTablePart( LONG_PTR &vtableDataTableOffset ) const;
+    void GenerateVTableMasterList( const std::vector<LONG_PTR> &vtableMasterList, LONG_PTR &offset );
+    void GenerateFullVTables();
+    void ActionVtblSchedule( LONG_PTR ImageBase, LONG_PTR MemPos_CodeSection, LONG_PTR MemPos_DataSection );
     bool IsAbstract() const;
 
@@ -444 +485 @@
     virtual void CollectClassesForNameOnly( const BasicSource &source );
 
+    // vtblを一時的に生成
     void GenerateVTables();
-    void ActionVtblSchedule(LONG_PTR ImageBase, LONG_PTR MemPos_CodeSection);
+
+    // vtblのを正規のオフセットで再構築
+    void ActionVtblSchedule(LONG_PTR ImageBase, LONG_PTR MemPos_CodeSection, LONG_PTR MemPos_DataSection );
 
     virtual void InitStaticMember();