Changeset 551 in dev for trunk/ab5.0/abdev/BasicCompiler_Common

Timestamp:

May 5, 2008, 12:39:50 AM (16 years ago)

Author:

dai_9181

Message:

・PutWithScheduleメソッドを追加。
・NativeCodeクラスが持つCompilerクラスへの依存度を除去した。

Location:

trunk/ab5.0/abdev/BasicCompiler_Common

Files:

• Compile.cpp (modified) (1 diff)
• include/CodeGenerator.h (modified) (4 diffs)
• include/NativeCode.h (modified) (1 diff)
• src/CommonCodeGenerator.cpp (modified) (1 diff)
• src/NativeCode.cpp (modified) (3 diffs)

trunk/ab5.0/abdev/BasicCompiler_Common/Compile.cpp

@@ -744 +744 @@
             }
 
-            compiler.codeGenerator.NextSourceLine();
+            compiler.codeGenerator.NextSourceLine( compiler.GetObjectModule().GetCurrentSourceIndex() );
 
             if(Command[0]==1){

trunk/ab5.0/abdev/BasicCompiler_Common/include/CodeGenerator.h

@@ -241 +241 @@
     }
 
-    void NextSourceLine()
-    {
-        pNativeCode->NextSourceLine();
+    void NextSourceLine( int currentSourceIndex )
+    {
+        pNativeCode->NextSourceLine( currentSourceIndex );
     }
 
@@ -266 +266 @@
         continueCodePositions.pop_back();
     }
-    
+
+    void PutWithSchedule( long l, Schedule::Type scheduleType );
+
     void ResolveExitSubSchedule();
 
@@ -469 +471 @@
     void PutOld( long l, Schedule::Type scheduleType )
     {
-        pNativeCode->PutEx( l, scheduleType );
+        this->PutWithSchedule( l, scheduleType );
     }
     const PertialSchedule *PutOld( long l, bool isPertialSchedule )
@@ -479 +481 @@
             pPertialSchedule = pertialSchedules.back();
         }
-        pNativeCode->PutEx( l, Schedule::None );
+        pNativeCode->Put( l );
         return pPertialSchedule;
     }

trunk/ab5.0/abdev/BasicCompiler_Common/include/NativeCode.h

@@ -254 +254 @@
         return sourceLines;
     }
-    void NextSourceLine();
+    void NextSourceLine( int currentSourceIndex );
 
     void ResetDataSectionBaseOffset( long dataSectionBaseOffset );

trunk/ab5.0/abdev/BasicCompiler_Common/src/CommonCodeGenerator.cpp

@@ -10 +10 @@
 
 
+void CodeGenerator::PutWithSchedule( long l, Schedule::Type scheduleType )
+{
+    if( scheduleType == Schedule::CatchAddress )
+    {
+        const UserProc *pCurrentUserProc = compiler.IsGlobalAreaCompiling()
+            ? UserProc::pGlobalProc
+            : &compiler.GetCompilingUserProc();
+
+        this->pNativeCode->PutCatchAddressSchedule( pCurrentUserProc, l );
+    }
+    else
+    {
+        this->pNativeCode->PutEx( l, scheduleType );
+    }
+}
+
 void CodeGenerator::ResolveExitSubSchedule()
 {

trunk/ab5.0/abdev/BasicCompiler_Common/src/NativeCode.cpp

@@ -57 +57 @@
 void NativeCode::PutEx( long l, Schedule::Type scheduleType )
 {
-    if( scheduleType == Schedule::CatchAddress )
+    if( scheduleType != Schedule::None )
     {
-        const UserProc *pUserProc = &compiler.GetCompilingUserProc();
-        if( compiler.IsGlobalAreaCompiling() )
-        {
-            pUserProc = UserProc::pGlobalProc;
-        }
-        PutCatchAddressSchedule( pUserProc, l );
+        schedules.push_back( Schedule( scheduleType, GetSize() ) );
     }
-    else
-    {
-        if( scheduleType != Schedule::None )
-        {
-            schedules.push_back( Schedule( scheduleType, GetSize() ) );
-        }
 
-        Put( l );
-    }
+    Put( l );
 }
 
@@ -120 +108 @@
 }
 
-void NativeCode::NextSourceLine()
+void NativeCode::NextSourceLine( int currentSourceIndex )
 {
     if( sourceLines.size() )
@@ -146 +134 @@
             (long)sourceLines.size(),
             GetSize(),
-            compiler.GetObjectModule().GetCurrentSourceIndex(),
+            currentSourceIndex,
             cp,
             sourceLineType