Changeset 357 in dev for trunk/abdev/BasicCompiler_Common

Timestamp:

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

Author:

dai_9181

Message:

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

Location:

trunk/abdev/BasicCompiler_Common

Files:

• Debug.cpp (modified) (1 diff)
• Intermediate_Step1.cpp (modified) (1 diff)
• common_msg_jpn.h (modified) (1 diff)
• include/Binary.h (modified) (1 diff)
• include/CodeGenerator.h (modified) (3 diffs)
• include/Compiler.h (modified) (1 diff)
• include/Exception.h (modified) (1 diff)
• include/Linker.h (modified) (1 diff)
• include/NativeCode.h (modified) (5 diffs)
• src/CommonCodeGenerator.cpp (modified) (2 diffs)
• src/Exception.cpp (modified) (2 diffs)
• src/Linker.cpp (modified) (1 diff)
• src/NativeCode.cpp (modified) (2 diffs)

trunk/abdev/BasicCompiler_Common/Debug.cpp

@@ -630 +630 @@
 
                 //"スレッド(&H%X)でアクセス違反がありました(EIP=&H%08X)。\r\n"
-                sprintf(temporary,STRING_DEBUG_THREAD_ACCESSVIOLATION,de.dwThreadId,(ULONG_PTR)de.u.Exception.ExceptionRecord.ExceptionAddress);
+                sprintf(temporary,
+                    STRING_DEBUG_THREAD_ACCESSVIOLATION,
+                    de.dwThreadId,
+                    (ULONG_PTR)de.u.Exception.ExceptionRecord.ExceptionAddress,
+#ifdef _AMD64_
+                    (ULONG_PTR)Context.Rsp
+#else
+                    (ULONG_PTR)Context.Esp
+#endif
+                    );
                 DebugMessage(temporary);
 

trunk/abdev/BasicCompiler_Common/Intermediate_Step1.cpp

@@ -492 +492 @@
                         case 't':
                         case 'T':
-                            if(lstrcmpi(temp2,"Type")==0) sw1=1;
+                            if(lstrcmpi(temp2,"Try")==0) sw1=1;
+                            else if(lstrcmpi(temp2,"Type")==0) sw1=1;
                             break;
                         case 'w':

trunk/abdev/BasicCompiler_Common/common_msg_jpn.h

@@ -40 +40 @@
 #define STRING_DEBUG_PROCESSFINISH          "プログラムはコード &H%X で終了しました。\r\n"
 #define STRING_DEBUG_THREAD_INVALID_HANDLE  "スレッド(&H%X)でハンドル違反がありました(EIP=&H%08X)。\r\n"
-#define STRING_DEBUG_THREAD_ACCESSVIOLATION "スレッド(&H%X)でアクセス違反がありました(EIP=&H%08X)。\r\n"
+#define STRING_DEBUG_THREAD_ACCESSVIOLATION "スレッド(&H%X)でアクセス違反がありました(EIP=&H%08X/ESP=&H%08X)。\r\n"
 #define STRING_DEBUG_BREAKPOINT             "スレッド(&H%X)のブレーク ポイント(EIP=&H%08X/ESP=&H%08X)。\r\n"
 #define STRING_DEBUG_DIVIDE_BY_ZERO         "0による除算が行われました。スレッド(&H%X) ブレーク ポイント(EIP=&H%08X)。\r\n"

trunk/abdev/BasicCompiler_Common/include/Binary.h

@@ -122 +122 @@
         *(long *)( buffer + pos ) = newLongValue;
     }
+    void Overwrite( int pos, _int64 newInt64Value )
+    {
+        *(_int64 *)( buffer + pos ) = newInt64Value;
+    }
 
     void Put( const char *buffer, int size )

trunk/abdev/BasicCompiler_Common/include/CodeGenerator.h

@@ -263 +263 @@
     void CheckUnresolveSchedule();
 
-    void opfix( const PertialSchedule *pPertialSchedule, long newValue );
+    void opfix( const PertialSchedule *pPertialSchedule, _int64 newValue );
     void opfix_offset( const PertialSchedule *pPertialSchedule, long offset );
     void opfix_JmpPertialSchedule( const PertialSchedule *pPertialSchedule );
@@ -300 +300 @@
     const PertialSchedule *__op_format(int op_size,char op_prefix,char opcode1,char opcode2,int reg,int base_reg,long offset,char mod, Schedule::Type scheduleType = Schedule::None, bool isPertialSchedule = false );
 public:
