Changeset 282 in dev for trunk

Timestamp:

Aug 14, 2007, 11:57:32 PM (17 years ago)

Author:

dai_9181

Message:

vtbl構築をコード生成後（最終リンクの前）に行うようにした

Location:

trunk/abdev

Files:

• BasicCompiler32/Compile_ProcOp.cpp (modified) (1 diff)
• BasicCompiler32/MakePeHdr.cpp (modified) (2 diffs)
• BasicCompiler32/x86CodeGenerator.cpp (modified) (1 diff)
• BasicCompiler_Common/include/Class.h (modified) (2 diffs)
• BasicCompiler_Common/include/CodeGenerator.h (modified) (1 diff)
• BasicCompiler_Common/include/Linker.h (modified) (1 diff)
• BasicCompiler_Common/include/NativeCode.h (modified) (6 diffs)
• BasicCompiler_Common/include/Source.h (modified) (1 diff)
• BasicCompiler_Common/src/Class.cpp (modified) (4 diffs)
• BasicCompiler_Common/src/Linker.cpp (modified) (1 diff)
• BasicCompiler_Common/src/NativeCode.cpp (modified) (1 diff)
• BasicCompiler_Common/src/ObjectModule.cpp (modified) (1 diff)

trunk/abdev/BasicCompiler32/Compile_ProcOp.cpp

@@ -499 +499 @@
             //仮想関数テーブルを初期化
             if( compiler.pCompilingClass->IsExistVirtualFunctions()
-                && !compiler.pCompilingClass->IsAbstract() ){
-                    //関数テーブルに値をセット
-                    int offset = (int)compiler.pCompilingClass->GetVtblGlobalOffset();
-
-                    //mov eax,offset
-                    compiler.codeGenerator.op_mov_RV( REG_EAX, offset, Schedule::DataTable );
-
-                    //Thisポインタをecxにコピー
-                    SetThisPtrToReg(REG_ECX);
-
-                    //mov dword ptr[ecx],eax
-                    compiler.codeGenerator.op_mov_MR( sizeof(long), REG_EAX, REG_ECX, 0, MOD_BASE );
+                && !compiler.pCompilingClass->IsAbstract() )
+            {
+                // mov eax,vtblAddress
+                compiler.codeGenerator.op_mov_RV_vtbl( REG_EAX, compiler.pCompilingClass );
+
+                /* TODO: 消す
+                //関数テーブルに値をセット
+                int offset = (int)compiler.pCompilingClass->GetVtblGlobalOffset();
+
+                //mov eax,offset
+                compiler.codeGenerator.op_mov_RV( REG_EAX, offset, Schedule::DataTable );
+                */
+
+                //Thisポインタをecxにコピー
+                SetThisPtrToReg(REG_ECX);
+
+                //mov dword ptr[ecx],eax
+                compiler.codeGenerator.op_mov_MR( sizeof(long), REG_EAX, REG_ECX, 0, MOD_BASE );
+
+
+                // 仮想関数になるメソッドに使用チェックをつける
+                BOOST_FOREACH( const CMethod *pMethod, compiler.pCompilingClass->GetMethods() )
+                {
+                    if( pMethod->IsVirtual() )
+                    {
+                        pMethod->GetUserProc().Using();
+                    }
+                }
             }
         }

trunk/abdev/BasicCompiler32/MakePeHdr.cpp

@@ -509 +509 @@
 
 
+    /////////////////////////////////////////////////////////////////
+    // vtblの構築
+    /////////////////////////////////////////////////////////////////
+
+    compiler.GetObjectModule().meta.GetClasses().GenerateVTables();
+
+
 
     ////////////////////////////////
     // ここで一旦ログを取る
     ////////////////////////////////
+
     Diagnose();
 
@@ -1065 +1073 @@
     compiler.linker.ResolveUserProcSchedules( MemPos_CodeSection );
     compiler.linker.ResolveGlobalVarSchedules( MemPos_RWSection );
+    compiler.linker.ResolveVtblSchedule( MemPos_DataSection );
 
 

trunk/abdev/BasicCompiler32/x86CodeGenerator.cpp

@@ -1311 +1311 @@
     pNativeCode->PutUserProcSchedule( pUserProc, false );
 }
