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

Timestamp:

Aug 16, 2007, 7:55:02 PM (17 years ago)

Author:

dai_9181

Message:

Binaryクラスを追加

Location:

trunk/abdev/BasicCompiler_Common/include

Files:

• Binary.h (added)
• CodeGenerator.h (modified) (2 diffs)
• NativeCode.h (modified) (5 diffs)
• Variable.h (modified) (2 diffs)

trunk/abdev/BasicCompiler_Common/include/CodeGenerator.h

@@ -455 +455 @@
     void PutOld( long l, Schedule::Type scheduleType )
     {
-        pNativeCode->Put( l, scheduleType );
+        pNativeCode->PutEx( l, scheduleType );
     }
     const PertialSchedule *PutOld( long l, bool isPertialSchedule )
@@ -465 +465 @@
             pPertialSchedule = pertialSchedules.back();
         }
-        pNativeCode->Put( l, Schedule::None );
+        pNativeCode->PutEx( l, Schedule::None );
         return pPertialSchedule;
     }
     void PutOld( const NativeCode &nativeCode )
     {
-        pNativeCode->Put( nativeCode );
+        pNativeCode->PutEx( nativeCode );
     }
     void PutOld( char c )

trunk/abdev/BasicCompiler_Common/include/NativeCode.h

@@ -6 +6 @@
 
 #include <BoostSerializationSupport.h>
+
+#include <Binary.h>
 
 class UserProc;
@@ -219 +221 @@
 typedef std::vector<SourceLine> SourceLines;
 