-    void op_mov_RV                  (int op_size,int reg,long i32data, Schedule::Type scheduleType = Schedule::None );
-    void op_mov_RV64                (int reg,_int64 i64data);
+    const PertialSchedule *op_mov_RV        (int op_size,int reg,long i32data, Schedule::Type scheduleType = Schedule::None, bool isPertialSchedule = false );
+    const PertialSchedule *op_mov_RV64      ( int reg, _int64 i64data, bool isPertialSchedule = false );
     const PertialSchedule *op_mov_RM        (int op_size,int reg,int base_reg,long offset,char mod, Schedule::Type scheduleType = Schedule::None, bool isPertialSchedule = false );
     const PertialSchedule *op_mov_RM_ex     (int op_size,int reg,int base_reg1,int base_reg2,long offset,BOOL bUseOffset, Schedule::Type scheduleType = Schedule::None, bool isPertialSchedule = false );
@@ -381 +381 @@
 public:
     const PertialSchedule *op_mov_MV        ( int op_size, int base_reg, long offset, Schedule::Type offsetScheduleType, bool isPertialSchedule, long value, Schedule::Type valueScheduleType = Schedule::None );
-    void op_mov_RV                          ( int reg,long offset, Schedule::Type scheduleType = Schedule::None );
+    const PertialSchedule *op_mov_RV        ( int reg, long offset, Schedule::Type scheduleType = Schedule::None, bool isPertialSchedule = false );
     void op_mov_RR                          ( int reg1,int reg2);
     const PertialSchedule *op_mov_RM        ( int op_size,int reg,int base_reg,int offset,char mod, Schedule::Type scheduleType = Schedule::None, bool isPertialSchedule = false );

trunk/abdev/BasicCompiler_Common/include/Compiler.h

@@ -9 +9 @@
 #include <Linker.h>
 #include <Delegate.h>
+#include <Exception.h>
 
 class Compiler

trunk/abdev/BasicCompiler_Common/include/Exception.h

@@ -9 +9 @@
     void ThrowCommand( const char *Parameter );
 
+    void Opcode_Func_System_GetNowScopeCatchAddress();
+
 }

trunk/abdev/BasicCompiler_Common/include/Linker.h

@@ -31 +31 @@
     void ResolveDataTableSchedules( long dataSectionBaseOffset );
 
+    // Catchアドレス スケジュール
+    void ResolveCatchAddressSchedules( long codeSectionBaseOffset );
+
     // DLL関数スケジュール
     void ResolveDllProcSchedules( long codeSectionBaseOffset, long importSectionBaseOffset, long lookupSize, long hintSize );

trunk/abdev/BasicCompiler_Common/include/NativeCode.h

@@ -19 +19 @@
         GlobalVar,      // グローバル変数スケジュール
         DataTable,      // データテーブル スケジュール
+        CatchAddress,   // Catchアドレス スケジュール
         Relocation,     // リロケーション情報スケジュール
         UserProc,       // ユーザ定義関数呼び出し側スケジュール
@@ -52 +53 @@
         case UserProc:
         case AddressOf:
+        case CatchAddress:
             ar & boost::serialization::make_nvp("pUserProc", const_cast<::UserProc *&>(pUserProc));
             break;
@@ -127 +129 @@
     const ::UserProc &GetUserProc() const
     {
-        if( !( type == Schedule::UserProc || type == Schedule::AddressOf ) )
+        if( !( type == Schedule::UserProc || type == Schedule::AddressOf || type == Schedule::CatchAddress ) )
         {
             SetError();
@@ -149 +151 @@
         }
         type = Schedule::AddressOf;
+    }
+    void SpecifyCatchAddress()
+    {
+        if( type != Schedule::UserProc )
+        {
+            SetError();
+        }
+        type = Schedule::CatchAddress;
     }
 };
@@ -279 +289 @@
 
     void PutEx( const NativeCode &nativeCode );
-    void PutEx( long l, Schedule::Type scheduleType )
-    {
-        if( scheduleType != Schedule::None )
-        {
-            schedules.push_back( Schedule( scheduleType, GetSize() ) );
-        }
-
-        Put( l );
-    }
+    void PutEx( long l, Schedule::Type scheduleType );
     void PutUserProcSchedule( const UserProc *pUserProc, bool isCall );
+    void PutCatchAddressSchedule( const UserProc *pUserProc, long codePos );
     void PutDllProcSchedule( const DllProc *pDllProc );
     void PutVtblSchedule( const CClass *pClass );

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 );
 }