X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FException.cmm;h=479c9c9427e59281a3e1943f86f60fb3da36c818;hb=27de38efce6d73d2a0209f803cfa98c82773e773;hp=ec5673804010406340afe0f078e1fb2f68f215e1;hpb=a87c4b292cc7e412aefcdb66e72c97b5a2c9f1d6;p=ghc-hetmet.git diff --git a/rts/Exception.cmm b/rts/Exception.cmm index ec56738..479c9c9 100644 --- a/rts/Exception.cmm +++ b/rts/Exception.cmm @@ -13,6 +13,8 @@ #include "Cmm.h" #include "RaiseAsync.h" +import ghczmprim_GHCziBool_True_closure; + /* ----------------------------------------------------------------------------- Exception Primitives @@ -43,21 +45,14 @@ unsafePerformIO thunk will be updated with a stack object containing the unblockAsyncExceptions_ret frame. Later, when someone else evaluates this thunk, the blocked exception state is - not restored, and the result is that unblockAsyncExceptions_ret - will attempt to unblock exceptions in the current thread, but it'll - find that the CurrentTSO->blocked_exceptions is NULL. Hence, we - work around this by checking for NULL in awakenBlockedQueue(). + not restored. -------------------------------------------------------------------------- */ -INFO_TABLE_RET( stg_unblockAsyncExceptionszh_ret, - 0/*framesize*/, 0/*bitmap*/, RET_SMALL ) +INFO_TABLE_RET( stg_unblockAsyncExceptionszh_ret, RET_SMALL ) { CInt r; - // Not true: see comments above - // ASSERT(StgTSO_blocked_exceptions(CurrentTSO) != NULL); - StgTSO_flags(CurrentTSO) = StgTSO_flags(CurrentTSO) & ~(TSO_BLOCKEX::I32|TSO_INTERRUPTIBLE::I32); @@ -69,17 +64,12 @@ INFO_TABLE_RET( stg_unblockAsyncExceptionszh_ret, * thread, which might result in the thread being killed. */ -#ifndef REG_R1 - /* - * raiseAsync assumes that the stack is in ThreadRunGHC state, - * i.e. with a return address on the top. In unreg mode, the - * return value for IO is on top of the return address, so we - * need to make a small adjustment here. - */ - Sp_adj(1); -#endif + STK_CHK_GEN( WDS(2), R1_PTR, stg_unblockAsyncExceptionszh_ret_info); + Sp_adj(-2); + Sp(1) = R1; + Sp(0) = stg_gc_unpt_r1_info; SAVE_THREAD_STATE(); - r = foreign "C" maybePerformBlockedException (MyCapability() "ptr", + (r) = foreign "C" maybePerformBlockedException (MyCapability() "ptr", CurrentTSO "ptr") [R1]; if (r != 0::CInt) { @@ -91,44 +81,19 @@ INFO_TABLE_RET( stg_unblockAsyncExceptionszh_ret, jump %ENTRY_CODE(Sp(0)); } } -#ifndef REG_R1 - /* - * Readjust stack in unregisterised mode if we didn't raise an - * exception, see above - */ - else { - Sp_adj(-1); - } -#endif } -#ifdef REG_R1 Sp_adj(1); jump %ENTRY_CODE(Sp(0)); -#else - Sp(1) = Sp(0); - Sp_adj(1); - jump %ENTRY_CODE(Sp(1)); -#endif } -INFO_TABLE_RET( stg_blockAsyncExceptionszh_ret, - 0/*framesize*/, 0/*bitmap*/, RET_SMALL ) +INFO_TABLE_RET( stg_blockAsyncExceptionszh_ret, RET_SMALL ) { - // Not true: see comments above - // ASSERT(StgTSO_blocked_exceptions(CurrentTSO) == NULL); - StgTSO_flags(CurrentTSO) = StgTSO_flags(CurrentTSO) | TSO_BLOCKEX::I32 | TSO_INTERRUPTIBLE::I32; -#ifdef REG_R1 Sp_adj(1); jump %ENTRY_CODE(Sp(0)); -#else - Sp(1) = Sp(0); - Sp_adj(1); - jump %ENTRY_CODE(Sp(1)); -#endif } blockAsyncExceptionszh_fast @@ -174,7 +139,7 @@ unblockAsyncExceptionszh_fast * thread, which might result in the thread being killed. */ SAVE_THREAD_STATE(); - r = foreign "C" maybePerformBlockedException (MyCapability() "ptr", + (r) = foreign "C" maybePerformBlockedException (MyCapability() "ptr", CurrentTSO "ptr") [R1]; if (r != 0::CInt) { @@ -201,6 +166,15 @@ unblockAsyncExceptionszh_fast jump stg_ap_v_fast; } +asyncExceptionsBlockedzh_fast +{ + /* args: none */ + if ((TO_W_(StgTSO_flags(CurrentTSO)) & TSO_BLOCKEX) != 0) { + RET_N(1); + } else { + RET_N(0); + } +} killThreadzh_fast { @@ -221,6 +195,11 @@ killThreadzh_fast * If the exception went to a catch frame, we'll just continue from * the handler. */ + loop: + if (StgTSO_what_next(target) == ThreadRelocated::I16) { + target = StgTSO__link(target); + goto loop; + } if (target == CurrentTSO) { SAVE_THREAD_STATE(); /* ToDo: what if the current thread is blocking exceptions? */ @@ -238,7 +217,7 @@ killThreadzh_fast W_ retcode; out = BaseReg + OFFSET_StgRegTable_rmp_tmp_w; - retcode = foreign "C" throwTo(MyCapability() "ptr", + (retcode) = foreign "C" throwTo(MyCapability() "ptr", CurrentTSO "ptr", target "ptr", exception "ptr", @@ -263,42 +242,22 @@ killThreadzh_fast Catch frames -------------------------------------------------------------------------- */ -#ifdef REG_R1 #define SP_OFF 0 -#else -#define SP_OFF 1 -#endif - -#if defined(PROFILING) -#define CATCH_FRAME_BITMAP 7 -#define CATCH_FRAME_WORDS 4 -#else -#define CATCH_FRAME_BITMAP 1 -#define CATCH_FRAME_WORDS 2 -#endif /* Catch frames are very similar to update frames, but when entering * one we just pop the frame off the stack and perform the correct * kind of return to the activation record underneath us on the stack. */ -INFO_TABLE_RET(stg_catch_frame, - CATCH_FRAME_WORDS, CATCH_FRAME_BITMAP, - CATCH_FRAME) -#ifdef REG_R1 - { - Sp = Sp + SIZEOF_StgCatchFrame; - jump %ENTRY_CODE(Sp(SP_OFF)); - } -#else +INFO_TABLE_RET(stg_catch_frame, CATCH_FRAME, +#if defined(PROFILING) + W_ unused1, W_ unused2, +#endif + W_ unused3, "ptr" W_ unused4) { - W_ rval; - rval = Sp(0); Sp = Sp + SIZEOF_StgCatchFrame; - Sp(0) = rval; jump %ENTRY_CODE(Sp(SP_OFF)); } -#endif /* ----------------------------------------------------------------------------- * The catch infotable @@ -356,7 +315,7 @@ section "data" { no_break_on_exception: W_[1]; } -INFO_TABLE_RET(stg_raise_ret, 1, 0, RET_SMALL) +INFO_TABLE_RET(stg_raise_ret, RET_SMALL, "ptr" W_ arg1) { R1 = Sp(1); Sp = Sp + WDS(2); @@ -384,12 +343,9 @@ raisezh_fast } #endif - /* Inform the Hpc that an exception has been thrown */ - foreign "C" hs_hpc_raise_event(CurrentTSO "ptr") []; - retry_pop_stack: StgTSO_sp(CurrentTSO) = Sp; - frame_type = foreign "C" raiseExceptionHelper(BaseReg "ptr", CurrentTSO "ptr", exception "ptr") []; + (frame_type) = foreign "C" raiseExceptionHelper(BaseReg "ptr", CurrentTSO "ptr", exception "ptr") []; Sp = StgTSO_sp(CurrentTSO); if (frame_type == ATOMICALLY_FRAME) { /* The exception has reached the edge of a memory transaction. Check that @@ -403,8 +359,8 @@ retry_pop_stack: W_ trec, outer; W_ r; trec = StgTSO_trec(CurrentTSO); - r = foreign "C" stmValidateNestOfTransactions(trec "ptr") []; - "ptr" outer = foreign "C" stmGetEnclosingTRec(trec "ptr") []; + (r) = foreign "C" stmValidateNestOfTransactions(trec "ptr") []; + ("ptr" outer) = foreign "C" stmGetEnclosingTRec(trec "ptr") []; foreign "C" stmAbortTransaction(MyCapability() "ptr", trec "ptr") []; foreign "C" stmFreeAbortedTRec(MyCapability() "ptr", trec "ptr") []; @@ -421,7 +377,7 @@ retry_pop_stack: } else { // Transaction was not valid: we retry the exception (otherwise continue // with a further call to raiseExceptionHelper) - "ptr" trec = foreign "C" stmStartTransaction(MyCapability() "ptr", NO_TREC "ptr") []; + ("ptr" trec) = foreign "C" stmStartTransaction(MyCapability() "ptr", NO_TREC "ptr") []; StgTSO_trec(CurrentTSO) = trec; R1 = StgAtomicallyFrame_code(Sp); jump stg_ap_v_fast; @@ -445,15 +401,16 @@ retry_pop_stack: // for exmplae. Perhaps the stop_on_exception flag should // be per-thread. W_[rts_stop_on_exception] = 0; - "ptr" ioAction = foreign "C" deRefStablePtr (W_[rts_breakpoint_io_action] "ptr") []; - Sp = Sp - WDS(6); - Sp(5) = exception; - Sp(4) = stg_raise_ret_info; + ("ptr" ioAction) = foreign "C" deRefStablePtr (W_[rts_breakpoint_io_action] "ptr") []; + Sp = Sp - WDS(7); + Sp(6) = exception; + Sp(5) = stg_raise_ret_info; + Sp(4) = stg_noforceIO_info; // required for unregisterised Sp(3) = exception; // the AP_STACK - Sp(2) = base_GHCziBase_True_closure; // dummy breakpoint info - Sp(1) = base_GHCziBase_True_closure; // True <=> a breakpoint + Sp(2) = ghczmprim_GHCziBool_True_closure; // dummy breakpoint info + Sp(1) = ghczmprim_GHCziBool_True_closure; // True <=> a breakpoint R1 = ioAction; - jump stg_ap_pppv_info; + jump RET_LBL(stg_ap_pppv); } } @@ -503,7 +460,7 @@ retry_pop_stack: } else { W_ trec, outer; trec = StgTSO_trec(CurrentTSO); - "ptr" outer = foreign "C" stmGetEnclosingTRec(trec "ptr") []; + ("ptr" outer) = foreign "C" stmGetEnclosingTRec(trec "ptr") []; foreign "C" stmAbortTransaction(MyCapability() "ptr", trec "ptr") []; foreign "C" stmFreeAbortedTRec(MyCapability() "ptr", trec "ptr") []; StgTSO_trec(CurrentTSO) = outer;