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

Timestamp:

Aug 1, 2007, 11:19:01 PM (17 years ago)

Author:

dai_9181

Message:

MetaImplを廃止し、Metaにした。
ObjectModuleクラス、Linkerクラスを用意。

Location:

trunk/abdev/BasicCompiler_Common/include

Files:

• BoostSerializationSupport.h (modified) (1 diff)
• Compiler.h (modified) (3 diffs)
• DataTable.h (modified) (1 diff)
• Linker.h (added)
• Meta.h (moved) (moved from trunk/abdev/BasicCompiler_Common/include/MetaImpl.h ) (3 diffs)
• NativeCode.h (modified) (8 diffs)
• SmoothieImpl.h (modified) (1 diff)

trunk/abdev/BasicCompiler_Common/include/BoostSerializationSupport.h

@@ -26 +26 @@
     bool WriteXml( const string &xmlFilePath, bool isShowExceptionMessage = true ) const;
 
-    bool ReadBinaly( const string &filePath, bool isShowExceptionMessage = true );
-    bool WriteBinaly( const string &filePath, bool isShowExceptionMessage = true ) const;
+    bool ReadBinary( const string &filePath, bool isShowExceptionMessage = true );
+    bool WriteBinary( const string &filePath, bool isShowExceptionMessage = true ) const;
 
     bool ReadText( const string &filePath, bool isShowExceptionMessage = true );

trunk/abdev/BasicCompiler_Common/include/Compiler.h

@@ -3 +3 @@
 #include <CodeGenerator.h>
 #include <NamespaceSupporter.h>
-#include <MetaImpl.h>
+#include <Meta.h>
 #include <DataTable.h>
 #include <CodeGenerator.h>
+#include <Linker.h>
 
 class Compiler
@@ -11 +12 @@
     // 名前空間サポート
     NamespaceSupporter namespaceSupporter;
-
-    // メタ情報
-    MetaImpl metaImpl;
-
-    // データテーブル
-    DataTable dataTable;
 
 public:
@@ -25 +20 @@
     }
 
-    MetaImpl &GetMeta()
-    {
-        return metaImpl;
-    }
-
-    DataTable &GetDataTable()
-    {
-        return dataTable;
-    }
-
-    // グローバル領域のネイティブコード
-    NativeCode globalNativeCode;
+    // オブジェクトモジュール
+    ObjectModule objectModule;
 
     // コード生成機構
     CodeGenerator codeGenerator;
+
+    // リンカ
+    Linker linker;
 
     static bool StringToType( const std::string &typeName, Type &type );

trunk/abdev/BasicCompiler_Common/include/DataTable.h

@@ -1 +1 @@
 #pragma once
