X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FUpdates.hc;h=38e69e826de602a9e247a42363364473f5d831f7;hb=3ddfdc19e74af725239b7dfdec776d1d07847fc2;hp=d3b5ba60bc61b9b8f9de2577bf2aa9fc58de8c0f;hpb=7f309f1c021e7583f724cce599ce2dd3c439361b;p=ghc-hetmet.git diff --git a/ghc/rts/Updates.hc b/ghc/rts/Updates.hc index d3b5ba6..38e69e8 100644 --- a/ghc/rts/Updates.hc +++ b/ghc/rts/Updates.hc @@ -1,5 +1,5 @@ /* ----------------------------------------------------------------------------- - * $Id: Updates.hc,v 1.9 1999/02/05 16:03:03 simonm Exp $ + * $Id: Updates.hc,v 1.25 2000/01/13 14:34:05 hwloidl Exp $ * * (c) The GHC Team, 1998-1999 * @@ -9,8 +9,13 @@ #include "Rts.h" #include "RtsUtils.h" +#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 @@ -44,19 +49,48 @@ update code. */ +#if defined(REG_Su) +#define UPD_FRAME_ENTRY_TEMPLATE(label,ret) \ + STGFUN(label); \ + STGFUN(label) \ + { \ + FB_ \ + \ + Su = (StgUpdateFrame *)((StgUpdateFrame *)Sp)->updatee; \ + \ + /* Tick - it must be a con, all the paps are handled \ + * in stg_upd_PAP and PAP_entry below \ + */ \ + TICK_UPD_CON_IN_NEW(sizeW_fromITBL(get_itbl(Su))); \ + \ + UPD_IND(Su,R1.p); \ + \ + /* reset Su to the next update frame */ \ + Su = ((StgUpdateFrame *)Sp)->link; \ + \ + /* remove the update frame from the stack */ \ + Sp += sizeofW(StgUpdateFrame); \ + \ + JMP_(ret); \ + FE_ \ + } +#else + #define UPD_FRAME_ENTRY_TEMPLATE(label,ret) \ STGFUN(label); \ STGFUN(label) \ { \ StgClosure *updatee; \ FB_ \ - /* tick - ToDo: check this is right */ \ - TICK_UPD_EXISTING(); \ \ updatee = ((StgUpdateFrame *)Sp)->updatee; \ - \ - /* update the updatee with an indirection to the return value */\ - UPD_IND(updatee,R1.p); \ + \ + /* Tick - it must be a con, all the paps are handled \ + * in stg_upd_PAP and PAP_entry below \ + */ \ + TICK_UPD_CON_IN_NEW(sizeW_fromITBL(get_itbl(updatee))); \ + \ + UPD_IND(updatee, R1.cl); \ \ /* reset Su to the next update frame */ \ Su = ((StgUpdateFrame *)Sp)->link; \ @@ -67,6 +101,7 @@ JMP_(ret); \ FE_ \ } +#endif UPD_FRAME_ENTRY_TEMPLATE(Upd_frame_entry,ENTRY_CODE(Sp[0])); UPD_FRAME_ENTRY_TEMPLATE(Upd_frame_0_entry,RET_VEC(Sp[0],0)); @@ -94,7 +129,7 @@ UPD_FRAME_ENTRY_TEMPLATE(Upd_frame_7_entry,RET_VEC(Sp[0],7)); * there's a cost-centre-stack in there too). */ -VEC_POLY_INFO_TABLE(Upd_frame,UPD_FRAME_BITMAP, NULL/*srt*/, 0/*srt_off*/, 0/*srt_len*/, UPDATE_FRAME); +VEC_POLY_INFO_TABLE(Upd_frame,UPD_FRAME_BITMAP, NULL/*srt*/, 0/*srt_off*/, 0/*srt_len*/, UPDATE_FRAME,, EF_); /* ----------------------------------------------------------------------------- Entry Code for a PAP. @@ -108,13 +143,10 @@ 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,const,EF_,0,0); +INFO_TABLE(PAP_info,PAP_entry,/*special layout*/0,0,PAP,,EF_,0,0); STGFUN(PAP_entry) { nat Words; -#ifdef PROFILING - CostCentreStack *CCS_pap; -#endif P_ p; nat i; StgPAP *pap; @@ -142,10 +174,7 @@ STGFUN(PAP_entry) * CAF/DICT. */ - CCS_pap = pap->header.prof.ccs; - CCCS = (IS_CAF_OR_DICT_OR_SUB_CCS(CCS_pap)) - ? Su->header.prof.ccs - : CCS_pap; + CCCS = Su->header.prof.ccs; #endif /* PROFILING */ Su = Su->link; @@ -215,32 +244,20 @@ EXTFUN(stg_update_PAP) FB_ /* Save the pointer to the function closure that just failed the - argument satisfaction check - */ + * argument satisfaction check + */ 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 for now. This might include some - * tagging, which the garbage collector will have to pay attention - * to, but it's much easier than sorting the words into pointers - * and non-pointers. + * and the update frame pointer. */ - Words = (P_)Su - (P_)Sp; ASSERT((int)Words >= 0); #if defined(PROFILING) - /* set "CC_pap" to go in the updatee (see Sansom thesis, p 183) */ - - CCS_pap = (CostCentreStack *) Fun->header.prof.ccs; - if (IS_CAF_OR_DICT_OR_SUB_CCS(CCS_pap)) { - CCS_pap = CCCS; - } + /* pretend we just entered the function closure */ + ENTER_CCS_FCL(Fun); + CCS_pap = CCCS; #endif if (Words == 0) { @@ -334,32 +351,31 @@ EXTFUN(stg_update_PAP) */ Updatee = Su->updatee; - UPD_IND(Updatee,PapClosure); - + +#if defined(PROFILING) if (Words != 0) { + UPD_IND(Updatee,PapClosure); TICK_UPD_PAP_IN_NEW(Words+1); - } else { - TICK_UPD_PAP_IN_PLACE(); - -#if defined(PROFILING) - /* - * Lexical scoping requires a *permanent* indirection, and we + /* Lexical scoping requires a *permanent* indirection, and we * also have to set the cost centre for the indirection. */ - SET_INFO(Updatee, &IND_PERM_info); + UPD_PERM_IND(Updatee,PapClosure); + TICK_UPD_PAP_IN_PLACE(); Updatee->header.prof.ccs = CCS_pap; -#endif /* PROFILING */ } - +#else + UPD_IND(Updatee,PapClosure); + if (Words != 0) { + TICK_UPD_PAP_IN_NEW(Words+1); + } else { + TICK_UPD_PAP_IN_PLACE(); + } +#endif + #if defined(PROFILING) - /* - * Restore the Cost Centre too (if required); again see Sansom - * thesis p 183. Take the CC out of the update frame if a CAF/DICT. - */ - CCCS = IS_CAF_OR_DICT_OR_SUB_CCS(CCS_pap) - ? Su->header.prof.ccs - : CCS_pap; + CCCS = Su->header.prof.ccs; + ENTER_CCS_PAP(CCS_pap); #endif /* PROFILING */ /* Restore Su */ @@ -384,7 +400,7 @@ EXTFUN(stg_update_PAP) */ JMP_(GET_ENTRY(R1.cl)); FE_ -} +} /* ----------------------------------------------------------------------------- @@ -398,7 +414,7 @@ EXTFUN(stg_update_PAP) -------------------------------------------------------------------------- */ -INFO_TABLE(AP_UPD_info,AP_UPD_entry,/*special layout*/0,0,AP_UPD,const,EF_,0,0); +INFO_TABLE(AP_UPD_info,AP_UPD_entry,/*special layout*/0,0,AP_UPD,,EF_,0,0); STGFUN(AP_UPD_entry) { nat Words; @@ -473,7 +489,7 @@ SEQ_FRAME_ENTRY_TEMPLATE(seq_frame_5_entry,ENTRY_CODE(Sp[0])); SEQ_FRAME_ENTRY_TEMPLATE(seq_frame_6_entry,ENTRY_CODE(Sp[0])); SEQ_FRAME_ENTRY_TEMPLATE(seq_frame_7_entry,ENTRY_CODE(Sp[0])); -VEC_POLY_INFO_TABLE(seq_frame,1, NULL/*srt*/, 0/*srt_off*/, 0/*srt_len*/, SEQ_FRAME); +VEC_POLY_INFO_TABLE(seq_frame, UPD_FRAME_BITMAP, NULL/*srt*/, 0/*srt_off*/, 0/*srt_len*/, SEQ_FRAME,, EF_); /* ----------------------------------------------------------------------------- * The seq infotable @@ -486,179 +502,14 @@ VEC_POLY_INFO_TABLE(seq_frame,1, NULL/*srt*/, 0/*srt_off*/, 0/*srt_len*/, SEQ_FR * It is used in deleteThread when reverting blackholes. * -------------------------------------------------------------------------- */ -INFO_TABLE(seq_info,seq_entry,1,0,FUN,const,EF_,0,0); +INFO_TABLE(seq_info,seq_entry,1,0,FUN,,EF_,0,0); STGFUN(seq_entry) { FB_ STK_CHK_GEN(sizeofW(StgSeqFrame), NO_PTRS, seq_entry, ); - Sp -= sizeof(StgSeqFrame); + Sp -= sizeofW(StgSeqFrame); PUSH_SEQ_FRAME(Sp); R1.cl = R1.cl->payload[0]; 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); - -/* ----------------------------------------------------------------------------- - * 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,const,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,const,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_ -} -