Changeset 559 in dev for trunk/ab5.0/abdev/BasicCompiler_Common/include

Timestamp:

May 5, 2008, 12:26:44 PM (17 years ago)

Author:

dai_9181

Message:

VtblGeneratorクラスを追加。Classes/CClassクラスのvtbl生成関連の実装をVtblGeneratorクラスに移動した。

Location:

trunk/ab5.0/abdev/BasicCompiler_Common/include

Files:

• Class.h (modified) (2 diffs)
• Method.h (modified) (1 diff)
• VtblGenerator.h (added)

trunk/ab5.0/abdev/BasicCompiler_Common/include/Class.h

@@ -437 +437 @@
     long comVtblOffset;
     long vtblMasterListOffset;
+public:
     std::vector<long> vtblMasterList;
-public:
+    LONG_PTR GetVtblOffset() const
+    {
+        return vtbl_offset;
+    }
+    void SetVtblOffset( int vtblOffset )
+    {
+        this->vtbl_offset = vtblOffset;
+    }
+    long GetComVtblOffset() const
+    {
+        return comVtblOffset;
+    }
+    void SetComVtblOffset( int comVtblOffset )
+    {
+        this->comVtblOffset = comVtblOffset;
+    }
     void GetVtblMasterListIndexAndVtblIndex( const UserProc *pUserProc, int &vtblMasterListIndex, int &vtblIndex ) const;
     int GetVtblMasterListIndex( const CClass *pClass ) const;
-    long GetComVtblOffset() const;
     long GetVtblMasterListOffset() const;
-    void GenerateVTableMasterList( const std::vector<long> &vtableMasterList, long &offset );
-    void GenerateFullVTables();
-    void ActionVtblSchedule( LONG_PTR ImageBase, LONG_PTR MemPos_CodeSection, LONG_PTR MemPos_DataSection );
+    void SetVtblMasterListOffset( int vtblMasterListOffset )
+    {
+        this->vtblMasterListOffset = vtblMasterListOffset;
+    }
     bool IsAbstract() const;
 
@@ -484 +500 @@
     bool Insert( CClass *pClass, int nowLine );
     CClass *Add( const NamespaceScopes &namespaceScopes, const NamespaceScopesCollection &importedNamespaces, const char *name,int nowLine);
-
-    // vtblを一時的に生成
-    void GenerateVTables();
-
-    // vtblのを正規のオフセットで再構築
-    void ActionVtblSchedule(LONG_PTR ImageBase, LONG_PTR MemPos_CodeSection, LONG_PTR MemPos_DataSection );
 
     virtual void InitStaticMember();

trunk/ab5.0/abdev/BasicCompiler_Common/include/Method.h

@@ -273 +273 @@
     // 仮想メソッドの個数を取得
     int GetVtblNum() const;
-
-    // vtblを生成
-    void GenerateVTablePart( long &vtableDataTableOffset ) const;
-};
+};