Changeset 358 in dev

Timestamp:

Nov 6, 2007, 2:35:15 AM (16 years ago)

Author:

dai_9181

Message:

Try-Catchを試験的に実装。
（まだ下記の動作しか実装していません）
・Try
・Catch（パラメータ無し）
・Throw（パラメータ無し）

Location:

trunk/abdev

Files:

• BasicCompiler32/Compile_Func.cpp (modified) (4 diffs)
• BasicCompiler32/Compile_ProcOp.cpp (modified) (1 diff)
• BasicCompiler32/FunctionValue.h (modified) (1 diff)
• BasicCompiler32/MakePeHdr.cpp (modified) (2 diffs)
• BasicCompiler64/Compile_Func.cpp (modified) (3 diffs)
• BasicCompiler64/Compile_ProcOp.cpp (modified) (1 diff)
• BasicCompiler64/FunctionValue.h (modified) (1 diff)
• BasicCompiler64/MakePeHdr.cpp (modified) (2 diffs)
• BasicCompiler_Common/include/ver.h (modified) (1 diff)
• BasicCompiler_Common/src/Exception.cpp (modified) (1 diff)

trunk/abdev/BasicCompiler32/Compile_Func.cpp

@@ -20 +20 @@
     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, "_System_GetSp" ) == 0 )    return FUNC_SYSTEM_GET_SP;
     if( lstrcmpi( FuncName, "GetDouble" ) == 0 )        return FUNC_GETDOUBLE;
     if( lstrcmpi( FuncName, "GetSingle" ) == 0 )        return FUNC_GETSINGLE;
@@ -582 +583 @@
     compiler.codeGenerator.op_mov_RR(REG_EAX,REG_EBP);
 }
+void Opcode_Func_System_Get_Sp()
+{
+    //mov eax,esp
+    compiler.codeGenerator.op_mov_RR(REG_EAX,REG_ESP);
+}
 
 void Opcode_Func_GetPtrData(const char *Parameter,const int type){
@@ -679 +685 @@
         case FUNC_SYSTEM_GET_NOW_SCOPE_CATCH_ADDRESS:
             if( isCallOn ) Exception::Opcode_Func_System_GetNowScopeCatchAddress();
-            resultType.SetBasicType( DEF_LONG );
+            resultType.SetBasicType( DEF_PTR_VOID );
             break;
         case FUNC_SYSTEM_GET_BP:
@@ -685 +691 @@
             resultType.SetBasicType( DEF_LONG );
             break;
+        case FUNC_SYSTEM_GET_SP:
+            if( isCallOn ) Opcode_Func_System_Get_Sp();
+            resultType.SetBasicType( DEF_LONG );
+            break;
 
         case FUNC_GETDOUBLE:

trunk/abdev/BasicCompiler32/Compile_ProcOp.cpp

@@ -100 +100 @@
         UserProc::CompileStartForUserProc( pBackUserProc );
 
-
-        //ret
-        compiler.codeGenerator.op_ret();
-    }
-    else if( userProc.GetName() == "_System_GetSp" ){
-        //mov eax,esp
-        compiler.codeGenerator.op_mov_RR(REG_EAX,REG_ESP);
-
-        //add eax,PTR_SIZE
-        compiler.codeGenerator.op_add_RV8(REG_EAX,PTR_SIZE);
 
         //ret

trunk/abdev/BasicCompiler32/FunctionValue.h

@@ -19 +19 @@
 #define FUNC_SYSTEM_GET_NOW_SCOPE_CATCH_ADDRESS 0x0623
 #define FUNC_SYSTEM_GET_BP  0x0624
+#define FUNC_SYSTEM_GET_SP  0x0625
 
 //ポインタ

trunk/abdev/BasicCompiler32/MakePeHdr.cpp

@@ -33 +33 @@
     *pSub_System_Call_Destructor_of_GlobalObject,
     *pSub_System_End,
-    *pSub_System_GetSp,
     *pSub_pow,
     *pSub_calloc,
@@ -252 +251 @@
     if(pSub_System_End=GetSubHash("_System_End",1)){
         pSub_System_End->Using();
-    }
-
-    if(pSub_System_GetSp=GetSubHash("_System_GetSp",1)){
-        pSub_System_GetSp->Using();
-        pSub_System_GetSp->ThisIsSystemProc();
     }
 

trunk/abdev/BasicCompiler64/Compile_Func.cpp

@@ -17 +17 @@
     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, "_System_GetSp" ) == 0 )    return FUNC_SYSTEM_GET_SP;
     if( lstrcmpi( FuncName, "GetDouble" ) == 0 )        return FUNC_GETDOUBLE;
     if( lstrcmpi( FuncName, "GetSingle" ) == 0 )        return FUNC_GETSINGLE;