+
+#include <BoostSerializationSupport.h>
 
 //DataTable.cpp
 class DataTable{
-    void *pdata;
+    char *buffer;
     int size;
 
+    // XMLシリアライズ用
+private:
+    friend class boost::serialization::access;
+    BOOST_SERIALIZATION_SPLIT_MEMBER();
+    template<class Archive> void load(Archive& ar, const unsigned int version)
+    {
+        std::string _buffer;
+        ar & BOOST_SERIALIZATION_NVP( _buffer );
+        ar & BOOST_SERIALIZATION_NVP( size );
+
+        // 読み込み後の処理
+        Realloc( size );
+        for( int i=0; i<size; i++ )
+        {
+            if( _buffer[i*3+2] != ',' )
+            {
+                //エラー
+                DebugBreak();
+            }
+            ULONG_PTR l;
+            sscanf( _buffer.c_str() + i*3, "%02x,", &l );
+            buffer[i] = (char)l;
+        }
+    }
+    template<class Archive> void save(Archive& ar, const unsigned int version) const
+    {
+        // 保存準備
+        char *tempCode = (char *)calloc( (size+1) * 3, 1 );
+        for( int i=0; i<size; i++ )
+        {
+            char temp[32];
+            sprintf( temp, "%02x,", (unsigned char)buffer[i] );
+            tempCode[i*3] = temp[0];
+            tempCode[i*3+1] = temp[1];
+            tempCode[i*3+2] = temp[2];
+        }
+
+        std::string _buffer = tempCode;
+        free( tempCode );
+
+        ar & BOOST_SERIALIZATION_NVP( _buffer );
+        ar & BOOST_SERIALIZATION_NVP( size );
+    }
+
 public:
-    DataTable();
-    ~DataTable();
-    void Init();
+    DataTable()
+        : buffer( (char *)malloc(100) )
+        , size( 0 )
+    {
+        lstrcpy( buffer, "initialized!!!" );
+    }
+    DataTable( const DataTable &dataTable )
+        : buffer( (char *)malloc(100) )
+        , size( 0 )
+    {
+        lstrcpy( buffer, "initialized!!!" );
+        AddBinary( dataTable.GetPtr(), dataTable.GetSize() );
+    }
+    ~DataTable()
+    {
+        free( buffer );
+    }
+    void Clear()
+    {
+        size = 0;
+    }
 
-    int AddBinary( const void *pdata, int size );
+    void operator =( const DataTable &dataTable )
+    {
+        Clear();
+        AddBinary( dataTable.GetPtr(), dataTable.GetSize() );
+    }
+
+    void Realloc( int size );
+    int AddBinary( const void *buffer, int size );
     int Add( _int64 i64data );
     int Add( int i32data );

trunk/abdev/BasicCompiler_Common/include/Meta.h

@@ -11 +11 @@
 #include <Const.h>
 
-class MetaImpl : public Jenga::Common::BoostSerializationSupport<MetaImpl>
+class Meta
 {
     // 名前空間
@@ -45 +45 @@
     // XMLシリアライズ用
 private:
-    virtual const char *RootTagName() const
-    {
-        return "metaImpl";
-    }
     friend class boost::serialization::access;
     template<class Archive> void serialize(Archive& ar, const unsigned int version)
     {
-        trace_for_serialize( "serializing - MetaImpl" );
+        trace_for_serialize( "serializing - Meta" );
 
         ar & BOOST_SERIALIZATION_NVP( namespaceScopesCollection );
@@ -69 +65 @@
 
 public:
-    MetaImpl()
+    Meta()
         : classesImpl()
         , pNowClassesForDebugger( &classesImpl )

trunk/abdev/BasicCompiler_Common/include/NativeCode.h

@@ -39 +39 @@
     template<class Archive> void serialize(Archive& ar, const unsigned int version)
     {
+        trace_for_serialize( "serializing - Schedule" );
+
         ar & BOOST_SERIALIZATION_NVP( type );
         ar & BOOST_SERIALIZATION_NVP( offset );
@@ -94 +96 @@
     template<class Archive> void load(Archive& ar, const unsigned int version)
     {
+        trace_for_serialize( "serializing(load) - NativeCode" );
+
         std::string code;
         ar & BOOST_SERIALIZATION_NVP( code );
@@ -103 +107 @@
         for( int i=0; i<size; i++ )
         {
-            char c;
-            sscanf( code.c_str() + i*3, "%02x,", &c );
-            codeBuffer[i] = c;
+            ULONG_PTR l;
+            sscanf( code.c_str() + i*3, "%02x,", &l );
+            codeBuffer[i] = (char)l;
         }
     }
     template<class Archive> void save(Archive& ar, const unsigned int version) const
     {
+        trace_for_serialize( "serializing(save) - NativeCode" );
+
         // 保存準備
-        char *tempCode = (char *)malloc( (size+1) * 3 );
+        char *tempCode = (char *)calloc( (size+1) * 3, 1 );
         for( int i=0; i<size; i++ )
         {
             char temp[32];
-            sprintf( temp, "%02x,", codeBuffer[i] );
+            sprintf( temp, "%02x,", (unsigned char)codeBuffer[i] );
             tempCode[i*3] = temp[0];
             tempCode[i*3+1] = temp[1];
@@ -130 +136 @@
 
 
-    void Realloc( int additionSize = 0 )
-    {
-        if( allocateSize < size + 8192 + additionSize )
-        {
-            while( allocateSize < size + 8192 + additionSize )
+    void Realloc( int newSize )
+    {
+        if( allocateSize < newSize + 8192 )
+        {
+            while( allocateSize < newSize + 8192 )
             {
                 allocateSize += 8192;
@@ -149 +155 @@
     {
     }
+    NativeCode( const NativeCode &nativeCode )
+        : allocateSize( 8192 )
+        , codeBuffer( (char *)malloc( allocateSize ) )
+        , size( 0 )
+    {
+        Put( nativeCode );
+    }
     NativeCode( const char *codeBuffer, int size )
         : allocateSize( 8192 )
@@ -165 +178 @@
     }
 
+    void operator =( const NativeCode &nativeCode )
+    {
+        Clear();
+        Put( nativeCode );
+    }
+
     int GetSize() const
     {
@@ -203 +222 @@
     void Put( const char *codeBuffer, int size )
     {
-        Realloc( size );
+        Realloc( this->size + size );
 
         memcpy( this->codeBuffer + this->size, codeBuffer, size );
@@ -268 +287 @@
     void Put( char c )
     {
+        Realloc( size + 1 );
         codeBuffer[size++] = c;
-        Realloc();
 
 

trunk/abdev/BasicCompiler_Common/include/SmoothieImpl.h

@@ -3 +3 @@
 #include <jenga/include/smoothie/Smoothie.h>
 
-#include <MetaImpl.h>
+#include <Meta.h>
 
 class SmoothieImpl : public Smoothie