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

Timestamp:

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

Author:

dai_9181

Message:

 

Location:

trunk/abdev/BasicCompiler_Common/src

Files:

• Class.cpp (modified) (4 diffs)
• CodeGenerator.cpp (modified) (1 diff)
• CommonCodeGenerator.cpp (modified) (9 diffs)
• LexicalScope.cpp (modified) (1 diff)
• Linker.cpp (modified) (2 diffs)
• NativeCode.cpp (modified) (3 diffs)
• ObjectModule.cpp (modified) (1 diff)

trunk/abdev/BasicCompiler_Common/src/Class.cpp

@@ -732 +732 @@
         if(!pUserProc) continue;
 
-        // 古いOpBufferを利用する場合は_beginOpAddressOldでないとダメ
-        //pVtbl[i]=pUserProc->_beginOpAddressOld+ImageBase+MemPos_CodeSection;
         pVtbl[i]=pUserProc->GetBeginOpAddress()+ImageBase+MemPos_CodeSection;
     }
@@ -954 +952 @@
                 member->GetConstructParameter().c_str(),
                 0);
-
-            //ネイティブコードバッファの再確保
-            ReallocNativeCodeBuffer();
 
             i++;
@@ -1502 +1497 @@
         // コンパイル
         ChangeOpcode( temporary );
-
-        // ネイティブコードバッファの再確保
-        ReallocNativeCodeBuffer();
     }
 
@@ -1550 +1542 @@
             ChangeOpcode( temporary );
         }
-
-        // ネイティブコードバッファの再確保
-        ReallocNativeCodeBuffer();
     }
 

trunk/abdev/BasicCompiler_Common/src/CodeGenerator.cpp

@@ -4 +4 @@
 #include <stdlib.h>
 
-int obp,obp_AllocSize;
 int GlobalOpBufferSize;
-char *OpBuffer;
-void ReallocNativeCodeBuffer(){
-    if(obp_AllocSize<obp+8192){
-        obp_AllocSize+=8192;
-        OpBuffer=(char *)realloc(OpBuffer,obp_AllocSize); //matea
-    }
-}

trunk/abdev/BasicCompiler_Common/src/CommonCodeGenerator.cpp

@@ -9 +9 @@
     {
         pNativeCode->Overwrite( exitSubCodePosition, (long)( pNativeCode->GetSize()-(exitSubCodePosition+sizeof(long)) ) );
-    }
-    
-    // TODO: 未完成
-    BOOST_FOREACH( long exitSubCodePositionOld, _exitSubCodePositions_ObpOld )
-    {
-        extern int obp;
-        pNativeCode->OverwriteOld( exitSubCodePositionOld, (long)( obp-(exitSubCodePositionOld+sizeof(long)) ) );
     }
 }
@@ -45 +38 @@
 
                 pNativeCode->Overwrite( pPertialSchedule->GetCodePos(), (char)newValue );
-
-                // TODO: 未完成（用が無くなったら消す）
-                pNativeCode->OverwriteOld( pPertialSchedule->GetObpOld(), (char)newValue );
             }
             else if( pPertialSchedule->GetTypeSize() == sizeof(long) )
             {
                 pNativeCode->Overwrite( pPertialSchedule->GetCodePos(), newValue );
-
-                // TODO: 未完成（用が無くなったら消す）
-                pNativeCode->OverwriteOld( pPertialSchedule->GetObpOld(), newValue );
             }
             else
@@ -94 +81 @@
                     pNativeCode->GetLong(pPertialSchedule->GetCodePos()) + offset
                 );
-
-                // TODO: 未完成（用が無くなったら消す）
-                pNativeCode->OverwriteOld(
-                    pPertialSchedule->GetObpOld(),
-                    pNativeCode->_GetLong_ObpOld(pPertialSchedule->GetObpOld()) + offset
-                );
             }
             else
@@ -136 +117 @@
         {
             long newValue = pNativeCode->GetSize() - (pPertialSchedule->GetCodePos()+pPertialSchedule->GetTypeSize());
-
-            extern int obp;
-            long newValueOld = obp - (pPertialSchedule->GetObpOld()+pPertialSchedule->GetTypeSize());
 
             if( pPertialSchedule->GetTypeSize() == sizeof(char) )
@@ -149 +127 @@
 
                 pNativeCode->Overwrite( pPertialSchedule->GetCodePos(), (char)newValue );
-
-                // TODO: 未完成（用が無くなったら消す）
-                pNativeCode->OverwriteOld( pPertialSchedule->GetObpOld(), (char)newValueOld );
             }
             else if( pPertialSchedule->GetTypeSize() == sizeof(long) )
             {
                 pNativeCode->Overwrite( pPertialSchedule->GetCodePos(), newValue );
-
-                // TODO: 未完成（用が無くなったら消す）
-                pNativeCode->OverwriteOld( pPertialSchedule->GetObpOld(), newValueOld );
             }
             else
