X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FUpdates.hc;h=1a9c56c79812034dd4b6388a4cd4c67bade3cec7;hb=efcd3f2b7aabe23e30ab482db1ed2eee5075e095;hp=6f01fc896aff9dbca3cc05dfaf9a071661ac62c7;hpb=bfb850f909c2e25ab34a5770b4a1ab119f2eeae5;p=ghc-hetmet.git diff --git a/ghc/rts/Updates.hc b/ghc/rts/Updates.hc index 6f01fc8..1a9c56c 100644 --- a/ghc/rts/Updates.hc +++ b/ghc/rts/Updates.hc @@ -1,5 +1,5 @@ /* ----------------------------------------------------------------------------- - * $Id: Updates.hc,v 1.22 1999/11/12 10:18:59 simonmar Exp $ + * $Id: Updates.hc,v 1.27 2000/04/19 10:52:36 simonmar Exp $ * * (c) The GHC Team, 1998-1999 * @@ -12,7 +12,9 @@ #include "RtsFlags.h" #include "HeapStackCheck.h" #include "Storage.h" -#include "ProfRts.h" +#if defined(GRAN) || defined(PAR) +# include "FetchMe.h" +#endif /* The update frame return address must be *polymorphic*, that means @@ -140,7 +142,7 @@ VEC_POLY_INFO_TABLE(Upd_frame,UPD_FRAME_BITMAP, NULL/*srt*/, 0/*srt_off*/, 0/*sr really an optimisation? --SDM) -------------------------------------------------------------------------- */ -INFO_TABLE(PAP_info,PAP_entry,/*special layout*/0,0,PAP,,EF_,0,0); +INFO_TABLE(PAP_info,PAP_entry,/*special layout*/0,0,PAP,,EF_,"PAP","PAP"); STGFUN(PAP_entry) { nat Words; @@ -245,11 +247,6 @@ EXTFUN(stg_update_PAP) */ Fun = R1.cl; -#if defined(GRAN_COUNT) -#error Fixme. - ++nPAPs; -#endif - /* Just copy the whole block of stack between the stack pointer * and the update frame pointer. */ @@ -416,7 +413,7 @@ EXTFUN(stg_update_PAP) -------------------------------------------------------------------------- */ -INFO_TABLE(AP_UPD_info,AP_UPD_entry,/*special layout*/0,0,AP_UPD,,EF_,0,0); +INFO_TABLE(AP_UPD_info,AP_UPD_entry,/*special layout*/0,0,AP_UPD,,EF_,"AP_UPD","AP_UPD"); STGFUN(AP_UPD_entry) { nat Words; @@ -515,168 +512,3 @@ STGFUN(seq_entry) JMP_(ENTRY_CODE(*R1.p)); FE_ } - - -/* ----------------------------------------------------------------------------- - Exception Primitives - -------------------------------------------------------------------------- */ - -FN_(catchzh_fast); -FN_(raisezh_fast); - -#define CATCH_FRAME_ENTRY_TEMPLATE(label,ret) \ - FN_(label); \ - FN_(label) \ - { \ - FB_ \ - Su = ((StgCatchFrame *)Sp)->link; \ - Sp += sizeofW(StgCatchFrame); \ - JMP_(ret); \ - FE_ \ - } - -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 -#define CATCH_FRAME_BITMAP 3 -#else -#define CATCH_FRAME_BITMAP 1 -#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. - */ - -VEC_POLY_INFO_TABLE(catch_frame, CATCH_FRAME_BITMAP, NULL/*srt*/, 0/*srt_off*/, 0/*srt_len*/, CATCH_FRAME,, EF_); - -/* ----------------------------------------------------------------------------- - * The catch infotable - * - * This should be exactly the same as would be generated by this STG code - * - * catch = {x,h} \n {} -> catch#{x,h} - * - * It is used in deleteThread when reverting blackholes. - * -------------------------------------------------------------------------- */ - -INFO_TABLE(catch_info,catch_entry,2,0,FUN,,EF_,0,0); -STGFUN(catch_entry) -{ - FB_ - R2.cl = payloadCPtr(R1.cl,1); /* h */ - R1.cl = payloadCPtr(R1.cl,0); /* x */ - JMP_(catchzh_fast); - FE_ -} - -FN_(catchzh_fast) -{ - StgCatchFrame *fp; - FB_ - - /* args: R1 = m, R2 = k */ - STK_CHK_GEN(sizeofW(StgCatchFrame), R1_PTR | R2_PTR, catchzh_fast, ); - Sp -= sizeofW(StgCatchFrame); - fp = (StgCatchFrame *)Sp; - SET_HDR(fp,(StgInfoTable *)&catch_frame_info,CCCS); - fp -> handler = R2.cl; - fp -> link = Su; - Su = (StgUpdateFrame *)fp; - TICK_CATCHF_PUSHED(); - TICK_ENT_VIA_NODE(); - JMP_(ENTRY_CODE(*R1.p)); - - FE_ -} - -/* ----------------------------------------------------------------------------- - * The raise infotable - * - * This should be exactly the same as would be generated by this STG code - * - * raise = {err} \n {} -> raise#{err} - * - * 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) -{ - FB_ - R1.cl = R1.cl->payload[0]; - JMP_(raisezh_fast); - FE_ -} - -FN_(raisezh_fast) -{ - StgClosure *handler; - StgUpdateFrame *p; - StgClosure *raise_closure; - FB_ - /* args : R1 = error */ - - 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. - */ - raise_closure = (StgClosure *)RET_STGCALL1(P_,allocate, - sizeofW(StgClosure)+1); - raise_closure->header.info = &raise_info; - 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"); - } - - 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) - 1; - *Sp = R1.w; - - TICK_ENT_VIA_NODE(); - R1.cl = handler; - JMP_(ENTRY_CODE(handler->header.info)); - - FE_ -} -