Changeset 355 in dev for trunk/abdev/BasicCompiler_Common/include

Timestamp:

Nov 2, 2007, 2:53:56 AM (17 years ago)

Author:

dai_9181

Message:

静的領域に初期オブジェクトを配置可能にした

Location:

trunk/abdev/BasicCompiler_Common/include

Files:

• Class.h (modified) (3 diffs)
• DataTable.h (modified) (4 diffs)
• Linker.h (modified) (3 diffs)
• NamespaceSupporter.h (modified) (1 diff)
• NativeCode.h (modified) (4 diffs)
• ver.h (modified) (1 diff)

trunk/abdev/BasicCompiler_Common/include/Class.h

@@ -422 +422 @@
         return staticMembers;
     }
+    
+    const CMember *FindDynamicMember( const char *memberName ) const
+    {
+        BOOST_FOREACH( CMember *pMember, GetDynamicMembers() )
+        {
+            if( pMember->GetName() == memberName )
+            {
+                return pMember;
+            }
+        }
+        return NULL;
+    }
 
     void EnumDynamicMethodsOrInterfaceMethods( const char *methodName, std::vector<const UserProc *> &subs ) const;
@@ -516 +528 @@
 
 
+    // TypeInfo用
+    mutable int typeInfoDataTableOffset;
+    void SetTypeInfoDataTableOffset( int typeInfoDataTableOffset ) const
+    {
+        this->typeInfoDataTableOffset = typeInfoDataTableOffset;
+    }
+    int GetTypeInfoDataTableOffset() const
+    {
+        return typeInfoDataTableOffset;
+    }
+
+
     //線形リスト用
     CClass *pobj_NextClass;
@@ -554 +578 @@
     virtual void GetAllClassInfo();
     virtual void Compile_System_InitializeUserTypes();
+    virtual void Compile_System_InitializeUserTypesForBaseType();
 
     const CClass *Find( const NamespaceScopes &namespaceScopes, const string &name ) const;

trunk/abdev/BasicCompiler_Common/include/DataTable.h

@@ -4 +4 @@
 
 //DataTable.cpp
-class DataTable{
+class DataTable
+{
     char *buffer;
     int size;
 
-    void Realloc( int size )
-    {
-        this->buffer = (char *)realloc( this->buffer, size + 100 );
-        this->size = size;
-    }
+public:
+    // リンカで解決しなければならないスケジュール
+    Schedules schedules;
 
     // XMLシリアライズ用
@@ -23 +22 @@
         ar & BOOST_SERIALIZATION_NVP( _buffer );
         ar & BOOST_SERIALIZATION_NVP( size );
+        ar & BOOST_SERIALIZATION_NVP( schedules );
 
         // 読み込み後の処理
@@ -52 +52 @@
         ar & BOOST_SERIALIZATION_NVP( _buffer );
         ar & BOOST_SERIALIZATION_NVP( size );
+        ar & BOOST_SERIALIZATION_NVP( schedules );
+    }
+
+
+    void Realloc( int size )
+    {
+        this->buffer = (char *)realloc( this->buffer, size + 100 );
+        this->size = size;
     }
 
@@ -92 +100 @@
     void Add( const DataTable &dataTable )
     {
+        long baseOffset = GetSize();
+
         AddBinary( dataTable.GetPtr(), dataTable.GetSize() );
+
+        // スケジュールを追加
+        BOOST_FOREACH( const Schedule &schedule, dataTable.schedules )
+        {
+            this->schedules.push_back(
+                Schedule(
+                    schedule.GetType(),
+                    baseOffset + schedule.GetOffset(),
+                    schedule.GetLongPtrValue()
+                )
+            );
+        }
     }
 
-    const void *GetPtr() const;
-    int GetSize() const;
+    const void *GetPtr() const
+    {
+        return buffer;
+    }
+    int GetSize() const
+    {
+        return size;
+    }
+
+    long GetLong( int pos ) const
+    {
+        return *(long *)( buffer + pos );
+    }
+    _int64 GetInt64( int pos ) const
+    {
+        return *(_int64 *)( buffer + pos );
+    }
+    void Overwrite( int pos, long newLongValue )
+    {
+        *(long *)( buffer + pos ) = newLongValue;
+    }
+    void OverwriteInt64( int pos, _int64 new64Value )
+    {
+        *(_int64 *)( buffer + pos ) = new64Value;
+    }
+
+    bool MakeConstObjectToProcessStaticBuffer( const CClass &objClass, const Jenga::Common::Strings &initMemberValues, int &dataTableOffset );
+    bool MakeConstObjectToProcessStaticBuffer( const char *expression, Type &resultType, int &dataTableOffset );
+    int MakeConstStringObjectToProcessStaticBuffer( const char *str );
+    bool MakeLiteralArrayBuffer( const char *expression, const Type &baseType, int &dataTableOffset );
+
+private:
+    int lastMadeConstObjectDataTableOffset;
+public:
+    int GetLastMadeConstObjectDataTableOffset()
+    {
+        return lastMadeConstObjectDataTableOffset;
+    }
+
+    void ResetDataSectionBaseOffset( long dataSectionBaseOffset );
 };

