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

Timestamp:

Aug 12, 2007, 1:25:20 AM (17 years ago)

Author:

dai_9181

Message:

 

Location:

trunk/abdev/BasicCompiler_Common/include

Files:

• CodeGenerator.h (modified) (9 diffs)
• NativeCode.h (modified) (8 diffs)
• Procedure.h (modified) (1 diff)
• Prototype.h (modified) (1 diff)
• option.h (modified) (1 diff)

trunk/abdev/BasicCompiler_Common/include/CodeGenerator.h

@@ -10 +10 @@
 #endif
 
-void ReallocNativeCodeBuffer();
-
 // コード生成時の部分的なスケジューリング
 class PertialSchedule
@@ -18 +16 @@
     int typeSize;   // 対象サイズ（一般的には8bit/32bit）
 
-    int _obpOld;    // 未完成
 public:
     PertialSchedule( int codePos, int typeSize )
@@ -24 +21 @@
         , typeSize( typeSize )
     {
-        extern int obp;
-        _obpOld = obp;
     }
     ~PertialSchedule()
@@ -38 +33 @@
     {
         return typeSize;
-    }
-    int GetObpOld() const
-    {
-        return _obpOld;
     }
 };
@@ -201 +192 @@
     // Continue用のコード位置情報の管理
     std::vector<long> continueCodePositions;
-    std::vector<long> _continueCodePositions_ObpOld;
 
 public:
@@ -210 +200 @@
     // Exit Subスケジュールの管理
     std::vector<long> exitSubCodePositions;
-    std::vector<int> _exitSubCodePositions_ObpOld;
 
     // Gotoスケジュールの管理
@@ -239 +228 @@
         pNativeCode = &nativeCode;
     }
+    long GetNativeCodeSize() const
+    {
+        return pNativeCode->GetSize();
+    }
 
     void NextSourceLine()
@@ -256 +249 @@
     {
         continueCodePositions.clear();
-        _continueCodePositions_ObpOld.clear();
     }
     void ContinueAreaBegin()
     {
         continueCodePositions.push_back( pNativeCode->GetSize() );
-
-        extern int obp;
-        _continueCodePositions_ObpOld.push_back( obp );
     }
     void ContinueAreaEnd()
     {
         continueCodePositions.pop_back();
-        _continueCodePositions_ObpOld.pop_back();
-    }
-    long GetContinueCodePosOld() const
-    {
-        if( _continueCodePositions_ObpOld.size() == 0 )
-        {
-            return -1;
-        }
-        return _continueCodePositions_ObpOld[_continueCodePositions_ObpOld.size()-1];
     }
     
@@ -489 +469 @@
     void PutOld( const NativeCode &nativeCode )
     {
-        pNativeCode->Put( nativeCode, true );
+        pNativeCode->Put( nativeCode );
     }
     void PutOld( char c )

trunk/abdev/BasicCompiler_Common/include/NativeCode.h

@@ -6 +6 @@
 
 #include <BoostSerializationSupport.h>
-
-void ObpPlus( int step = 1 );
 
 class UserProc;
@@ -270 +268 @@
     {
     }
-    NativeCode( const NativeCode &nativeCode, bool isOpBuffer )
+    NativeCode( const NativeCode &nativeCode )
         : allocateSize( 8192 )
         , codeBuffer( (char *)malloc( allocateSize ) )
         , size( 0 )
     {
-        Put( nativeCode, isOpBuffer );
-    }
-    NativeCode( const char *codeBuffer, int size, bool isOpBuffer )
+        Put( nativeCode );
+    }
+    NativeCode( const char *codeBuffer, int size )
         : allocateSize( 8192 )
         , codeBuffer( (char *)malloc( allocateSize ) )
         , size( 0 )
     {
-        Put( codeBuffer, size, isOpBuffer );
+        Put( codeBuffer, size );
     }
     ~NativeCode()
@@ -296 +294 @@
     {
         Clear();
-        Put( nativeCode, false );
+        Put( nativeCode );
     }
 
@@ -316 +314 @@
         return *(long *)(this->codeBuffer+codePos);
     }
-    long _GetLong_ObpOld( int _obpOld ) const
-    {
-        extern char *OpBuffer;
-        return *(long *)(OpBuffer+_obpOld);
-    }
 
     void Overwrite( int codePos, char c )
@@ -326 +319 @@
         codeBuffer[codePos] = c;
     }
-    void OverwriteOld( int _obpOld, char c )
-    {
-        // 未完成
-        extern char *OpBuffer;
-        OpBuffer[_obpOld] = c;
-    }
     void Overwrite( int codePos, long newLongValue )
     {
         *(long *)(this->codeBuffer+codePos) = newLongValue;
     }
-    void OverwriteOld( int _obpOld, long newLongValue )
-    {
-        // 未完成
-        extern char *OpBuffer;
-        *(long *)(OpBuffer+_obpOld) = newLongValue;
-    }
-
-    void Put( const char *codeBuffer, int size, bool isOpBuffer = true )
+
+    void Put( const char *codeBuffer, int size )
     {
         Realloc( this->size + size );
@@ -349 +330 @@
         memcpy( this->codeBuffer + this->size, codeBuffer, size );
         this->size += size;
-
-        // 未完成
-        if( isOpBuffer )
-        {
-            extern char *OpBuffer;
-            extern int obp;
-            memcpy( OpBuffer + obp, codeBuffer, size );
-            ObpPlus( size );
-        }
-    }
-    void Put( const NativeCode &nativeCode, bool isOpBuffer );
+    }
+    void Put( const NativeCode &nativeCode );
     void Put( _int64 i64data )
     {
@@ -373 +345 @@
         *((long *)(codeBuffer+size))=l;
         size += sizeof(long);
-
-
-
-        // 未完成
-        switch( scheduleType )
-        {
-        case Schedule::None:
-            // 何もしない
-            break;
-        case Schedule::GlobalVar:
-            extern CSchedule *pobj_GlobalVarSchedule;
-            pobj_GlobalVarSchedule->add();
-            break;
-        case Schedule::DataTable:
-            extern CSchedule *pobj_DataTableSchedule;
-            pobj_DataTableSchedule->add();
-            break;
-        case Schedule::Relocation:
-            // 未完成
-            break;
-        default:
-            Jenga::Throw( "scheduleTypeが無効な値を保持している" );
-            break;
-        }
-        extern char *OpBuffer;
-        extern int obp;
-        *((long *)(OpBuffer+obp))=l;
-        ObpPlus( sizeof(long) );
     }
     void PutUserProcSchedule( const UserProc *pUserProc, bool isCall );
@@ -412 +356 @@
         Realloc( size + 1 );
         codeBuffer[size++] = c;
-
-
-
-        // 未完成
-        extern char *OpBuffer;
-        extern int obp;
-        OpBuffer[obp]=c;
-        ObpPlus();
     }
 

trunk/abdev/BasicCompiler_Common/include/Procedure.h

@@ -373 +373 @@
         return *pCompilingUserProc;
     }
-
-
-
-    mutable long _beginOpAddressOld;
-    mutable long _endOpAddressOld;
 };
 

trunk/abdev/BasicCompiler_Common/include/Prototype.h

@@ -30 +30 @@
     {
         ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP( Symbol );
+        ar & BOOST_SERIALIZATION_NVP( isUsing );
     }
 

trunk/abdev/BasicCompiler_Common/include/option.h

@@ -34 +34 @@
 
     // モジュールサイズに関するログを生成する
-    //#define USE_TRACE_FOR_SIZE
+    #define USE_TRACE_FOR_SIZE
 
     // XMLシリアライズに関するログを生成する