X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=rts%2FException.cmm;h=6815b791739a5fc1c3c5d1e364cd9ea22d3f68fd;hp=ce2ea274bd4120ebd47b690cc1c4f762bfc05ea7;hb=c004ec62b41aa2137b5b5e298ca562609b0de92e;hpb=db027550441fdce8f7bb59500345c47a21e90f25 diff --git a/rts/Exception.cmm b/rts/Exception.cmm index ce2ea27..6815b79 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,13 +76,12 @@ 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) { if (StgTSO_what_next(CurrentTSO) == ThreadKilled::I16) { - R1 = ThreadFinished; - jump StgReturn; + jump stg_threadFinished; } else { LOAD_THREAD_STATE(); ASSERT(StgTSO_what_next(CurrentTSO) == ThreadRunGHC::I16); @@ -113,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; @@ -175,13 +167,12 @@ 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) { if (StgTSO_what_next(CurrentTSO) == ThreadKilled::I16) { - R1 = ThreadFinished; - jump StgReturn; + jump stg_threadFinished; } else { LOAD_THREAD_STATE(); ASSERT(StgTSO_what_next(CurrentTSO) == ThreadRunGHC::I16); @@ -229,8 +220,7 @@ killThreadzh_fast foreign "C" throwToSingleThreaded(MyCapability() "ptr", target "ptr", exception "ptr")[R1,R2]; if (StgTSO_what_next(CurrentTSO) == ThreadKilled::I16) { - R1 = ThreadFinished; - jump StgReturn; + jump stg_threadFinished; } else { LOAD_THREAD_STATE(); ASSERT(StgTSO_what_next(CurrentTSO) == ThreadRunGHC::I16); @@ -241,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", @@ -272,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; @@ -355,13 +339,26 @@ INFO_TABLE(stg_raise,1,0,THUNK_1_0,"raise","raise") jump raisezh_fast; } +section "data" { + no_break_on_exception: W_[1]; +} + +INFO_TABLE_RET(stg_raise_ret, RET_SMALL, "ptr" W_ arg1) +{ + R1 = Sp(1); + Sp = Sp + WDS(2); + W_[no_break_on_exception] = 1; + jump raisezh_fast; +} + raisezh_fast { W_ handler; - W_ raise_closure; W_ frame_type; + W_ exception; /* args : R1 :: Exception */ + exception = R1; #if defined(PROFILING) /* Debugging tool: on raising an exception, show where we are. */ @@ -370,16 +367,13 @@ raisezh_fast * the info was only displayed for an *uncaught* exception. */ if (RtsFlags_ProfFlags_showCCSOnException(RtsFlags) != 0::I32) { - foreign "C" fprintCCS_stderr(W_[CCCS] "ptr"); + foreign "C" fprintCCS_stderr(W_[CCCS] "ptr") []; } #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", R1 "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 @@ -393,14 +387,14 @@ 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") []; - foreign "C" stmAbortTransaction(MyCapability() "ptr", trec "ptr"); - foreign "C" stmFreeAbortedTRec(MyCapability() "ptr", 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") []; if (outer != NO_TREC) { - foreign "C" stmAbortTransaction(MyCapability() "ptr", outer "ptr"); - foreign "C" stmFreeAbortedTRec(MyCapability() "ptr", outer "ptr"); + foreign "C" stmAbortTransaction(MyCapability() "ptr", outer "ptr") []; + foreign "C" stmFreeAbortedTRec(MyCapability() "ptr", outer "ptr") []; } StgTSO_trec(CurrentTSO) = NO_TREC; @@ -411,13 +405,43 @@ 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(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 + R1 = ioAction; + jump RET_LBL(stg_ap_pppv); + } + } + if (frame_type == STOP_FRAME) { /* * We've stripped the entire stack, the thread is now dead. @@ -426,16 +450,12 @@ retry_pop_stack: */ Sp = CurrentTSO + TSO_OFFSET_StgTSO_stack + WDS(TO_W_(StgTSO_stack_size(CurrentTSO))) - WDS(2); - Sp(1) = R1; /* save the exception */ + Sp(1) = exception; /* save the exception */ Sp(0) = stg_enter_info; /* so that GC can traverse this stack */ StgTSO_what_next(CurrentTSO) = ThreadKilled::I16; SAVE_THREAD_STATE(); /* inline! */ - /* The return code goes in BaseReg->rRet, and BaseReg is returned in R1 */ - StgRegTable_rRet(BaseReg) = ThreadFinished; - R1 = BaseReg; - - jump StgReturn; + jump stg_threadFinished; } /* Ok, Sp points to the enclosing CATCH_FRAME or CATCH_STM_FRAME. Pop everything @@ -468,7 +488,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; @@ -484,7 +504,7 @@ retry_pop_stack: * token as arguments. */ Sp_adj(-1); - Sp(0) = R1; + Sp(0) = exception; R1 = handler; Sp_adj(-1); TICK_UNKNOWN_CALL();