Changeset 357 in dev for trunk/abdev/BasicCompiler32

Timestamp:

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

Author:

dai_9181

Message:

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

Location:

trunk/abdev/BasicCompiler32

Files:

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

trunk/abdev/BasicCompiler32/Compile_Func.cpp

@@ -18 +18 @@
     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, "_System_GetBp" ) == 0 )    return FUNC_SYSTEM_GET_BP;
     if( lstrcmpi( FuncName, "GetDouble" ) == 0 )        return FUNC_GETDOUBLE;
     if( lstrcmpi( FuncName, "GetSingle" ) == 0 )        return FUNC_GETSINGLE;
@@ -575 +577 @@
     resultType = UserProc::CompilingUserProc().ReturnType();
 }
+void Opcode_Func_System_Get_Bp()
+{
+    //mov eax,ebp
+    compiler.codeGenerator.op_mov_RR(REG_EAX,REG_EBP);
+}
 
 void Opcode_Func_GetPtrData(const char *Parameter,const int type){
@@ -670 +677 @@
             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/BasicCompiler32/FunctionValue.h

@@ -17 +17 @@
 #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/BasicCompiler32/MakePeHdr.cpp

@@ -1079 +1079 @@
     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 );

trunk/abdev/BasicCompiler32/x86CodeGenerator.cpp

@@ -175 +175 @@
     return pPertialSchedule;
 }
-void CodeGenerator::op_mov_RV(int reg,long offset, Schedule::Type scheduleType ){
+const PertialSchedule *CodeGenerator::op_mov_RV(int reg,long offset, Schedule::Type scheduleType, bool isPertialSchedule ){
     //mov reg,value
 
@@ -182 +182 @@
 
     //DISP32
+    const PertialSchedule *pPertialSchedule = NULL;
+    if( isPertialSchedule )
+    {
+        pertialSchedules.push_back( new PertialSchedule( pNativeCode->GetSize(), sizeof(long) ) );
+        pPertialSchedule = pertialSchedules.back();
+    }
     pNativeCode->PutEx( offset, scheduleType );
+
+    return pPertialSchedule;
 }
 void CodeGenerator::op_mov_RR(int reg1,int reg2){