Changeset 587 in dev for trunk/ab5.0/abdev/BasicCompiler_Common/src/VtblGenerator.cpp

Timestamp:

May 10, 2008, 3:09:26 PM (16 years ago)

Author:

dai_9181

Message:

[585][586]をリバース。NativeCodeクラスとMetaクラスは依存関係があるので分離しない方針とする。

File:

• trunk/ab5.0/abdev/BasicCompiler_Common/src/VtblGenerator.cpp (modified) (8 diffs)

trunk/ab5.0/abdev/BasicCompiler_Common/src/VtblGenerator.cpp

@@ -3 +3 @@
 using namespace ActiveBasic::Compiler;
 
-int VtblGenerator::GenerateVTablePart( const Methods &methods )
+LONG_PTR VtblGenerator::GenerateVTablePart( const Methods &methods )
 {
     const UserProc **ppsi = (const UserProc **)malloc(methods.GetVtblNum()*sizeof(UserProc *));
@@ -29 +29 @@
     }
 
-    int vtableDataTableOffset = compiler.GetObjectModule().nativeSection.dataTable.AddBinary( (void *)ppsi, methods.GetVtblNum()*sizeof(LONG_PTR) );
+    LONG_PTR vtableDataTableOffset = compiler.GetObjectModule().dataTable.AddBinary( (void *)ppsi, methods.GetVtblNum()*sizeof(LONG_PTR) );
 
     for( int i=0; i < methods.GetVtblNum(); i++ )
@@ -61 +61 @@
 
     // 自身のクラスのvtblを生成
-    int thisClassVtblOffset = GenerateVTablePart( _class.GetDynamicMethods() );
+    LONG_PTR thisClassVtblOffset = GenerateVTablePart( _class.GetDynamicMethods() );
     _class.SetVtblOffset( thisClassVtblOffset );
     _class.vtblMasterList.push_back( thisClassVtblOffset );
@@ -68 +68 @@
     BOOST_FOREACH( const ::Interface *pInterface, _class.GetInterfaces() )
     {
-        int tempVtblOffset = GenerateVTablePart( pInterface->GetDynamicMethods() );
+        LONG_PTR tempVtblOffset = GenerateVTablePart( pInterface->GetDynamicMethods() );
         _class.vtblMasterList.push_back( tempVtblOffset );
 
@@ -84 +84 @@
 
     // vtblマスターリストを生成
-    int offset = compiler.GetObjectModule().nativeSection.dataTable.AddBinary(
+    int offset = compiler.GetObjectModule().dataTable.AddBinary(
         (void *)&_class.vtblMasterList[0],
         static_cast<int>(_class.vtblMasterList.size()*sizeof(LONG_PTR))
@@ -119 +119 @@
     // 自身のクラスのvtbl
     {
-        LONG_PTR *pVtbl = (LONG_PTR *)((char *)compiler.GetObjectModule().nativeSection.dataTable.GetPtr() + _class.GetVtblOffset());
+        LONG_PTR *pVtbl = (LONG_PTR *)((char *)compiler.GetObjectModule().dataTable.GetPtr() + _class.GetVtblOffset());
 
         for( int i=0; i<_class.GetVtblNum(); i++ ){
@@ -138 +138 @@
     BOOST_FOREACH( const ::Interface *pInterface, _class.GetInterfaces() )
     {
-        LONG_PTR *pVtbl = (LONG_PTR *)((char *)compiler.GetObjectModule().nativeSection.dataTable.GetPtr() + pInterface->GetVtblOffset());
+        LONG_PTR *pVtbl = (LONG_PTR *)((char *)compiler.GetObjectModule().dataTable.GetPtr() + pInterface->GetVtblOffset());
 
         for( int i=0; i<pInterface->GetClass().GetVtblNum(); i++ ){
@@ -155 +155 @@
 
     // vtblマスターリスト
-    LONG_PTR *pVtblMasterList = (LONG_PTR *)((char *)compiler.GetObjectModule().nativeSection.dataTable.GetPtr() + _class.GetVtblMasterListOffset() );
+    LONG_PTR *pVtblMasterList = (LONG_PTR *)((char *)compiler.GetObjectModule().dataTable.GetPtr() + _class.GetVtblMasterListOffset() );
     for( int i=0; i<static_cast<int>(_class.vtblMasterList.size()); i++ )
     {