Changeset 593 in dev for trunk

Timestamp:

May 10, 2008, 6:28:58 PM (16 years ago)

Author:

dai_9181

Message:

vtblOffsetの内部保持型をintに統一。

Location:

trunk/ab5.0/abdev/BasicCompiler_Common

Files:

• include/Class.h (modified) (2 diffs)
• include/Interface.h (modified) (2 diffs)
• include/VtblGenerator.h (modified) (1 diff)
• src/VtblGenerator.cpp (modified) (4 diffs)

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

@@ -431 +431 @@
     
 private:
-    long vtbl_offset;
-    long comVtblOffset;
-    long vtblMasterListOffset;
+    int vtbl_offset;
+    int comVtblOffset;
+    int vtblMasterListOffset;
 public:
     std::vector<long> vtblMasterList;
-    LONG_PTR GetVtblOffset() const
+    int GetVtblOffset() const
     {
         return vtbl_offset;
@@ -444 +444 @@
         this->vtbl_offset = vtblOffset;
     }
-    long GetComVtblOffset() const
+    int GetComVtblOffset() const
     {
         return comVtblOffset;

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

@@ -42 +42 @@
 {
     const CClass *pInterfaceClass;
-    mutable LONG_PTR vtblOffset;
+    mutable int vtblOffset;
 
     // 型パラメータ（実パラメータ）
@@ -75 +75 @@
         return *pInterfaceClass;
     }
-    LONG_PTR GetVtblOffset() const
+    int GetVtblOffset() const
     {
         return vtblOffset;
     }
-    void SetVtblOffset( LONG_PTR vtblOffset ) const
+    void SetVtblOffset( int vtblOffset ) const
     {
         this->vtblOffset = vtblOffset;

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

@@ -8 +8 @@
 public:
     // vtblを一時的に生成
-    static LONG_PTR GenerateVTablePart( const Methods &methods );
+    static int GenerateVTablePart( const Methods &methods );
     static void GenerateFullVTables( CClass &_class );
     static void GenerateVTablesForAllClasses( Classes &classes );

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

@@ -3 +3 @@
 using namespace ActiveBasic::Compiler;
 
-LONG_PTR VtblGenerator::GenerateVTablePart( const Methods &methods )
+int VtblGenerator::GenerateVTablePart( const Methods &methods )
 {
     const UserProc **ppsi = (const UserProc **)malloc(methods.GetVtblNum()*sizeof(UserProc *));
@@ -29 +29 @@
     }
 
-    LONG_PTR vtableDataTableOffset = compiler.GetObjectModule().dataTable.AddBinary( (void *)ppsi, methods.GetVtblNum()*sizeof(LONG_PTR) );
+    int vtableDataTableOffset = compiler.GetObjectModule().dataTable.AddBinary( (void *)ppsi, methods.GetVtblNum()*sizeof(LONG_PTR) );
 
     for( int i=0; i < methods.GetVtblNum(); i++ )
@@ -61 +61 @@
 
     // 自身のクラスのvtblを生成
-    LONG_PTR thisClassVtblOffset = GenerateVTablePart( _class.GetDynamicMethods() );
+    int thisClassVtblOffset = GenerateVTablePart( _class.GetDynamicMethods() );
     _class.SetVtblOffset( thisClassVtblOffset );
     _class.vtblMasterList.push_back( thisClassVtblOffset );
@@ -68 +68 @@
     BOOST_FOREACH( const ::Interface *pInterface, _class.GetInterfaces() )
     {
-        LONG_PTR tempVtblOffset = GenerateVTablePart( pInterface->GetDynamicMethods() );
+        int tempVtblOffset = GenerateVTablePart( pInterface->GetDynamicMethods() );
         _class.vtblMasterList.push_back( tempVtblOffset );