Changeset 359 in dev for trunk/abdev/BasicCompiler_Common

Timestamp:

Nov 9, 2007, 8:52:07 AM (17 years ago)

Author:

dai_9181

Message:

例外処理機構実装中…

Location:

trunk/abdev/BasicCompiler_Common

Files:

• Compile.cpp (modified) (1 diff)
• error.cpp (modified) (1 diff)
• include/Exception.h (modified) (2 diffs)
• src/Exception.cpp (modified) (6 diffs)
• src/Linker.cpp (modified) (1 diff)

trunk/abdev/BasicCompiler_Common/Compile.cpp

@@ -298 +298 @@
                 break;
             case ESC_CATCH:
-                Exception::CatchCommand();
+                Exception::CatchCommand( Command + 2 );
                 break;
             case ESC_FINALLY:

trunk/abdev/BasicCompiler_Common/error.cpp

@@ -166 +166 @@
     if(num==68) sprintf(msg,"\"%s\" 不正な関数名です。", tempKeyWord);
     if(num==69) sprintf(msg,"\"%s\" 不正なメソッド名です。", tempKeyWord);
+    if(num==70) lstrcpy(msg,"一つのTryに対して複数のFinallyを記述できません。");
+    if(num==71) lstrcpy(msg,"Finallyの後ろにCatchを記述することはできません。");
+    if(num==72) lstrcpy(msg,"Catchのパラメータの型が指定されていません。");
+    if(num==73) lstrcpy(msg,"Catchのパラメータの型はクラス型でなければなりません。");
 
 

trunk/abdev/BasicCompiler_Common/include/Exception.h

@@ +1 @@
+#pragma once
 
 namespace Exception{
 
     void TryCommand();
-    void CatchCommand();
+    void CatchCommand( const char *parameter );
     void FinallyCommand();
     void EndTryCommand();
@@ -10 +11 @@
 
     void Opcode_Func_System_GetNowScopeCatchAddress();
-
+    void Opcode_Func_System_GetNowScopeFinallyAddress();
 }

trunk/abdev/BasicCompiler_Common/src/Exception.cpp

@@ -13 +13 @@
 class TryScope
 {
+    bool isCatched;
+    bool isDefinedFinally;
+
+    std::vector<const PertialSchedule *> finallySchedules;
+    void JmpFinally()
+    {
+        finallySchedules.push_back(
+            compiler.codeGenerator.op_jmp( 0, sizeof(long), true )
+        );
+    }
+    void ResolveJmpFinally()
+    {
+        BOOST_FOREACH( const PertialSchedule *pPertialSchedule, finallySchedules )
+        {
+            compiler.codeGenerator.opfix_JmpPertialSchedule( pPertialSchedule );
+        }
+    }
+
+    const PertialSchedule *pPertialScheduleForFinallyAddress;
+
 public:
     const PertialSchedule *pPertialScheduleForCatchAddress;
     TryScope()
+        : isCatched( false )
+        , isDefinedFinally( false )
     {
     }
@@ -22 +44 @@
     }
 
+    bool IsCatched() const
+    {
+        return isCatched;
+    }
+    bool IsDefinedFinally() const
+    {
+        return isDefinedFinally;
+    }
+
     void RegistPertialScheduleForCatchAddress( const PertialSchedule *pPertialScheduleForCatchAddress )
     {
         this->pPertialScheduleForCatchAddress = pPertialScheduleForCatchAddress;
     }
-
-    void AddCatch()
-    {
+    void RegistPertialScheduleForFinallyAddress( const PertialSchedule *pPertialScheduleForFinallyAddress )
+    {
+        this->pPertialScheduleForFinallyAddress = pPertialScheduleForFinallyAddress;
+    }
+    const PertialSchedule *GetPertialScheduleForFinallyAddress() const
+    {
+        return pPertialScheduleForFinallyAddress;
+    }
+    
+    
+
+    void Try()
+    {
+    }
+
+    void Catch()
+    {
+        if( isDefinedFinally )
+        {
+            SetError(71,NULL,cp);
+            return;
+        }
+
+        isCatched = true;
+
+        JmpFinally();
+    }
+    void Finally()
+    {
+        if( isDefinedFinally )
+        {
+            SetError(70,NULL,cp);
+            return;
+        }
+
+        isDefinedFinally = true;
+
+        ResolveJmpFinally();
     }
 
     void EndTry()
     {
+        if( !isDefinedFinally )
+        {
+            Finally();
+        }
     }
 };
@@ -47 +117 @@
 
     tryScopes.push_back( TryScope() );