+void CodeGenerator::op_mov_RV_vtbl( int reg, const CClass *pClass )
+{
+    // mov reg,vtblAddress
+
+    //オペコード、レジスタ
+    pNativeCode->Put( (char)(0xB8|REGISTER_OPERAND(reg)) );
+
+    //DISP32
+    pNativeCode->PutVtblSchedule( pClass );
+}

trunk/abdev/BasicCompiler_Common/include/Class.h

@@ -360 +360 @@
     int GetFuncNumInVtbl( const UserProc *pUserProc ) const;
     LONG_PTR GetVtblGlobalOffset(void) const;
+    void GenerateVTables();
     void ActionVtblSchedule(LONG_PTR ImageBase, LONG_PTR MemPos_CodeSection);
     bool IsAbstract() const;
@@ -387 +388 @@
     virtual void CollectClassesForNameOnly( const BasicSource &source );
 
+    void GenerateVTables();
     void ActionVtblSchedule(LONG_PTR ImageBase, LONG_PTR MemPos_CodeSection);
 

trunk/abdev/BasicCompiler_Common/include/CodeGenerator.h

@@ -448 +448 @@
     void op_ret( short stackFrameSize );
     void op_addressof( int reg, const UserProc *pUserProc );
+    void op_mov_RV_vtbl( int reg, const CClass *pClass );
 #endif
 

trunk/abdev/BasicCompiler_Common/include/Linker.h

@@ -34 +34 @@
     void ResolveGlobalVarSchedules( long rwSectionBaseOffset );
 
+    // vtblスケジュール
+    void ResolveVtblSchedule( long dataSectionBaseOffset );
+
     // リンク
     void Link( ObjectModule &masterObjectModule );

trunk/abdev/BasicCompiler_Common/include/NativeCode.h

@@ -21 +21 @@
         AddressOf,      // ユーザ定義関数位置スケジュール
         DllProc,        // DLL関数位置スケジュール
+        Vtbl,           // vtblスケジュール
     };
 
@@ -31 +32 @@
         const ::UserProc *pUserProc;
         const ::DllProc *pDllProc;
+        const ::CClass *pClass;
     };
 
@@ -52 +54 @@
             ar & boost::serialization::make_nvp("pDllProc", const_cast<::DllProc *&>(pDllProc));
             break;
+        case Vtbl:
+            ar & boost::serialization::make_nvp("pClass", const_cast<::CClass *&>(pClass));
+            break;
         default:
             ar & BOOST_SERIALIZATION_NVP( lpValue );
@@ -80 +85 @@
     {
     }
+    Schedule( const ::CClass *pClass, long offset )
+        : type( Schedule::Vtbl )
+        , offset( offset )
+        , pClass( pClass )
+    {
+    }
     ~Schedule()
     {
@@ -111 +122 @@
         }
         return *pUserProc;
+    }
+    const ::CClass &GetClass() const
+    {
+        if( type != Schedule::Vtbl )
+        {
+            SetError();
+        }
+        return *pClass;
     }
 
@@ -360 +379 @@
     void PutUserProcSchedule( const UserProc *pUserProc, bool isCall );
     void PutDllProcSchedule( const DllProc *pDllProc );
