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

Timestamp:

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

Author:

dai_9181

Message:

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

Location:

trunk/abdev/BasicCompiler_Common/include

Files:

• Binary.h (modified) (1 diff)
• CodeGenerator.h (modified) (3 diffs)
• Compiler.h (modified) (1 diff)
• Exception.h (modified) (1 diff)
• Linker.h (modified) (1 diff)
• NativeCode.h (modified) (5 diffs)

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