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

Timestamp:

Jul 29, 2007, 12:33:04 PM (17 years ago)

Author:

dai_9181

Message:

BreakPertialScheduleをリファクタリング

Location:

trunk/abdev/BasicCompiler_Common/src

Files:

• CommonCodeGenerator.cpp (modified) (3 diffs)
• LexicalScope.cpp (moved) (moved from trunk/abdev/BasicCompiler_Common/src/LexicalScopingImpl.cpp ) (5 diffs)
• SmoothieImpl.cpp (modified) (1 diff)
• Variable.cpp (modified) (2 diffs)

trunk/abdev/BasicCompiler_Common/src/CommonCodeGenerator.cpp

@@ -33 +33 @@
     bool isSuccessful = false;
 
-    CodeGenerator::PertialSchedules::iterator it = pertialSchedules.begin();
+    PertialSchedules::iterator it = pertialSchedules.begin();
     while( it != pertialSchedules.end() )
     {
@@ -84 +84 @@
     }
 }
-const CodeGenerator::PertialSchedule *CodeGenerator::__jmp_op_format( char opcode, long offset, int op_size, bool isPertialSchedule, bool isSelfOpcodeOffset )
+const PertialSchedule *CodeGenerator::__jmp_op_format( char opcode, long offset, int op_size, bool isPertialSchedule, bool isSelfOpcodeOffset )
 {
     long beginCodePos = pNativeCode->GetSize();
@@ -158 +158 @@
     return pPertialSchedule;
 }
-const CodeGenerator::PertialSchedule *CodeGenerator::op_jle( long offset, int op_size, bool isPertialSchedule )
+const PertialSchedule *CodeGenerator::op_jle( long offset, int op_size, bool isPertialSchedule )
 {
     return __jmp_op_format( (char)0x0E, offset, op_size, isPertialSchedule );
 }
-const CodeGenerator::PertialSchedule *CodeGenerator::op_jbe( long offset, int op_size, bool isPertialSchedule )
+const PertialSchedule *CodeGenerator::op_jbe( long offset, int op_size, bool isPertialSchedule )
 {
     return __jmp_op_format( (char)0x06, offset, op_size, isPertialSchedule );
 }
-const CodeGenerator::PertialSchedule *CodeGenerator::op_jge( long offset, int op_size, bool isPertialSchedule )
+const PertialSchedule *CodeGenerator::op_jge( long offset, int op_size, bool isPertialSchedule )
 {
     return __jmp_op_format( (char)0x0D, offset, op_size, isPertialSchedule );
 }
-const CodeGenerator::PertialSchedule *CodeGenerator::op_jae( long offset, int op_size, bool isPertialSchedule )
+const PertialSchedule *CodeGenerator::op_jae( long offset, int op_size, bool isPertialSchedule )
 {
     return __jmp_op_format( (char)0x03, offset, op_size, isPertialSchedule );
 }
-const CodeGenerator::PertialSchedule *CodeGenerator::op_jl( long offset, int op_size, bool isPertialSchedule )
+const PertialSchedule *CodeGenerator::op_jl( long offset, int op_size, bool isPertialSchedule )
 {
     return __jmp_op_format( (char)0x0C, offset, op_size, isPertialSchedule );
 }
-const CodeGenerator::PertialSchedule *CodeGenerator::op_jb( long offset, int op_size, bool isPertialSchedule )
+const PertialSchedule *CodeGenerator::op_jb( long offset, int op_size, bool isPertialSchedule )
 {
     return __jmp_op_format( (char)0x02, offset, op_size, isPertialSchedule );
 }
-const CodeGenerator::PertialSchedule *CodeGenerator::op_jg( long offset, int op_size, bool isPertialSchedule )
+const PertialSchedule *CodeGenerator::op_jg( long offset, int op_size, bool isPertialSchedule )
 {
     return __jmp_op_format( (char)0x0F, offset, op_size, isPertialSchedule );
 }
-const CodeGenerator::PertialSchedule *CodeGenerator::op_ja( long offset, int op_size, bool isPertialSchedule )
+const PertialSchedule *CodeGenerator::op_ja( long offset, int op_size, bool isPertialSchedule )
 {
     return __jmp_op_format( (char)0x07, offset, op_size, isPertialSchedule );
 }
-const CodeGenerator::PertialSchedule *CodeGenerator::op_jne( long offset, int op_size, bool isPertialSchedule )
+const PertialSchedule *CodeGenerator::op_jne( long offset, int op_size, bool isPertialSchedule )
 {
     return __jmp_op_format( (char)0x05, offset, op_size, isPertialSchedule );
 }
-const CodeGenerator::PertialSchedule *CodeGenerator::op_je( long offset, int op_size, bool isPertialSchedule )
+const PertialSchedule *CodeGenerator::op_je( long offset, int op_size, bool isPertialSchedule )
 {
     return __jmp_op_format( (char)0x04, offset, op_size, isPertialSchedule );
 }
