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

Timestamp:

Nov 5, 2007, 3:26:20 AM (17 years ago)

Author:

dai_9181

Message:

例外処理機構実装中...

Location:

trunk/abdev/BasicCompiler_Common/src

Files:

• CommonCodeGenerator.cpp (modified) (2 diffs)
• Exception.cpp (modified) (2 diffs)
• Linker.cpp (modified) (1 diff)
• NativeCode.cpp (modified) (2 diffs)

trunk/abdev/BasicCompiler_Common/src/CommonCodeGenerator.cpp

@@ -20 +20 @@
 }
 
-void CodeGenerator::opfix( const PertialSchedule *pPertialSchedule, long newValue )
+void CodeGenerator::opfix( const PertialSchedule *pPertialSchedule, _int64 newValue )
 {
     bool isSuccessful = false;
@@ -41 +41 @@
             else if( pPertialSchedule->GetTypeSize() == sizeof(long) )
             {
+                pNativeCode->Overwrite( pPertialSchedule->GetCodePos(), static_cast<long>(newValue) );
+            }
+            else if( pPertialSchedule->GetTypeSize() == sizeof(_int64) )
+            {
                 pNativeCode->Overwrite( pPertialSchedule->GetCodePos(), newValue );
             }

trunk/abdev/BasicCompiler_Common/src/Exception.cpp

@@ -1 +1 @@
 #include "stdafx.h"
+
+#ifdef _AMD64_
+#include "../../BasicCompiler64/opcode.h"
+#else
+#include "../../BasicCompiler32/opcode.h"
+#endif
 
 #include <Exception.h>
@@ -5 +11 @@
 namespace Exception{
 
+class TryScope
+{
+public:
+    const PertialSchedule *pPertialScheduleForCatchAddress;
+    TryScope()
+    {
+    }
+    ~TryScope()
+    {
+    }
 
-void TryCommand(){
+    void RegistPertialScheduleForCatchAddress( const PertialSchedule *pPertialScheduleForCatchAddress )
+    {
+        this->pPertialScheduleForCatchAddress = pPertialScheduleForCatchAddress;
+    }
+
+    void AddCatch()
+    {
+    }
+
+    void EndTry()
+    {
+    }
+};
+typedef std::vector<TryScope> TryScopes;
+
+TryScopes tryScopes;
+
+void TryCommand()
+{
+    if( UserProc::IsGlobalAreaCompiling() )
+    {
+        SetError();
+    }
+
+    tryScopes.push_back( TryScope() );
+
+    int backCp = cp;
+
+    char temporary[1024];
+    lstrcpy( temporary, "_System_pobj_AllThreads->GetCurrentException()->BeginTryScope( _System_GetNowScopeCatchAddresses() As VoidPtr, _System_GetBp() As LONG_PTR, _System_GetSp() As LONG_PTR )" );
+    MakeMiddleCode( temporary );
+    ChangeOpcode( temporary );
+
+    cp = backCp;
 }
-void CatchCommand(){
+void CatchCommand()
+{
+    if( tryScopes.size() == 0 )
+    {
+        SetError(1,NULL,cp);
+        return;
+    }
+
+    compiler.codeGenerator.opfix( tryScopes.back().pPertialScheduleForCatchAddress, compiler.codeGenerator.GetNativeCodeSize() );
 }
-void FinallyCommand(){
+void FinallyCommand()
+{
 }
-void EndTryCommand(){
+void EndTryCommand()
+{
+    if( tryScopes.size() == 0 )
+    {
+        SetError(1,NULL,cp);
+        return;
+    }
+
+    int backCp = cp;
+
+    char temporary[1024];
+    lstrcpy( temporary, "_System_pobj_AllThreads->GetCurrentException()->EndTryScope()" );
+    MakeMiddleCode( temporary );
+    ChangeOpcode( temporary );
+
+    cp = backCp;
+
+    tryScopes.pop_back();
 }
 
-void ThrowCommand( const char *Parameter ){
+void ThrowCommand( const char *Parameter )
+{
+    int backCp = cp;
+
+    char temporary[1024];
+    lstrcpy( temporary, "_System_pobj_AllThreads->GetCurrentException()->_Throw()" );
+    MakeMiddleCode( temporary );
+    ChangeOpcode( temporary );
+
+    cp = backCp;
+}
+
+void Opcode_Func_System_GetNowScopeCatchAddress()
+{
+    if( tryScopes.size() == 0 )
+    {
+        SetError(1,NULL,cp);
+        return;
+    }
+
+#ifdef _WIN64
+    //mov rax,catchAddress
+    const PertialSchedule *pPertialSchedule = compiler.codeGenerator.op_mov_RV( sizeof(long), REG_RAX, 0, Schedule::CatchAddress, true );
+#else
+    //mov eax,catchAddress
+    const PertialSchedule *pPertialSchedule = compiler.codeGenerator.op_mov_RV( REG_EAX, 0, Schedule::CatchAddress, true );
+#endif
+
+    tryScopes.back().RegistPertialScheduleForCatchAddress( 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
+    */
 }
 

trunk/abdev/BasicCompiler_Common/src/Linker.cpp

@@ -37 +37 @@
 }
 
+// Catchアドレス スケジュール
+void Linker::ResolveCatchAddressSchedules( long codeSectionBaseOffset )
+{
+    BOOST_FOREACH( const Schedule &schedule, nativeCode.GetSchedules() )
+    {
+        if( schedule.GetType() == Schedule::CatchAddress )
+        {
+            nativeCode.Overwrite(
+                schedule.GetOffset(),
+                static_cast<long>( nativeCode.GetLong( schedule.GetOffset() ) + schedule.GetUserProc().GetBeginOpAddress() + imageBase + codeSectionBaseOffset )
+            );
+        }
+    }
+}
+
 // DLL関数スケジュール
 void Linker::ResolveDllProcSchedules( long codeSectionBaseOffset, long importSectionBaseOffset, long lookupSize, long hintSize )

trunk/abdev/BasicCompiler_Common/src/NativeCode.cpp

@@ -39 +39 @@
 }
 
+void NativeCode::PutEx( long l, Schedule::Type scheduleType )
+{
+    if( scheduleType == Schedule::CatchAddress )
+    {
+        PutCatchAddressSchedule( &UserProc::CompilingUserProc(), l );
+    }
+    else
+    {
+        if( scheduleType != Schedule::None )
+        {
+            schedules.push_back( Schedule( scheduleType, GetSize() ) );
+        }
+
+        Put( l );
+    }
+}
+
 void NativeCode::PutUserProcSchedule( const UserProc *pUserProc, bool isCall )
 {
@@ -51 +68 @@
 
     Put( (long)0 );
+}
+
+void NativeCode::PutCatchAddressSchedule( const UserProc *pUserProc, long codePos )
+{
+    pUserProc->Using();
+
+    Schedule schedule( pUserProc, GetSize() );
+    schedule.SpecifyCatchAddress();
+    schedules.push_back( schedule );
+
+    Put( codePos );
 }