Changeset 345 in dev for trunk/abdev/BasicCompiler_Common

Timestamp:

Oct 10, 2007, 1:52:43 AM (17 years ago)

Author:

dai_9181

Message:

64ビット版でもインターフェイスのベース実装周りをコンパイルできるようにした（インターフェイス機構自体はまだ未完成）

Location:

trunk/abdev/BasicCompiler_Common

Files:

• include/Class.h (modified) (2 diffs)
• src/Class.cpp (modified) (4 diffs)

trunk/abdev/BasicCompiler_Common/include/Class.h

@@ -75 +75 @@
 {
     const CClass *pInterfaceClass;
-    mutable int vtblOffset;
+    mutable LONG_PTR vtblOffset;
 
 public:
@@ -480 +480 @@
     long vtbl_offset;
     long vtblMasterListOffset;
-    std::vector<LONG_PTR> vtblMasterList;
+    std::vector<long> vtblMasterList;
 public:
     int GetVtblMasterListIndex( const UserProc *pUserProc ) const;
     int GetFuncNumInVtbl( const UserProc *pUserProc ) const;
-    LONG_PTR GetVtblMasterListOffset() const;
-    void GenerateVTablePart( LONG_PTR &vtableDataTableOffset ) const;
-    void GenerateVTableMasterList( const std::vector<LONG_PTR> &vtableMasterList, LONG_PTR &offset );
+    long GetVtblMasterListOffset() const;
+    void GenerateVTablePart( long &vtableDataTableOffset ) 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 );

trunk/abdev/BasicCompiler_Common/src/Class.cpp

@@ -826 +826 @@
     return n;
 }
-LONG_PTR CClass::GetVtblMasterListOffset() const
+long CClass::GetVtblMasterListOffset() const
 {
     //既に存在する場合はそれを返す
@@ -836 +836 @@
     return vtblMasterListOffset;
 }
-void CClass::GenerateVTablePart( LONG_PTR &vtableDataTableOffset ) const
+void CClass::GenerateVTablePart( long &vtableDataTableOffset ) const
 {
     const UserProc **ppsi = (const UserProc **)malloc(GetVtblNum()*sizeof(UserProc *));
@@ -866 +866 @@
 
     for( int i=0; i < GetVtblNum(); i++ ){
-        pobj_Reloc->AddSchedule_DataSection(vtableDataTableOffset+i*sizeof(LONG_PTR));
+        pobj_Reloc->AddSchedule_DataSection(static_cast<DWORD>(vtableDataTableOffset+i*sizeof(LONG_PTR)));
     }
 
     free(ppsi);
 }
-void CClass::GenerateVTableMasterList( const std::vector<LONG_PTR> &vtableMasterList, LONG_PTR &offset )
+void CClass::GenerateVTableMasterList( const std::vector<long> &vtableMasterList, long &offset )
 {
     offset = compiler.GetObjectModule().dataTable.AddBinary(
         (void *)&vtableMasterList[0],
-        vtableMasterList.size()*sizeof(LONG_PTR)
+        static_cast<int>(vtableMasterList.size()*sizeof(LONG_PTR))
     );
 }
@@ -904 +904 @@
     BOOST_FOREACH( const ::Interface &objInterface, interfaces )
     {
-        LONG_PTR tempVtblOffset;
+        long tempVtblOffset;
         objInterface.GetClass().GenerateVTablePart( tempVtblOffset );
         vtblMasterList.push_back( tempVtblOffset );