-const CodeGenerator::PertialSchedule *CodeGenerator::op_jmp( long offset, int op_size, bool isPertialSchedule, bool isSelfOpcodeOffset )
+const PertialSchedule *CodeGenerator::op_jmp( long offset, int op_size, bool isPertialSchedule, bool isSelfOpcodeOffset )
 {
     return __jmp_op_format( (char)0xEB, offset, op_size, isPertialSchedule, isSelfOpcodeOffset );

trunk/abdev/BasicCompiler_Common/src/LexicalScope.cpp

@@ -1 +1 @@
 #include "stdafx.h"
 
-#include <LexicalScopingImpl.h>
+#include <LexicalScope.h>
 #include <Compiler.h>
 
@@ -13 +13 @@
 
 
-void ScopeImpl::Break(){
+void LexicalScope::Break(){
     //未解放のローカルオブジェクトを解放する
-    GetLexicalScopes().CallDestructorsOfReturn( level );
+    compiler.codeGenerator.lexicalScopes.CallDestructorsOfReturn( level );
 
     //jmp ...(Next addr)
-    OpBuffer[obp++]=(char)0xE9;
-
-    pBreakSchedule=(DWORD *)realloc( pBreakSchedule, ( nBreakSchedule + 1 ) * sizeof(DWORD) );
-    pBreakSchedule[nBreakSchedule]=obp;
-    nBreakSchedule++;
-
-    obp+=sizeof(long);
+    breakPertialSchedules.push_back(
+        compiler.codeGenerator.op_jmp( 0, sizeof(long), true )
+    );
 }
-void ScopeImpl::RunScheduleOfBreak(){
-    for(int i=0;i<nBreakSchedule;i++){
-        *((long *)(OpBuffer+pBreakSchedule[i]))=obp-(pBreakSchedule[i]+sizeof(long));
+void LexicalScope::RunScheduleOfBreak(){
+    BOOST_FOREACH( const PertialSchedule *pBreakPertialSchedule, breakPertialSchedules )
+    {
+        compiler.codeGenerator.opfix_JmpPertialSchedule( pBreakPertialSchedule );
     }
 }
 
-void LexicalScopesImpl::End(){
+
+
+LexicalScope *LexicalScopes::SearchScope( LexicalScope::SCOPE_TYPE TypeOfStatement ){
+    for( int i = level; i>=0; i-- ){
+        if( ppScopes[i]->GetTypeOfStatement() == TypeOfStatement ){
+            return ppScopes[i];
+        }
+    }
+    return NULL;
+}
+
+void LexicalScopes::Init(int addr){
+    // TODO: エラーチェック
+
+    level = -1;
+    Start( addr, LexicalScope::SCOPE_TYPE_BASE );
+}
+void LexicalScopes::Start( int addr, LexicalScope::SCOPE_TYPE TypeOfStatement ){
+    level++;
+    ppScopes = (LexicalScope **)realloc( ppScopes, ( level + 1 ) * sizeof( LexicalScope * ) );
+    ppScopes[level] = new LexicalScope( level, addr, TypeOfStatement );
+}
+
+int LexicalScopes::GetNowLevel(){
+    return level;
+}
+void LexicalScopes::SetNowLevel( int level ){
+    this->level = level;
+}
+int LexicalScopes::GetStartAddress(){
+    return ppScopes[level]->GetStartAddress();
+}
+
+void LexicalScopes::End(){
     if( level <= 0 ){
         SetError();
@@ -65 +95 @@
 
 // スコープ終了時のデストラクタ呼び出し
-void LexicalScopesImpl::CallDestructorsOfScopeEnd(){
+void LexicalScopes::CallDestructorsOfScopeEnd(){
 
     Variables &vars = UserProc::IsGlobalAreaCompiling() ?
@@ -134 +164 @@
 
 // Returnステートメントで発行されるデストラクタを生成
-void LexicalScopesImpl::CallDestructorsOfReturn( int BaseLevel ){
+void LexicalScopes::CallDestructorsOfReturn( int BaseLevel ){
     //現在のスコープレベルを退避
     int backupScopeLevel = GetNowLevel();
@@ -147 +177 @@
     SetNowLevel( backupScopeLevel );
 }
-
-LexicalScopesImpl &GetLexicalScopes()
-{
-    static LexicalScopesImpl *pTemp = NULL;
-    if( !pTemp )
-    {
-        pTemp = (LexicalScopesImpl *)Smoothie::Temp::pLexicalScopes;
-    }
-    return *pTemp;
-}

trunk/abdev/BasicCompiler_Common/src/SmoothieImpl.cpp

@@ -6 +6 @@
 #include <Class.h>
 #include <Procedure.h>
-#include <LexicalScopingImpl.h>
-
-CLexicalScopes *Smoothie::Temp::pLexicalScopes = new LexicalScopesImpl();
+#include <LexicalScope.h>

trunk/abdev/BasicCompiler_Common/src/Variable.cpp

@@ -35 +35 @@
         Variable &var = *(*this)[i];
         if( var.bLiving                                         //現在のスコープで有効なもの
-            && var.GetScopeLevel() == Smoothie::Temp::pLexicalScopes->GetNowLevel() //現在のスコープと同一レベル
-            ){
-                if( var.IsEqualSymbol( symbol ) ){
-                    return true;
-                }
+            && var.GetScopeLevel() == compiler.codeGenerator.lexicalScopes.GetNowLevel()    //現在のスコープと同一レベル
+            )
+        {
+            if( var.IsEqualSymbol( symbol ) ){
+                return true;
+            }
         }
     }
@@ -51 +52 @@
         Variable &var = *(*this)[i];
         if( var.bLiving                                         //現在のスコープで有効なもの
-            && var.GetScopeLevel() <= Smoothie::Temp::pLexicalScopes->GetNowLevel() //現在のスコープレベルを超さないもの（Returnによる解放処理中を考慮）
+            && var.GetScopeLevel() <= compiler.codeGenerator.lexicalScopes.GetNowLevel()    //現在のスコープレベルを超さないもの（Returnによる解放処理中を考慮）
             ){
                 if( var.IsEqualSymbol( symbol ) ){