@@ -184 +156 @@
 {
     long beginCodePos = pNativeCode->GetSize();
-    {
-        // TODO: 未完成
-        extern int obp;
-        beginCodePos = obp;
-    }
 
     if( opcode == (char)0xEB )
@@ -233 +200 @@
     {
         // 自分自身の命令サイズを考慮する場合
-        //offset += ( pNativeCode->GetSize() - beginCodePos ) + op_size;
-
-        // TODO: 未完成
-        extern int obp;
-        offset -= ( obp - beginCodePos ) + op_size;
+        offset -= ( pNativeCode->GetSize() - beginCodePos ) + op_size;
     }
 
@@ -301 +264 @@
 void CodeGenerator::op_jmp_continue()
 {
-    ////////////////////////////////////
-    // エラー検出（必要なくなったら消す）
-    extern int obp;
-    if( GetContinueCodePosOld()-obp != GetContinueCodePos()-pNativeCode->GetSize() )
-    {
-        int continueCodePosOld = GetContinueCodePosOld();
-        int continueCodePos = GetContinueCodePos();
-        int size = pNativeCode->GetSize();
-        int test=0;
-        SetError();
-    }
-    ////////////////////////////////////
-
-
     if( GetContinueCodePos() == -1 )
     {
@@ -328 +277 @@
 
     exitSubCodePositions.push_back( pNativeCode->GetSize() );
-    
-    extern int obp;
-    _exitSubCodePositions_ObpOld.push_back( obp );
 
     pNativeCode->Put( (long)0 );

trunk/abdev/BasicCompiler_Common/src/LexicalScope.cpp

@@ -79 +79 @@
         if(pVar->bLiving&&pVar->GetScopeLevel()==level){
             pVar->bLiving=0;
-            extern int obp;
-            pVar->SetScopeEndAddress( obp );
+            pVar->SetScopeEndAddress( compiler.codeGenerator.GetNativeCodeSize() );
         }
     }

trunk/abdev/BasicCompiler_Common/src/Linker.cpp

@@ -110 +110 @@
     }
 
-    nativeCode.Put( masterObjectModule.globalNativeCode, false );
+    nativeCode.Put( masterObjectModule.globalNativeCode );
 
     masterObjectModule.meta.GetUserProcs().Iterator_Reset();
@@ -117 +117 @@
         const UserProc *pUserProc = masterObjectModule.meta.GetUserProcs().Iterator_GetNext();
 
-        if( pUserProc->IsUsing() )
+        if( pUserProc->GetNativeCode().GetSize() > 0 )
         {
             pUserProc->SetBeginOpAddress( nativeCode.GetSize() );
 
-            nativeCode.Put( pUserProc->GetNativeCode(), false );
+            nativeCode.Put( pUserProc->GetNativeCode() );
 
             pUserProc->SetEndOpAddress( nativeCode.GetSize() );

trunk/abdev/BasicCompiler_Common/src/NativeCode.cpp

@@ -6 +6 @@
 #define BREAK_EIP(checkEip)  (obp+0x00401000>=checkEip)
 
-void ObpPlus( int step )
-{
-    extern int obp;
-    obp += step;
-
-    // 例：epi=0x00401999
-    if( BREAK_EIP(0x00433FD7) )
-    {
-        int test=0;
-    }
-}
-
-void NativeCode::Put( const NativeCode &nativeCode, bool isOpBuffer )
+void NativeCode::Put( const NativeCode &nativeCode )
 {
     long baseOffset = size;
 
     // コードバッファを追加
-    Put( nativeCode.codeBuffer, nativeCode.size, isOpBuffer );
+    Put( nativeCode.codeBuffer, nativeCode.size );
 
     // スケジュールを追加
@@ -64 +52 @@
     *((long *)(codeBuffer+size))=0;
     size += sizeof(long);
-
-
-
-    // 未完成
-    if( isCall )
-    {
-        pobj_SubAddrSchedule->add(pUserProc,1);
-    }
-    else
-    {
-        pobj_SubAddrSchedule->add(pUserProc,0);
-    }
-    extern char *OpBuffer;
-    extern int obp;
-    *((long *)(OpBuffer+obp))=0;
-    ObpPlus( sizeof(long) );
 }
 
@@ -90 +62 @@
     *((long *)(codeBuffer+size))=0;
     size += sizeof(long);
-
-
-
-    // 未完成
-    pobj_ImportAddrSchedule->add(pDllProc);
-    extern char *OpBuffer;
-    extern int obp;
-    *((long *)(OpBuffer+obp))=0;
-    ObpPlus( sizeof(long) );
 }
 

trunk/abdev/BasicCompiler_Common/src/ObjectModule.cpp

@@ -8 +8 @@
     meta.StaticLink( objectModule.meta, dataTable.GetSize() );
 
+    // ネイティブコードを結合
+    globalNativeCode.Put( objectModule.globalNativeCode );
+    globalNativeCode.ResetDataSectionBaseOffset( dataTable.GetSize() );
+
     // データテーブルを結合
     dataTable.Add( objectModule.dataTable );