+    void PutVtblSchedule( const CClass *pClass );
     void Put( short s )
     {

trunk/abdev/BasicCompiler_Common/include/Source.h

@@ -176 +176 @@
         bool isEqualBasbuf = false;
         extern char *basbuf;
-        if( basbuf == buffer )
+        if( basbuf == buffer + 2 )
         {
             isEqualBasbuf = true;

trunk/abdev/BasicCompiler_Common/src/Class.cpp

@@ -720 +720 @@
     return vtbl_offset;
 }
+void CClass::GenerateVTables()
+{
+    if( IsAbstract() )
+    {
+        // 抽象クラスは無視
+        return;
+    }
+    if( !IsUsing() )
+    {
+        // 使われていないクラスは無視
+        return;
+    }
+
+    const UserProc **ppsi;
+    ppsi=(const UserProc **)malloc(GetVtblNum()*sizeof(UserProc *));
+
+    //関数テーブルに値をセット
+    int i2 = 0;
+    BOOST_FOREACH( const CMethod *pMethod, methods ){
+        if(pMethod->IsVirtual()){
+            if( !pMethod->GetUserProc().IsUsing() )
+            {
+                ts((char *)pMethod->GetUserProc().GetFullName().c_str());
+            }
+            pMethod->GetUserProc().Using();
+
+            if(pMethod->IsAbstract()){
+                extern int cp;
+                SmoothieException::Throw(300,NULL,cp);
+
+                ppsi[i2]=0;
+            }
+            else{
+                ppsi[i2]=&pMethod->GetUserProc();
+            }
+            i2++;
+        }
+    }
+
+    vtbl_offset=compiler.GetObjectModule().dataTable.AddBinary((void *)ppsi,GetVtblNum()*sizeof(LONG_PTR));
+
+    for( int i=0; i < GetVtblNum(); i++ ){
+        pobj_Reloc->AddSchedule_DataSection(vtbl_offset+i*sizeof(LONG_PTR));
+    }
+
+    free(ppsi);
+}
 void CClass::ActionVtblSchedule(LONG_PTR ImageBase, LONG_PTR MemPos_CodeSection){
+    if( IsAbstract() )
+    {
+        // 抽象クラスは無視
+        return;
+    }
+    if( !IsUsing() )
+    {
+        // 使われていないクラスは無視
+        return;
+    }
     if(vtbl_offset==-1) return;
 
@@ -731 +788 @@
         pUserProc=(UserProc *)pVtbl[i];
         if(!pUserProc) continue;
+
+        if( pUserProc->GetBeginOpAddress() == 0
+            && pUserProc->GetEndOpAddress() == 0 )
+        {
+            Jenga::Throw( "未解決の仮想関数が存在する" );
+        }
 
         pVtbl[i]=pUserProc->GetBeginOpAddress()+ImageBase+MemPos_CodeSection;
@@ -908 +971 @@
                 }
         }
+    }
+}
+
+void Classes::GenerateVTables()
+{
+    Iterator_Reset();
+    while( Iterator_HasNext() )
+    {
+        CClass *pClass = Iterator_GetNext();
+        pClass->GenerateVTables();
     }
 }
@@ -1615 +1688 @@
         pParentClass->Using();
 
+        // 仮想関数になるメソッドに使用チェックをつける
+        BOOST_FOREACH( const CMethod *pMethod, pParentClass->GetMethods() )
+        {
+            if( pMethod->IsVirtual() )
+            {
+                pMethod->GetUserProc().Using();
+            }
+        }
+
         pCompilingMethod = pParentClass->GetMethods().GetMethodPtr( pUserProc );
         if( !pCompilingMethod ){

trunk/abdev/BasicCompiler_Common/src/Linker.cpp

@@ -102 +102 @@
 }
 
+void Linker::ResolveVtblSchedule( long dataSectionBaseOffset )
+{
+    BOOST_FOREACH( const Schedule &schedule, nativeCode.GetSchedules() )
+    {
+        if( schedule.GetType() == Schedule::Vtbl )
+        {
+            LONG_PTR vtblAddress = schedule.GetClass().GetVtblGlobalOffset();
+
+            nativeCode.Overwrite(
+                schedule.GetOffset(),
+                static_cast<long>( vtblAddress + imageBase + dataSectionBaseOffset )
+            );
+        }
+    }
+}
+
 void Linker::Link( ObjectModule &masterObjectModule )
 {

trunk/abdev/BasicCompiler_Common/src/NativeCode.cpp

@@ -64 +64 @@
 }
 
+void NativeCode::PutVtblSchedule( const CClass *pClass )
+{
+    schedules.push_back( Schedule( pClass, size ) );
+
+    *((long *)(codeBuffer+size))=0;
+    size += sizeof(long);
+}
+
 void NativeCode::NextSourceLine()
 {

trunk/abdev/BasicCompiler_Common/src/ObjectModule.cpp

@@ -33 +33 @@
         this->sources.push_back( source );
     }
+
+    // TODO: basbufがいらなくなったら消す
+    extern char *basbuf;
+    basbuf = this->sources[0].GetBuffer();
 }