-class NativeCode
+class NativeCode : public Binary
 {
-    int allocateSize;
-    char *codeBuffer;
-    int size;
-
     // リンカで解決しなければならないスケジュール
     Schedules schedules;
@@ -234 +232 @@
 private:
     friend class boost::serialization::access;
-    BOOST_SERIALIZATION_SPLIT_MEMBER();
-    template<class Archive> void load(Archive& ar, const unsigned int version)
+    template<class Archive> void serialize(Archive& ar, const unsigned int version)
     {
         trace_for_serialize( "serializing(load) - NativeCode" );
 
-        std::string code;
-        ar & BOOST_SERIALIZATION_NVP( code );
-        ar & BOOST_SERIALIZATION_NVP( size );
+        ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP( Binary );
         ar & BOOST_SERIALIZATION_NVP( schedules );
         ar & BOOST_SERIALIZATION_NVP( sourceLines );
-
-        // 読み込み後の処理
-        Realloc( size );
-        for( int i=0; i<size; i++ )
-        {
-            ULONG_PTR l1 = ( ( code[i*3] >= 'a' ) ? ( code[i*3] - 'a' + 0x0a ) : ( code[i*3] - '0' ) ) * 0x10;
-            ULONG_PTR l2 = ( code[i*3+1] >= 'a' ) ? ( code[i*3+1] - 'a' + 0x0a ) : ( code[i*3+1] - '0' );
-            ULONG_PTR l = l1 + l2;
-            codeBuffer[i] = static_cast<char>(l);
-        }
-    }
-    template<class Archive> void save(Archive& ar, const unsigned int version) const
-    {
-        trace_for_serialize( "serializing(save) - NativeCode" );
-
-        // 保存準備
-        char *tempCode = (char *)calloc( (size+1) * 3, 1 );
-        for( int i=0; i<size; i++ )
-        {
-            char temp[32];
-            sprintf( temp, "%02x,", (unsigned char)codeBuffer[i] );
-            tempCode[i*3] = temp[0];
-            tempCode[i*3+1] = temp[1];
-            tempCode[i*3+2] = temp[2];
-        }
-
-        std::string code = tempCode;
-        free( tempCode );
-
-        ar & BOOST_SERIALIZATION_NVP( code );
-        ar & BOOST_SERIALIZATION_NVP( size );
-        ar & BOOST_SERIALIZATION_NVP( schedules );
-        ar & BOOST_SERIALIZATION_NVP( sourceLines );
-    }
-
-
-    void Realloc( int newSize )
-    {
-        if( allocateSize < newSize + 8192 )
-        {
-            while( allocateSize < newSize + 8192 )
-            {
-                allocateSize += 8192;
-            }
-            codeBuffer = (char *)realloc( codeBuffer, allocateSize );
-        }
     }
 
 public:
     NativeCode()
-        : allocateSize( 8192 )
-        , codeBuffer( (char *)malloc( allocateSize ) )
-        , size( 0 )
+        : Binary()
     {
     }
     NativeCode( const NativeCode &nativeCode )
-        : allocateSize( 8192 )
-        , codeBuffer( (char *)malloc( allocateSize ) )
-        , size( 0 )
-    {
-        Put( nativeCode );
+        : Binary()
+    {
+        PutEx( nativeCode );
     }
     NativeCode( const char *codeBuffer, int size )
-        : allocateSize( 8192 )
-        , codeBuffer( (char *)malloc( allocateSize ) )
-        , size( 0 )
-    {
-        Put( codeBuffer, size );
+        : Binary( codeBuffer, size )
+    {
     }
     ~NativeCode()
     {
-        free( codeBuffer );
-    }
-    void Clear()
-    {
-        size = 0;
     }
 
@@ -325 +262 @@
     {
         Clear();
-        Put( nativeCode );
-    }
-
-    const char *GetCodeBuffer() const
-    {
-        return codeBuffer;
-    }
-    int GetSize() const
-    {
-        return size;
-    }
+        PutEx( nativeCode );
+    }
+
     const Schedules &GetSchedules() const
     {
@@ -341 +270 @@
     }
 
-    long GetLong( int codePos ) const
-    {
-        return *(long *)(this->codeBuffer+codePos);
-    }
-
-    void Overwrite( int codePos, char c )
-    {
-        codeBuffer[codePos] = c;
-    }
-    void Overwrite( int codePos, long newLongValue )
-    {
-        *(long *)(this->codeBuffer+codePos) = newLongValue;
-    }
-
-    void Put( const char *codeBuffer, int size )
-    {
-        Realloc( this->size + size );
-
-        memcpy( this->codeBuffer + this->size, codeBuffer, size );
-        this->size += size;
-    }
-    void Put( const NativeCode &nativeCode );
-    void Put( _int64 i64data )
-    {
-        Put( (const char *)(&i64data), sizeof(_int64) );
-    }
-    void Put( long l, Schedule::Type scheduleType = Schedule::None )
+    void PutEx( const NativeCode &nativeCode );
+    void PutEx( long l, Schedule::Type scheduleType )
     {
         if( scheduleType != Schedule::None )
         {
-            schedules.push_back( Schedule( scheduleType, size ) );
-        }
-
-        *((long *)(codeBuffer+size))=l;
-        size += sizeof(long);
+            schedules.push_back( Schedule( scheduleType, GetSize() ) );
+        }
+
+        Put( l );
     }
     void PutUserProcSchedule( const UserProc *pUserProc, bool isCall );
     void PutDllProcSchedule( const DllProc *pDllProc );
     void PutVtblSchedule( const CClass *pClass );
-    void Put( short s )
-    {
-        Put( (const char *)(&s), sizeof(short) );
-    }
-    void Put( char c )
-    {
-        Realloc( size + 1 );
-        codeBuffer[size++] = c;
-    }
 
     const SourceLines &GetSourceLines() const

trunk/abdev/BasicCompiler_Common/include/Variable.h

@@ -254 +254 @@
     const Variable *Find( const Symbol &symbol )const;
 
-    void Add( Variable *pVar );
+    void Add( Variable *pVar, bool isResetOffsetAddress = true );
 
     int GetAllSize() const
@@ -276 +276 @@
     }
 };
+
+class GlobalVar : public Variable
+{
+    BYTE *initBuffer;
+public:
+    GlobalVar()
+    {
+        initBuffer = (BYTE *)malloc( 1 );
+    }
+    ~GlobalVar()
+    {
+        free( initBuffer );
+    }
+};