-
-    int backCp = cp;
-
-    char temporary[1024];
-    lstrcpy( temporary, "ExceptionService.BeginTryScope( _System_GetNowScopeCatchAddresses() As VoidPtr, _System_GetBp() As LONG_PTR, _System_GetSp() As LONG_PTR )" );
-    MakeMiddleCode( temporary );
-    ChangeOpcode( temporary );
-
-    cp = backCp;
-}
-void CatchCommand()
-{
-    if( tryScopes.size() == 0 )
-    {
-        SetError(1,NULL,cp);
-        return;
-    }
-
+    tryScopes.back().Try();
+
+    int backCp = cp;
+
+    char temporary[1024];
+    lstrcpy( temporary, "ExceptionService.BeginTryScope( _System_GetNowScopeCatchAddresses() As VoidPtr, _System_GetNowScopeFinallyAddresses() As VoidPtr, _System_GetBp() As LONG_PTR, _System_GetSp() As LONG_PTR )" );
+    MakeMiddleCode( temporary );
+    ChangeOpcode( temporary );
+
+    cp = backCp;
+}
+void CatchCommand( const char *parameter )
+{
+    if( tryScopes.size() == 0 )
+    {
+        SetError(1,NULL,cp);
+        return;
+    }
+
+    Type paramType;
+    if( parameter[0] )
+    {
+        char varName[VN_SIZE], typeName[VN_SIZE];
+        SplitSyntacticForAs( parameter, varName, typeName );
+        if( !typeName[0] )
+        {
+            SetError(72,NULL,cp);
+        }
+        else
+        {
+            if( !compiler.StringToType( typeName, paramType ) )
+            {
+                SetError(73,NULL,cp);
+            }
+        }
+    }
+
+    // パラメータの扱いが未完成
+
+    tryScopes.back().Catch();
+
+    // _System_GetNowScopeCatchAddressesを解決
     compiler.codeGenerator.opfix( tryScopes.back().pPertialScheduleForCatchAddress, compiler.codeGenerator.GetNativeCodeSize() );
 }
 void FinallyCommand()
 {
+    tryScopes.back().Finally();
+
+    int backCp = cp;
+
+    char temporary[1024];
+    lstrcpy( temporary, "_System_pobj_AllThreads->GetCurrentException()->FinishFinally()" );
+    MakeMiddleCode( temporary );
+    ChangeOpcode( temporary );
+
+    cp = backCp;
+
+    //Tryスコープに入るときに引き渡されるパラメータ値を解決
+    compiler.codeGenerator.opfix( tryScopes.back().GetPertialScheduleForFinallyAddress(), compiler.codeGenerator.GetNativeCodeSize() );
 }
 void EndTryCommand()
@@ -80 +187 @@
     int backCp = cp;
 
+    if( !tryScopes.back().IsCatched() )
+    {
+        // _System_GetNowScopeCatchAddressesを解決
+        compiler.codeGenerator.opfix( tryScopes.back().pPertialScheduleForCatchAddress, 0 );
+    }
+
+    if( !tryScopes.back().IsDefinedFinally() )
+    {
+        // Finallyが定義されていないときは空のFinallyを定義しておく
+        FinallyCommand();
+    }
+
     char temporary[1024];
     lstrcpy( temporary, "_System_pobj_AllThreads->GetCurrentException()->EndTryScope()" );
@@ -87 +206 @@
     cp = backCp;
 
+    tryScopes.back().EndTry();
     tryScopes.pop_back();
 }
@@ -133 +253 @@
 }
 
+void Opcode_Func_System_GetNowScopeFinallyAddress()
+{
+    if( tryScopes.size() == 0 )
+    {
+        SetError(1,NULL,cp);
+        return;
+    }
+
+#ifdef _WIN64
+    //mov rax,finallyAddress
+    const PertialSchedule *pPertialSchedule = compiler.codeGenerator.op_mov_RV( sizeof(long), REG_RAX, 0, Schedule::CatchAddress, true );
+#else
+    //mov eax,finallyAddress
+    const PertialSchedule *pPertialSchedule = compiler.codeGenerator.op_mov_RV( REG_EAX, 0, Schedule::CatchAddress, true );
+#endif
+
+    tryScopes.back().RegistPertialScheduleForFinallyAddress( pPertialSchedule );
+
+    /*
+    int dataTableOffset = compiler.GetObjectModule().dataTable.Add( static_cast<LONG_PTR>(0) );
+
+#ifdef _WIN64
+    //mov rax,dataTableOffset
+    compiler.codeGenerator.op_mov_RV( sizeof(_int64), REG_RAX, dataTableOffset, Schedule::DataTable);
+#else
+    //mov eax,dataTableOffset
+    compiler.codeGenerator.op_mov_RV( REG_EAX, dataTableOffset, Schedule::DataTable);
+#endif
+    */
+}
+
 
 }   // Exception

trunk/abdev/BasicCompiler_Common/src/Linker.cpp

@@ -44 +44 @@
         if( schedule.GetType() == Schedule::CatchAddress )
         {
-            nativeCode.Overwrite(
-                schedule.GetOffset(),
-                static_cast<long>( nativeCode.GetLong( schedule.GetOffset() ) + schedule.GetUserProc().GetBeginOpAddress() + imageBase + codeSectionBaseOffset )
-            );
+            if( nativeCode.GetLong( schedule.GetOffset() ) != 0 )
+            {
+                // 置き換える値が0の場合を除く
+                nativeCode.Overwrite(
+                    schedule.GetOffset(),
+                    static_cast<long>( nativeCode.GetLong( schedule.GetOffset() ) + schedule.GetUserProc().GetBeginOpAddress() + imageBase + codeSectionBaseOffset )
+                );
+            }
         }
     }