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

Timestamp:

Aug 11, 2007, 4:03:49 PM (17 years ago)

Author:

dai_9181

Message:

 

Location:

trunk/abdev/BasicCompiler_Common/include

Files:

• DataTable.h (modified) (4 diffs)
• Linker.h (modified) (1 diff)
• Meta.h (modified) (1 diff)
• NativeCode.h (modified) (1 diff)
• ObjectModule.h (modified) (1 diff)
• Variable.h (modified) (3 diffs)

trunk/abdev/BasicCompiler_Common/include/DataTable.h

@@ -7 +7 @@
     char *buffer;
     int size;
+
+    void Realloc( int size )
+    {
+        this->buffer = (char *)realloc( this->buffer, size + 100 );
+        this->size = size;
+    }
 
     // XMLシリアライズ用
@@ -75 +81 @@
     }
 
-    void operator =( const DataTable &dataTable )
+    void operator = ( const DataTable &dataTable )
     {
         Clear();
@@ -81 +87 @@
     }
 
-    void Realloc( int size );
     int AddBinary( const void *buffer, int size );
     int Add( _int64 i64data );
@@ -89 +94 @@
     int AddString( const char *str, int length );
     int AddString( const char *str );
+    void Add( const DataTable &dataTable )
+    {
+        AddBinary( dataTable.GetPtr(), dataTable.GetSize() );
+    }
 
     const void *GetPtr() const;

trunk/abdev/BasicCompiler_Common/include/Linker.h

@@ -35 +35 @@
 
     // リンク
-    void Link( vector<ObjectModule *> &objectModules );
+    void Link( ObjectModule &masterObjectModule );
 };

trunk/abdev/BasicCompiler_Common/include/Meta.h

@@ -75 +75 @@
 
     // 静的リンク
-    void StaticLink( Meta &meta );
+    void StaticLink( Meta &meta, long dataSectionBaseOffset );
 
     const NamespaceScopesCollection &GetNamespaces() const

trunk/abdev/BasicCompiler_Common/include/NativeCode.h

@@ -427 +427 @@
     }
     void NextSourceLine();
+
+    void ResetDataSectionBaseOffset( long dataSectionBaseOffset );
 };

trunk/abdev/BasicCompiler_Common/include/ObjectModule.h

@@ -28 +28 @@
         ar & BOOST_SERIALIZATION_NVP( dataTable );
     }
+
+public:
+    void StaticLink( ObjectModule &objectModule );
 };
 typedef std::vector<ObjectModule *> ObjectModules;

trunk/abdev/BasicCompiler_Common/include/Variable.h

@@ -214 +214 @@
 class Variables : public vector<Variable *>
 {
+    int allSize;
+    int allInitSize;
 public:
-    Variables(){}
+    Variables()
+        : allSize( 0 )
+        , allInitSize( 0 )
+    {
+    }
     ~Variables(){
         Clear();
@@ -225 +231 @@
         }
 
+        allSize = 0;
+        allInitSize = 0;
         clear();
     }
@@ -235 +243 @@
 
     const Variable *BackSearch( const Symbol &symbol ) const;
-
     const Variable *Find( const Symbol &symbol )const;
+
+    void Add( Variable *pVar, bool isInitArea );
+
+    int GetAllSize() const
+    {
+        return allSize;
+    }
+    int GetAllInitSize() const
+    {
+        return allInitSize;
+    }