trunk/abdev/BasicCompiler_Common/include/Linker.h

@@ -4 +4 @@
 {
     NativeCode nativeCode;
+    DataTable dataTable;
     DWORD imageBase;
 
@@ -15 +16 @@
     {
         return nativeCode;
+    }
+
+    const DataTable &GetDataTable() const
+    {
+        return dataTable;
     }
 
@@ -37 +43 @@
     void ResolveVtblSchedule( long dataSectionBaseOffset );
 
+    // TypeInfoスケジュール
+    void ResolveTypeInfoSchedule( long dataSectionBaseOffset );
+
     // リンク
     void Link( ObjectModule &masterObjectModule );
+
+    // データテーブルをセット
+    void SetDataTable( DataTable &dataTable );
 };

trunk/abdev/BasicCompiler_Common/include/NamespaceSupporter.h

@@ -53 +53 @@
 
         while( tempLivingNamespaceScopes.size() ){
-            NamespaceScopes tempNamespaceScopes = tempLivingNamespaceScopes;
-
-            string tempStr = tempNamespaceScopes.ToString() + "." + entryName;
+            string tempStr = tempLivingNamespaceScopes.ToString() + "." + entryName;
             if( thisStr == tempStr ){
                 return true;

trunk/abdev/BasicCompiler_Common/include/NativeCode.h

@@ -24 +24 @@
         DllProc,        // DLL関数位置スケジュール
         Vtbl,           // vtblスケジュール
+        TypeInfo,       // TypeInfoスケジュール
     };
 
@@ -57 +58 @@
             break;
         case Vtbl:
+        case TypeInfo:
             ar & boost::serialization::make_nvp("pClass", const_cast<::CClass *&>(pClass));
             break;
@@ -93 +95 @@
     {
     }
+    Schedule( Type type, const ::CClass *pClass, long offset )
+        : type( type )
+        , pClass( pClass )
+        , offset( offset )
+    {
+    }
     ~Schedule()
     {
@@ -127 +135 @@
     const ::CClass &GetClass() const
     {
-        if( type != Schedule::Vtbl )
+        if( !( type == Schedule::Vtbl || type == Schedule::TypeInfo ) )
         {
             SetError();

trunk/abdev/BasicCompiler_Common/include/ver.h

@@ -6 +6 @@
 // バージョン付加文字列
 #ifdef _AMD64_
-#define VER_INFO        "(x64) (rev.361)"
+#define VER_INFO        "(x64) (rev.367)"
 #else
-#define VER_INFO        "(rev.361)"
+#define VER_INFO        "(rev.367)"
 #endif