Changeset 282 in dev for trunk/abdev/BasicCompiler_Common/src

Timestamp:

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

Author:

dai_9181

Message:

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

Location:

trunk/abdev/BasicCompiler_Common/src

Files:

• Class.cpp (modified) (4 diffs)
• Linker.cpp (modified) (1 diff)
• NativeCode.cpp (modified) (1 diff)
• ObjectModule.cpp (modified) (1 diff)

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();
 }