@@ -447 +449 @@
     compiler.codeGenerator.op_mov_RR(REG_RAX,REG_RBP);
 }
+void Opcode_Func_System_Get_Sp()
+{
+    //mov rax,rsp
+    compiler.codeGenerator.op_mov_RR(REG_RAX,REG_RSP);
+}
 
 void Opcode_Func_GetPtrData( const char *Parameter, const int type ){
@@ -501 +508 @@
         case FUNC_SYSTEM_GET_NOW_SCOPE_CATCH_ADDRESS:
             if( isCallOn ) Exception::Opcode_Func_System_GetNowScopeCatchAddress();
-            resultType.SetBasicType( DEF_LONG );
+            resultType.SetBasicType( DEF_PTR_VOID );
             break;
         case FUNC_SYSTEM_GET_BP:
             if( isCallOn ) Opcode_Func_System_Get_Bp();
-            resultType.SetBasicType( DEF_LONG );
+            resultType.SetBasicType( DEF_INT64 );
+            break;
+        case FUNC_SYSTEM_GET_SP:
+            if( isCallOn ) Opcode_Func_System_Get_Sp();
+            resultType.SetBasicType( DEF_INT64 );
             break;
 

trunk/abdev/BasicCompiler64/Compile_ProcOp.cpp

@@ -117 +117 @@
         //add rsp,8
         compiler.codeGenerator.op_add_RV(REG_RSP,0x8);
-
-        //ret
-        compiler.codeGenerator.op_ret();
-    }
-    else if( userProc.GetName() == "_System_GetSp" ){
-        //mov rax,rsp
-        compiler.codeGenerator.op_mov_RR(REG_RAX,REG_RSP);
-
-        //add rax,PTR_SIZE
-        compiler.codeGenerator.op_add_RV(REG_RAX,PTR_SIZE);
 
         //ret

trunk/abdev/BasicCompiler64/FunctionValue.h

@@ -18 +18 @@
 #define FUNC_SYSTEM_GET_NOW_SCOPE_CATCH_ADDRESS 0x0623
 #define FUNC_SYSTEM_GET_BP  0x0624
+#define FUNC_SYSTEM_GET_SP  0x0625
 
 //ポインタ

trunk/abdev/BasicCompiler64/MakePeHdr.cpp

@@ -33 +33 @@
     *pSub_System_Call_Destructor_of_GlobalObject,
     *pSub_System_End,
-    *pSub_System_GetSp,
     *pSub_pow,
     *pSub_calloc,
@@ -245 +244 @@
     if(pSub_System_End=GetSubHash("_System_End",1)){
         pSub_System_End->Using();
-    }
-
-    if(pSub_System_GetSp=GetSubHash("_System_GetSp",1)){
-        pSub_System_GetSp->Using();
-        pSub_System_GetSp->ThisIsSystemProc();
     }
 

trunk/abdev/BasicCompiler_Common/include/ver.h

@@ -6 +6 @@
 // バージョン付加文字列
 #ifdef _AMD64_
-#define VER_INFO        "(x64) (rev.367)"
+#define VER_INFO        "(x64) (rev.373)"
 #else
-#define VER_INFO        "(rev.367)"
+#define VER_INFO        "(rev.373)"
 #endif

trunk/abdev/BasicCompiler_Common/src/Exception.cpp

@@ -51 +51 @@
 
     char temporary[1024];
-    lstrcpy( temporary, "_System_pobj_AllThreads->GetCurrentException()->BeginTryScope( _System_GetNowScopeCatchAddresses() As VoidPtr, _System_GetBp() As LONG_PTR, _System_GetSp() As LONG_PTR )" );
+    lstrcpy( temporary, "ExceptionService.BeginTryScope( _System_GetNowScopeCatchAddresses() As VoidPtr, _System_GetBp() As LONG_PTR, _System_GetSp() As LONG_PTR )" );
     MakeMiddleCode( temporary );
     ChangeOpcode( temporary );