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

Timestamp:

Aug 17, 2007, 7:36:51 AM (17 years ago)

Author:

dai_9181

Message:

 

Location:

trunk/abdev/BasicCompiler_Common/include

Files:

• Binary.h (modified) (4 diffs)
• Meta.h (modified) (2 diffs)
• Variable.h (modified) (3 diffs)
• option.h (modified) (1 diff)

trunk/abdev/BasicCompiler_Common/include/Binary.h

@@ -61 +61 @@
             }
             buffer = (char *)realloc( buffer, allocateSize );
+
+            // 再確保した部分を0で埋める
+            memset( buffer + size, 0, allocateSize - size );
         }
     }
@@ -96 +99 @@
         return size;
     }
+    void Resize( int newSize )
+    {
+        Realloc( newSize );
+        size = newSize;
+    }
 
     long GetLong( int pos ) const
@@ -102 +110 @@
     }
 
+    void Overwrite( int pos, const char *buffer, int size )
+    {
+        memcpy( this->buffer + pos, buffer, size );
+    }
     void Overwrite( int pos, char c )
     {
@@ -117 +129 @@
         memcpy( this->buffer + this->size, buffer, size );
         this->size += size;
+    }
+    void Put( double dbl )
+    {
+        Put( (const char *)(&dbl), sizeof(double) );
+    }
+    void Put( float flt )
+    {
+        Put( (const char *)(&flt), sizeof(float) );
     }
     void Put( _int64 i64data )

trunk/abdev/BasicCompiler_Common/include/Meta.h

@@ -26 +26 @@
 
     // グローバル変数
-    Variables globalVars;
+    GlobalVars globalVars;
 
     // グローバル定数
@@ -113 +113 @@
     }
 
-    const Variables &GetGlobalVars() const
+    const GlobalVars &GetGlobalVars() const
     {
         return globalVars;
     }
-    Variables &GetGlobalVars()
+    GlobalVars &GetGlobalVars()
     {
         return globalVars;

trunk/abdev/BasicCompiler_Common/include/Variable.h

@@ -5 +5 @@
 #include <Symbol.h>
 #include <Type.h>
+#include <Binary.h>
 
 class Variable : public Symbol
@@ -223 +224 @@
 class Variables : public vector<Variable *>
 {
+protected:
     int allSize;
-    int allInitSize;
-public:
-    Variables()
-        : allSize( 0 )
-        , allInitSize( 0 )
-    {
-    }
-    ~Variables(){
-        Clear();
-    }
-
-    void Clear(){
-        for( int i=0; i<(int)this->size(); i++ ){
-            delete (*this)[i];
-        }
-
-        allSize = 0;
-        allInitSize = 0;
-        clear();
-    }
-    void PullOutAll()
-    {
-        clear();
-    }
-
-    bool DuplicateCheck( const Symbol &symbol ) const;
-
-    const Variable *BackSearch( const Symbol &symbol ) const;
-    const Variable *Find( const Symbol &symbol )const;
-
-    void Add( Variable *pVar, bool isResetOffsetAddress = true );
-
-    int GetAllSize() const
-    {
-        return allSize;
-    }
-    int GetAllInitSize() const
-    {
-        return allInitSize;
-    }
-
 
     // XMLシリアライズ用
@@ -275 +236 @@
         ar & boost::serialization::make_nvp("vector_Variable", boost::serialization::base_object<vector<Variable *>>(*this));
     }
+
+public:
+    Variables()
+        : allSize( 0 )
+    {
+    }
+    ~Variables(){
+        Clear();
+    }
+
+    void Clear(){
+        for( int i=0; i<(int)this->size(); i++ ){
+            delete (*this)[i];
+        }
+
+        allSize = 0;
+        clear();
+    }
+    void PullOutAll()
+    {
+        clear();
+    }
+
+    int GetAllSize() const
+    {
+        return allSize;
+    }
+
+    bool DuplicateCheck( const Symbol &symbol ) const;
+
+    const Variable *BackSearch( const Symbol &symbol ) const;
+    const Variable *Find( const Symbol &symbol )const;
 };
 
-class GlobalVar : public Variable
+class GlobalVars : public Variables
 {
-    BYTE *initBuffer;
-public:
-    GlobalVar()
-    {
-        initBuffer = (BYTE *)malloc( 1 );
-    }
-    ~GlobalVar()
-    {
-        free( initBuffer );
-    }
+public:
+    Binary initAreaBuffer;
+
+    // XMLシリアライズ用
+private:
+    friend class boost::serialization::access;
+    template<class Archive> void serialize(Archive& ar, const unsigned int version)
+    {
+        trace_for_serialize( "serializing - GlobalVars" );
+
+        ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP( Variables );
+        ar & BOOST_SERIALIZATION_NVP( initAreaBuffer );
+    }
+public:
+    GlobalVars()
+    {
+    }
+    ~GlobalVars()
+    {
+    }
+
+    void Add( Variable *pVar, bool isResetOffsetAddress = true );
 };

trunk/abdev/BasicCompiler_Common/include/option.h

@@ -37 +37 @@
 
     // XMLシリアライズに関するログを生成する
-    //#define USE_TRACE_FOR_SERIALIZE
+    #define USE_TRACE_FOR_SERIALIZE
 
     // ソースコードステップに関するログを生成する