X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FException.cmm;h=e6c0c0ff353a219585367e71d8d6dc86469b0336;hb=decf06a77b1331d3af9304e55164bb0a51c15a7f;hp=15b2c64d4fb0be10cf9e1cfef37f946ee0f3c37d;hpb=17f848e12faf8cf51aa58918522b6abe1e75dc51;p=ghc-hetmet.git diff --git a/rts/Exception.cmm b/rts/Exception.cmm index 15b2c64..e6c0c0f 100644 --- a/rts/Exception.cmm +++ b/rts/Exception.cmm @@ -13,6 +13,10 @@ #include "Cmm.h" #include "RaiseAsync.h" +#ifdef __PIC__ +import base_GHCziBase_True_closure; +#endif + /* ----------------------------------------------------------------------------- Exception Primitives @@ -43,21 +47,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); @@ -79,7 +76,7 @@ INFO_TABLE_RET( stg_unblockAsyncExceptionszh_ret, Sp_adj(1); #endif SAVE_THREAD_STATE(); - r = foreign "C" maybePerformBlockedException (MyCapability() "ptr", + (r) = foreign "C" maybePerformBlockedException (MyCapability() "ptr", CurrentTSO "ptr") [R1]; if (r != 0::CInt) { @@ -112,12 +109,8 @@ INFO_TABLE_RET( stg_unblockAsyncExceptionszh_ret, #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; @@ -174,7 +167,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) { @@ -238,7 +231,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", @@ -269,22 +262,16 @@ killThreadzh_fast #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) +INFO_TABLE_RET(stg_catch_frame, CATCH_FRAME, +#if defined(PROFILING) + W_ unused1, W_ unused2, +#endif + W_ unused3, "ptr" W_ unused4) #ifdef REG_R1 { Sp = Sp + SIZEOF_StgCatchFrame; @@ -356,7 +343,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,35 +371,9 @@ raisezh_fast } #endif - if (W_[no_break_on_exception] != 0) { - W_[no_break_on_exception] = 0; - } else { - if (TO_W_(CInt[rts_stop_on_exception]) != 0) { - W_ ioAction; - // we don't want any further exceptions to be caught, - // until GHCi is ready to handle them. This prevents - // deadlock if an exception is raised in InteractiveUI, - // 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; - Sp(3) = exception; // the AP_STACK - Sp(2) = base_GHCziBase_True_closure; // dummy breakpoint info - Sp(1) = base_GHCziBase_True_closure; // True <=> a breakpoint - R1 = ioAction; - jump stg_ap_pppv_info; - } - } - - /* 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 @@ -426,8 +387,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") []; @@ -444,13 +405,42 @@ 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; } } + // After stripping the stack, see whether we should break here for + // GHCi (c.f. the -fbreak-on-exception flag). We do this after + // stripping the stack for a reason: we'll be inspecting values in + // GHCi, and it helps if all the thunks under evaluation have + // already been updated with the exception, rather than being left + // as blackholes. + if (W_[no_break_on_exception] != 0) { + W_[no_break_on_exception] = 0; + } else { + if (TO_W_(CInt[rts_stop_on_exception]) != 0) { + W_ ioAction; + // we don't want any further exceptions to be caught, + // until GHCi is ready to handle them. This prevents + // deadlock if an exception is raised in InteractiveUI, + // 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; + Sp(3) = exception; // the AP_STACK + Sp(2) = base_GHCziBase_True_closure; // dummy breakpoint info + Sp(1) = base_GHCziBase_True_closure; // True <=> a breakpoint + R1 = ioAction; + jump stg_ap_pppv_info; + } + } + if (frame_type == STOP_FRAME) { /* * We've stripped the entire stack, the thread is now dead. @@ -497,7 +487,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;