X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FException.hc;h=31a1ae2c2ae7c57a57f60ecbfbb270608763d90c;hb=92b67d724a648d1a2ddb371c8ecd3333b0a2ba18;hp=56eeb87fa7513446e4402bac1067243b441b4808;hpb=ca2ab438fbdbc163db46592879146df96dd03cd9;p=ghc-hetmet.git diff --git a/ghc/rts/Exception.hc b/ghc/rts/Exception.hc index 56eeb87..31a1ae2 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.20 2001/03/23 16:36:21 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 @@ -52,11 +56,11 @@ FN_(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--; @@ -65,25 +69,31 @@ FN_(blockAsyncExceptionszh_fast) 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_SRT_BITMAP(stg_unblockAsyncExceptionszh_ret_info, stg_unblockAsyncExceptionszh_ret_entry, 0, 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_ } @@ -108,11 +118,11 @@ 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--; @@ -121,18 +131,23 @@ FN_(unblockAsyncExceptionszh_fast) 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_SRT_BITMAP(stg_blockAsyncExceptionszh_ret_info, stg_blockAsyncExceptionszh_ret_entry, 0, 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 +156,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 @@ -175,12 +192,12 @@ FN_(killThreadzh_fast) if (R1.t == CurrentTSO) { SaveThreadState(); /* inline! */ STGCALL2(raiseAsync, R1.t, R2.cl); - if (CurrentTSO->whatNext == ThreadKilled) { - R1.w = ThreadYielding; + if (CurrentTSO->what_next == ThreadKilled) { + R1.w = ThreadFinished; JMP_(StgReturn); } LoadThreadState(); - if (CurrentTSO->whatNext == ThreadEnterGHC) { + if (CurrentTSO->what_next == ThreadEnterGHC) { R1.w = Sp[0]; Sp++; JMP_(GET_ENTRY(R1.cl)); @@ -199,6 +216,7 @@ FN_(killThreadzh_fast) Catch frames -------------------------------------------------------------------------- */ +#ifdef REG_R1 #define CATCH_FRAME_ENTRY_TEMPLATE(label,ret) \ FN_(label); \ FN_(label) \ @@ -209,16 +227,38 @@ FN_(killThreadzh_fast) JMP_(ret); \ FE_ \ } +#else +#define CATCH_FRAME_ENTRY_TEMPLATE(label,ret) \ + FN_(label); \ + FN_(label) \ + { \ + StgWord rval; \ + FB_ \ + rval = Sp[0]; \ + Sp++; \ + Su = ((StgCatchFrame *)Sp)->link; \ + 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)); +CATCH_FRAME_ENTRY_TEMPLATE(stg_catch_frame_entry,ENTRY_CODE(Sp[SP_OFF])); +CATCH_FRAME_ENTRY_TEMPLATE(stg_catch_frame_0_entry,RET_VEC(Sp[SP_OFF],0)); +CATCH_FRAME_ENTRY_TEMPLATE(stg_catch_frame_1_entry,RET_VEC(Sp[SP_OFF],1)); +CATCH_FRAME_ENTRY_TEMPLATE(stg_catch_frame_2_entry,RET_VEC(Sp[SP_OFF],2)); +CATCH_FRAME_ENTRY_TEMPLATE(stg_catch_frame_3_entry,RET_VEC(Sp[SP_OFF],3)); +CATCH_FRAME_ENTRY_TEMPLATE(stg_catch_frame_4_entry,RET_VEC(Sp[SP_OFF],4)); +CATCH_FRAME_ENTRY_TEMPLATE(stg_catch_frame_5_entry,RET_VEC(Sp[SP_OFF],5)); +CATCH_FRAME_ENTRY_TEMPLATE(stg_catch_frame_6_entry,RET_VEC(Sp[SP_OFF],6)); +CATCH_FRAME_ENTRY_TEMPLATE(stg_catch_frame_7_entry,RET_VEC(Sp[SP_OFF],7)); #ifdef PROFILING #define CATCH_FRAME_BITMAP 7 @@ -231,7 +271,7 @@ 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, CATCH_FRAME_BITMAP, NULL/*srt*/, 0/*srt_off*/, 0/*srt_len*/, CATCH_FRAME,, EF_); /* ----------------------------------------------------------------------------- * The catch infotable @@ -243,12 +283,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_ } @@ -264,7 +304,7 @@ FN_(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; @@ -290,8 +330,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]; @@ -305,7 +345,7 @@ FN_(raisezh_fast) StgUpdateFrame *p; StgClosure *raise_closure; FB_ - /* args : R1 = error */ + /* args : R1 = exception */ #if defined(PROFILING) @@ -329,7 +369,7 @@ FN_(raisezh_fast) */ raise_closure = (StgClosure *)RET_STGCALL1(P_,allocate, sizeofW(StgClosure)+1); - raise_closure->header.info = &raise_info; + raise_closure->header.info = &stg_raise_info; raise_closure->payload[0] = R1.cl; while (1) { @@ -350,8 +390,15 @@ FN_(raisezh_fast) break; case STOP_FRAME: - barf("raisezh_fast: 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 */ + Su = (StgUpdateFrame *)(Sp+1); + CurrentTSO->what_next = ThreadKilled; + SaveThreadState(); /* inline! */ + R1.w = ThreadFinished; + JMP_(StgReturn); + default: barf("raisezh_fast: weird activation record"); } @@ -376,7 +423,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.