X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FException.cmm;h=793c9ab14940f49cca3bd94ee87def6a282c1c7a;hb=6ca83f41edc4d4db300e129f123fc42eb40a43b0;hp=c2f0dde6752ed815c4432ebf8514ccbb64044501;hpb=fcf6b22d0478be20e27c2245f3e34dd272e12522;p=ghc-hetmet.git diff --git a/rts/Exception.cmm b/rts/Exception.cmm index c2f0dde..793c9ab 100644 --- a/rts/Exception.cmm +++ b/rts/Exception.cmm @@ -13,9 +13,7 @@ #include "Cmm.h" #include "RaiseAsync.h" -#ifdef __PIC__ import ghczmprim_GHCziBool_True_closure; -#endif /* ----------------------------------------------------------------------------- Exception Primitives @@ -75,6 +73,14 @@ INFO_TABLE_RET( stg_unblockAsyncExceptionszh_ret, RET_SMALL ) */ Sp_adj(1); #endif + STK_CHK_GEN( WDS(2), R1_PTR, stg_unblockAsyncExceptionszh_ret_info); + Sp_adj(-2); + Sp(1) = R1; +#ifdef REG_R1 + Sp(0) = stg_gc_unpt_r1_info; +#else + Sp(0) = stg_ut_1_0_unreg_info; +#endif SAVE_THREAD_STATE(); (r) = foreign "C" maybePerformBlockedException (MyCapability() "ptr", CurrentTSO "ptr") [R1]; @@ -194,6 +200,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 { @@ -216,7 +231,7 @@ killThreadzh_fast */ loop: if (StgTSO_what_next(target) == ThreadRelocated::I16) { - target = StgTSO_link(target); + target = StgTSO__link(target); goto loop; } if (target == CurrentTSO) {