Changeset 357 in dev for trunk/abdev/BasicCompiler64

Timestamp:

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

Author:

dai_9181

Message:

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

Location:

trunk/abdev/BasicCompiler64

Files:

• CodeGenerator.cpp (modified) (3 diffs)
• Compile_Func.cpp (modified) (3 diffs)
• FunctionValue.h (modified) (1 diff)
• MakePeHdr.cpp (modified) (1 diff)

trunk/abdev/BasicCompiler64/CodeGenerator.cpp

@@ -157 +157 @@
 ///////////////////
 
-void CodeGenerator::op_mov_RV(int op_size,int reg,long i32data, Schedule::Type scheduleType ){
+const PertialSchedule *CodeGenerator::op_mov_RV(int op_size,int reg,long i32data, Schedule::Type scheduleType, bool isPertialSchedule ){
     //mov reg,i32data
 
@@ -176 +176 @@
 
     //即値
+    const PertialSchedule *pPertialSchedule = NULL;
+    if( isPertialSchedule )
+    {
+        pertialSchedules.push_back( new PertialSchedule( pNativeCode->GetSize(), sizeof(long) ) );
+        pPertialSchedule = pertialSchedules.back();
+    }
     pNativeCode->PutEx( i32data, scheduleType );
-}
-void CodeGenerator::op_mov_RV64(int reg,_int64 i64data){
+
+    return pPertialSchedule;
+}
+const PertialSchedule *CodeGenerator::op_mov_RV64( int reg, _int64 i64data, bool isPertialSchedule )
+{
     //mov reg,i64data
 
@@ -188 +197 @@
 
     //即値
+    const PertialSchedule *pPertialSchedule = NULL;
+    if( isPertialSchedule )
+    {
+        pertialSchedules.push_back( new PertialSchedule( pNativeCode->GetSize(), sizeof(_int64) ) );
+        pPertialSchedule = pertialSchedules.back();
+    }
     pNativeCode->Put( i64data );
+
+    return pPertialSchedule;
 }
 const PertialSchedule *CodeGenerator::op_mov_RM(int op_size,int reg,int base_reg,long offset,char mod, Schedule::Type scheduleType, bool isPertialSchedule ){

trunk/abdev/BasicCompiler64/Compile_Func.cpp

@@ -16 +16 @@
     if( lstrcmpi( FuncName, "__delegate_dynamicmethod_call" ) == 0 )    return FUNC_DELEGATE_DYNAMICMETHOD_CALL;
     if( lstrcmpi( FuncName, "__delegate_staticmethod_call" ) == 0 )     return FUNC_DELEGATE_STATICMETHOD_CALL;
+    if( lstrcmpi( FuncName, "_System_GetNowScopeCatchAddresses" ) == 0 )return FUNC_SYSTEM_GET_NOW_SCOPE_CATCH_ADDRESS;
     if( lstrcmpi( FuncName, "GetDouble" ) == 0 )        return FUNC_GETDOUBLE;
     if( lstrcmpi( FuncName, "GetSingle" ) == 0 )        return FUNC_GETSINGLE;
@@ -441 +442 @@
 }
 
+void Opcode_Func_System_Get_Bp()
+{
+    //mov rax,rbp
+    compiler.codeGenerator.op_mov_RR(REG_RAX,REG_RBP);
+}
+
 void Opcode_Func_GetPtrData( const char *Parameter, const int type ){
     int reg=REG_RAX;
@@ -492 +499 @@
             Opcode_Func_delegate_call( Parameter, resultType, false, isCallOn );
             break;
+        case FUNC_SYSTEM_GET_NOW_SCOPE_CATCH_ADDRESS:
+            if( isCallOn ) Exception::Opcode_Func_System_GetNowScopeCatchAddress();
+            resultType.SetBasicType( DEF_LONG );
+            break;
+        case FUNC_SYSTEM_GET_BP:
+            if( isCallOn ) Opcode_Func_System_Get_Bp();
+            resultType.SetBasicType( DEF_LONG );
+            break;
 
         case FUNC_GETDOUBLE:

trunk/abdev/BasicCompiler64/FunctionValue.h

@@ -16 +16 @@
 #define FUNC_DELEGATE_DYNAMICMETHOD_CALL    0x0621
 #define FUNC_DELEGATE_STATICMETHOD_CALL     0x0622
+#define FUNC_SYSTEM_GET_NOW_SCOPE_CATCH_ADDRESS 0x0623
+#define FUNC_SYSTEM_GET_BP  0x0624
 
 //ポインタ

trunk/abdev/BasicCompiler64/MakePeHdr.cpp

@@ -1077 +1077 @@
     compiler.linker.SetImageBase( ImageBase );
     compiler.linker.ResolveDataTableSchedules( MemPos_DataSection );
+    compiler.linker.ResolveCatchAddressSchedules( MemPos_CodeSection );
     compiler.linker.ResolveDllProcSchedules( MemPos_CodeSection, MemPos_ImportSection, LookupSize, HintSize );
     compiler.linker.ResolveUserProcSchedules( MemPos_CodeSection );