X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=ghc%2Frts%2FException.hc;h=aa4783300748c4f8a94af7ff48909157ca20e42a;hb=d89872a45b581ba3f086c636126a44d97ef45be6;hp=56eeb87fa7513446e4402bac1067243b441b4808;hpb=ca2ab438fbdbc163db46592879146df96dd03cd9;p=ghc-hetmet.git diff --git a/ghc/rts/Exception.hc b/ghc/rts/Exception.hc index 56eeb87..aa47833 100644 --- a/ghc/rts/Exception.hc +++ b/ghc/rts/Exception.hc @@ -1,12 +1,13 @@ /* ----------------------------------------------------------------------------- - * $Id: Exception.hc,v 1.6 2000/01/30 10:25:28 simonmar Exp $ + * $Id: Exception.hc,v 1.28 2003/06/19 10:42:26 simonmar Exp $ * - * (c) The GHC Team, 1998-1999 + * (c) The GHC Team, 1998-2000 * * Exception support * * ---------------------------------------------------------------------------*/ +#include "Stg.h" #include "Rts.h" #include "Exception.h" #include "Schedule.h" @@ -17,6 +18,9 @@ #if defined(PAR) # include "FetchMe.h" #endif +#if defined(PROFILING) +# include "Profiling.h" +#endif /* ----------------------------------------------------------------------------- Exception Primitives @@ -47,43 +51,54 @@ FN_(blockAsyncExceptionszh_fast) { FB_ /* Args: R1 :: IO a */ - STK_CHK_GEN( 2/* worst case */, R1_PTR, blockAsyncExceptionszh_fast, ); + STK_CHK_GEN( 2/* worst case */, R1_PTR, blockAsyncExceptionszh_fast); if (CurrentTSO->blocked_exceptions == NULL) { CurrentTSO->blocked_exceptions = END_TSO_QUEUE; /* avoid growing the stack unnecessarily */ - if (Sp[0] == (W_)&blockAsyncExceptionszh_ret_info) { + if (Sp[0] == (W_)&stg_blockAsyncExceptionszh_ret_info) { Sp++; } else { Sp--; - Sp[0] = (W_)&unblockAsyncExceptionszh_ret_info; + Sp[0] = (W_)&stg_unblockAsyncExceptionszh_ret_info; } } Sp--; - Sp[0] = ARG_TAG(0); - JMP_(GET_ENTRY(R1.cl)); + JMP_(stg_ap_v_ret); FE_ } -INFO_TABLE_SRT_BITMAP(unblockAsyncExceptionszh_ret_info, unblockAsyncExceptionszh_ret_entry, 0, 0, 0, 0, RET_SMALL, , EF_, 0, 0); -FN_(unblockAsyncExceptionszh_ret_entry) +INFO_TABLE_RET( \ + stg_unblockAsyncExceptionszh_ret_info, \ + stg_unblockAsyncExceptionszh_ret_entry, \ + MK_SMALL_BITMAP(0/*framesize*/, 0/*bitmap*/), \ + 0, 0, 0, RET_SMALL, , EF_, 0, 0 \ +); + +FN_(stg_unblockAsyncExceptionszh_ret_entry) { FB_ ASSERT(CurrentTSO->blocked_exceptions != NULL); #if defined(GRAN) awakenBlockedQueue(CurrentTSO->blocked_exceptions, - CurrentTSO->block_info.closure); + (StgClosure*)NULL); #elif defined(PAR) - // is CurrentTSO->block_info.closure always set to the node - // holding the blocking queue !? -- HWL + /* we don't need node info (2nd arg) in this case + (note that CurrentTSO->block_info.closure isn't always set) */ awakenBlockedQueue(CurrentTSO->blocked_exceptions, - CurrentTSO->block_info.closure); + (StgClosure*)NULL); #else awakenBlockedQueue(CurrentTSO->blocked_exceptions); #endif CurrentTSO->blocked_exceptions = NULL; +#ifdef REG_R1 Sp++; JMP_(ENTRY_CODE(Sp[0])); +#else + Sp[1] = Sp[0]; + Sp++; + JMP_(ENTRY_CODE(Sp[1])); +#endif FE_ } @@ -91,7 +106,7 @@ FN_(unblockAsyncExceptionszh_fast) { FB_ /* Args: R1 :: IO a */ - STK_CHK_GEN(2, R1_PTR, unblockAsyncExceptionszh_fast, ); + STK_CHK_GEN(2, R1_PTR, unblockAsyncExceptionszh_fast); if (CurrentTSO->blocked_exceptions != NULL) { #if defined(GRAN) @@ -108,31 +123,41 @@ FN_(unblockAsyncExceptionszh_fast) CurrentTSO->blocked_exceptions = NULL; /* avoid growing the stack unnecessarily */ - if (Sp[0] == (W_)&unblockAsyncExceptionszh_ret_info) { + if (Sp[0] == (W_)&stg_unblockAsyncExceptionszh_ret_info) { Sp++; } else { Sp--; - Sp[0] = (W_)&blockAsyncExceptionszh_ret_info; + Sp[0] = (W_)&stg_blockAsyncExceptionszh_ret_info; } } Sp--; - Sp[0] = ARG_TAG(0); - JMP_(GET_ENTRY(R1.cl)); + JMP_(stg_ap_v_ret); FE_ } -INFO_TABLE_SRT_BITMAP(blockAsyncExceptionszh_ret_info, blockAsyncExceptionszh_ret_entry, 0, 0, 0, 0, RET_SMALL, , EF_, 0, 0); -FN_(blockAsyncExceptionszh_ret_entry) +INFO_TABLE_RET( \ + stg_blockAsyncExceptionszh_ret_info, \ + stg_blockAsyncExceptionszh_ret_entry, \ + MK_SMALL_BITMAP(0/*framesize*/, 0/*bitmap*/), \ + 0, 0, 0, RET_SMALL, , EF_, 0, 0 \ +); + +FN_(stg_blockAsyncExceptionszh_ret_entry) { FB_ ASSERT(CurrentTSO->blocked_exceptions == NULL); CurrentTSO->blocked_exceptions = END_TSO_QUEUE; +#ifdef REG_R1 Sp++; JMP_(ENTRY_CODE(Sp[0])); +#else + Sp[1] = Sp[0]; + Sp++; + JMP_(ENTRY_CODE(Sp[1])); +#endif FE_ } - FN_(killThreadzh_fast) { FB_ @@ -141,25 +166,27 @@ FN_(killThreadzh_fast) /* This thread may have been relocated. * (see Schedule.c:threadStackOverflow) */ - while (R1.t->whatNext == ThreadRelocated) { + while (R1.t->what_next == ThreadRelocated) { R1.t = R1.t->link; } /* If the target thread is currently blocking async exceptions, - * we'll have to block until it's ready to accept them. + * we'll have to block until it's ready to accept them. The + * exception is interruptible threads - ie. those that are blocked + * on some resource. */ - if (R1.t->blocked_exceptions != NULL) { - - /* ToDo (SMP): locking if destination thread is currently - * running... - */ - CurrentTSO->link = R1.t->blocked_exceptions; - R1.t->blocked_exceptions = CurrentTSO; - - CurrentTSO->why_blocked = BlockedOnException; - CurrentTSO->block_info.tso = R1.t; + if (R1.t->blocked_exceptions != NULL && !interruptible(R1.t) ) { + + /* ToDo (SMP): locking if destination thread is currently + * running... + */ + CurrentTSO->link = R1.t->blocked_exceptions; + R1.t->blocked_exceptions = CurrentTSO; - BLOCK( R1_PTR | R2_PTR, killThreadzh_fast ); + CurrentTSO->why_blocked = BlockedOnException; + CurrentTSO->block_info.tso = R1.t; + + BLOCK( R1_PTR | R2_PTR, killThreadzh_fast ); } /* Killed threads turn into zombies, which might be garbage @@ -174,56 +201,76 @@ FN_(killThreadzh_fast) */ if (R1.t == CurrentTSO) { SaveThreadState(); /* inline! */ - STGCALL2(raiseAsync, R1.t, R2.cl); - if (CurrentTSO->whatNext == ThreadKilled) { - R1.w = ThreadYielding; + STGCALL2(raiseAsyncWithLock, R1.t, R2.cl); + if (CurrentTSO->what_next == ThreadKilled) { + R1.w = ThreadFinished; JMP_(StgReturn); - } - LoadThreadState(); - if (CurrentTSO->whatNext == ThreadEnterGHC) { - R1.w = Sp[0]; - Sp++; - JMP_(GET_ENTRY(R1.cl)); } else { - barf("killThreadzh_fast"); + LoadThreadState(); + ASSERT(CurrentTSO->what_next == ThreadRunGHC); + JMP_(ENTRY_CODE(Sp[0])); } } else { - STGCALL2(raiseAsync, R1.t, R2.cl); + STGCALL2(raiseAsyncWithLock, R1.t, R2.cl); } JMP_(ENTRY_CODE(Sp[0])); FE_ } + /* ----------------------------------------------------------------------------- Catch frames -------------------------------------------------------------------------- */ +#ifdef REG_R1 #define CATCH_FRAME_ENTRY_TEMPLATE(label,ret) \ FN_(label); \ FN_(label) \ { \ FB_ \ - Su = ((StgCatchFrame *)Sp)->link; \ Sp += sizeofW(StgCatchFrame); \ JMP_(ret); \ FE_ \ } +#else +#define CATCH_FRAME_ENTRY_TEMPLATE(label,ret) \ + FN_(label); \ + FN_(label) \ + { \ + StgWord rval; \ + FB_ \ + rval = Sp[0]; \ + Sp++; \ + Sp += sizeofW(StgCatchFrame) - 1; \ + Sp[0] = rval; \ + JMP_(ret); \ + FE_ \ + } +#endif + +#ifdef REG_R1 +#define SP_OFF 0 +#else +#define SP_OFF 1 +#endif -CATCH_FRAME_ENTRY_TEMPLATE(catch_frame_entry,ENTRY_CODE(Sp[0])); -CATCH_FRAME_ENTRY_TEMPLATE(catch_frame_0_entry,RET_VEC(Sp[0],0)); -CATCH_FRAME_ENTRY_TEMPLATE(catch_frame_1_entry,RET_VEC(Sp[0],1)); -CATCH_FRAME_ENTRY_TEMPLATE(catch_frame_2_entry,RET_VEC(Sp[0],2)); -CATCH_FRAME_ENTRY_TEMPLATE(catch_frame_3_entry,RET_VEC(Sp[0],3)); -CATCH_FRAME_ENTRY_TEMPLATE(catch_frame_4_entry,RET_VEC(Sp[0],4)); -CATCH_FRAME_ENTRY_TEMPLATE(catch_frame_5_entry,RET_VEC(Sp[0],5)); -CATCH_FRAME_ENTRY_TEMPLATE(catch_frame_6_entry,RET_VEC(Sp[0],6)); -CATCH_FRAME_ENTRY_TEMPLATE(catch_frame_7_entry,RET_VEC(Sp[0],7)); - -#ifdef PROFILING +CATCH_FRAME_ENTRY_TEMPLATE(stg_catch_frame_ret,ENTRY_CODE(Sp[SP_OFF])); +CATCH_FRAME_ENTRY_TEMPLATE(stg_catch_frame_0_ret,RET_VEC(Sp[SP_OFF],0)); +CATCH_FRAME_ENTRY_TEMPLATE(stg_catch_frame_1_ret,RET_VEC(Sp[SP_OFF],1)); +CATCH_FRAME_ENTRY_TEMPLATE(stg_catch_frame_2_ret,RET_VEC(Sp[SP_OFF],2)); +CATCH_FRAME_ENTRY_TEMPLATE(stg_catch_frame_3_ret,RET_VEC(Sp[SP_OFF],3)); +CATCH_FRAME_ENTRY_TEMPLATE(stg_catch_frame_4_ret,RET_VEC(Sp[SP_OFF],4)); +CATCH_FRAME_ENTRY_TEMPLATE(stg_catch_frame_5_ret,RET_VEC(Sp[SP_OFF],5)); +CATCH_FRAME_ENTRY_TEMPLATE(stg_catch_frame_6_ret,RET_VEC(Sp[SP_OFF],6)); +CATCH_FRAME_ENTRY_TEMPLATE(stg_catch_frame_7_ret,RET_VEC(Sp[SP_OFF],7)); + +#if defined(PROFILING) #define CATCH_FRAME_BITMAP 7 +#define CATCH_FRAME_WORDS 4 #else -#define CATCH_FRAME_BITMAP 3 +#define CATCH_FRAME_BITMAP 1 +#define CATCH_FRAME_WORDS 2 #endif /* Catch frames are very similar to update frames, but when entering @@ -231,7 +278,9 @@ CATCH_FRAME_ENTRY_TEMPLATE(catch_frame_7_entry,RET_VEC(Sp[0],7)); * kind of return to the activation record underneath us on the stack. */ -VEC_POLY_INFO_TABLE(catch_frame, CATCH_FRAME_BITMAP, NULL/*srt*/, 0/*srt_off*/, 0/*srt_len*/, CATCH_FRAME,, EF_); +VEC_POLY_INFO_TABLE(stg_catch_frame, \ + MK_SMALL_BITMAP(CATCH_FRAME_WORDS, CATCH_FRAME_BITMAP), \ + NULL/*srt*/, 0/*srt_off*/, 0/*srt_bitmap*/, CATCH_FRAME,, EF_); /* ----------------------------------------------------------------------------- * The catch infotable @@ -243,12 +292,12 @@ VEC_POLY_INFO_TABLE(catch_frame, CATCH_FRAME_BITMAP, NULL/*srt*/, 0/*srt_off*/, * It is used in deleteThread when reverting blackholes. * -------------------------------------------------------------------------- */ -INFO_TABLE(catch_info,catch_entry,2,0,FUN,,EF_,0,0); -STGFUN(catch_entry) +INFO_TABLE(stg_catch_info,stg_catch_entry,2,0,FUN,,EF_,0,0); +STGFUN(stg_catch_entry) { FB_ - R2.cl = payloadCPtr(R1.cl,1); /* h */ - R1.cl = payloadCPtr(R1.cl,0); /* x */ + R2.cl = R1.cl->payload[1]; /* h */ + R1.cl = R1.cl->payload[0]; /* x */ JMP_(catchzh_fast); FE_ } @@ -259,24 +308,20 @@ FN_(catchzh_fast) FB_ /* args: R1 = m :: IO a, R2 = handler :: Exception -> IO a */ - STK_CHK_GEN(sizeofW(StgCatchFrame) + 1, R1_PTR | R2_PTR, catchzh_fast, ); + STK_CHK_GEN(sizeofW(StgCatchFrame) + 1, R1_PTR | R2_PTR, catchzh_fast); /* Set up the catch frame */ Sp -= sizeofW(StgCatchFrame); fp = (StgCatchFrame *)Sp; - SET_HDR(fp,(StgInfoTable *)&catch_frame_info,CCCS); + SET_HDR(fp,(StgInfoTable *)&stg_catch_frame_info,CCCS); fp -> handler = R2.cl; fp -> exceptions_blocked = (CurrentTSO->blocked_exceptions != NULL); - fp -> link = Su; - Su = (StgUpdateFrame *)fp; TICK_CATCHF_PUSHED(); - /* Push realworld token and enter R1. */ + +/* Apply R1 to the realworld token */ Sp--; - Sp[0] = ARG_TAG(0); - TICK_ENT_VIA_NODE(); - JMP_(GET_ENTRY(R1.cl)); - + JMP_(stg_ap_v_ret); FE_ } @@ -290,8 +335,8 @@ FN_(catchzh_fast) * It is used in raisezh_fast to update thunks on the update list * -------------------------------------------------------------------------- */ -INFO_TABLE(raise_info,raise_entry,1,0,FUN,,EF_,0,0); -STGFUN(raise_entry) +INFO_TABLE(stg_raise_info,stg_raise_entry,1,0,THUNK,,EF_,0,0); +STGFUN(stg_raise_entry) { FB_ R1.cl = R1.cl->payload[0]; @@ -302,68 +347,86 @@ STGFUN(raise_entry) FN_(raisezh_fast) { StgClosure *handler; - StgUpdateFrame *p; + StgPtr p; StgClosure *raise_closure; FB_ - /* args : R1 = error */ + /* args : R1.p :: Exception */ #if defined(PROFILING) - /* Debugging tool: on raising an exception, show where we are. */ /* ToDo: currently this is a hack. Would be much better if * the info was only displayed for an *uncaught* exception. */ if (RtsFlags.ProfFlags.showCCSOnException) { - STGCALL2(print_ccs,stderr,CCCS); + STGCALL2(fprintCCS,stderr,CCCS); } - #endif - p = Su; - /* This closure represents the expression 'raise# E' where E * is the exception raise. It is used to overwrite all the * thunks which are currently under evaluataion. */ + /* + // @LDV profiling + // stg_raise_info has THUNK as its closure type. Since a THUNK takes at least + // MIN_UPD_SIZE words in its payload, MIN_UPD_SIZE is more approprate than 1. + // It seems that 1 does not cause any problem unless profiling is performed. + // However, when LDV profiling goes on, we need to linearly scan small object pool, + // where raise_closure is stored, so we should use MIN_UPD_SIZE. raise_closure = (StgClosure *)RET_STGCALL1(P_,allocate, sizeofW(StgClosure)+1); - raise_closure->header.info = &raise_info; + */ + raise_closure = (StgClosure *)RET_STGCALL1(P_,allocate, + sizeofW(StgClosure)+MIN_UPD_SIZE); + SET_HDR(raise_closure, &stg_raise_info, CCCS); raise_closure->payload[0] = R1.cl; - while (1) { - - switch (get_itbl(p)->type) { - - case UPDATE_FRAME: - UPD_IND(p->updatee,raise_closure); - p = p->link; - continue; - - case SEQ_FRAME: - p = ((StgSeqFrame *)p)->link; - continue; - - case CATCH_FRAME: - /* found it! */ - break; - - case STOP_FRAME: - barf("raisezh_fast: STOP_FRAME"); - - default: - barf("raisezh_fast: weird activation record"); - } + // Walk up the stack, looking for the catch frame. On the way, + // we update any closures pointed to from update frames with the + // raise closure that we just built. + { + StgPtr next; + StgRetInfoTable *info; + + p = Sp; + while(1) { + + info = get_ret_itbl((StgClosure *)p); + next = p + stack_frame_sizeW((StgClosure *)p); + switch (info->i.type) { + + case UPDATE_FRAME: + UPD_IND(((StgUpdateFrame *)p)->updatee,raise_closure); + p = next; + continue; + + case CATCH_FRAME: + /* found it! */ + break; + + case STOP_FRAME: + /* We've stripped the entire stack, the thread is now dead. */ + Sp = CurrentTSO->stack + CurrentTSO->stack_size - 1; + Sp[0] = R1.w; /* save the exception */ + CurrentTSO->what_next = ThreadKilled; + SaveThreadState(); /* inline! */ + R1.w = ThreadFinished; + JMP_(StgReturn); + + default: + p = next; + continue; + } - break; - + break; + } } /* Ok, p points to the enclosing CATCH_FRAME. Pop everything down to * and including this frame, update Su, push R1, and enter the handler. */ - Su = ((StgCatchFrame *)p)->link; handler = ((StgCatchFrame *)p)->handler; Sp = (P_)p + sizeofW(StgCatchFrame); @@ -376,7 +439,7 @@ FN_(raisezh_fast) * unblockAsyncExceptions_ret stack frame. */ if (! ((StgCatchFrame *)p)->exceptions_blocked) { - *(--Sp) = (W_)&unblockAsyncExceptionszh_ret_info; + *(--Sp) = (W_)&stg_unblockAsyncExceptionszh_ret_info; } /* Ensure that async excpetions are blocked when running the handler. @@ -385,15 +448,22 @@ FN_(raisezh_fast) CurrentTSO->blocked_exceptions = END_TSO_QUEUE; } - /* Enter the handler, passing the exception value and a realworld + /* Call the handler, passing the exception value and a realworld * token as arguments. */ Sp -= 2; + Sp[1] = (W_)&stg_ap_v_info; Sp[0] = R1.w; - Sp[1] = ARG_TAG(0); - TICK_ENT_VIA_NODE(); R1.cl = handler; - JMP_(GET_ENTRY(R1.cl)); - + Sp--; + JMP_(stg_ap_p_ret); FE_ } + +FN_(raiseIOzh_fast) +{ + FB_ + /* Args :: R1.p :: Exception */ + JMP_(raisezh_fast); + FE_ +} \ No newline at end of file