X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FUpdates.hc;h=45e00debe90ecd9c17c274c000a963626be95c3e;hb=286a25bb4e6c5baf8900874300dc095705d84918;hp=53f24763aa4f7259a806a8aae443b9271ffb22c6;hpb=e1dc924bbb4efde0128e9dbeafa7580daada2706;p=ghc-hetmet.git diff --git a/ghc/rts/Updates.hc b/ghc/rts/Updates.hc index 53f2476..45e00de 100644 --- a/ghc/rts/Updates.hc +++ b/ghc/rts/Updates.hc @@ -1,5 +1,5 @@ /* ----------------------------------------------------------------------------- - * $Id: Updates.hc,v 1.24 1999/12/01 14:34:39 simonmar Exp $ + * $Id: Updates.hc,v 1.37 2001/11/28 14:29:33 simonmar Exp $ * * (c) The GHC Team, 1998-1999 * @@ -7,12 +7,14 @@ * * ---------------------------------------------------------------------------*/ +#include "Stg.h" #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 @@ -100,23 +102,23 @@ } #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)); -UPD_FRAME_ENTRY_TEMPLATE(Upd_frame_1_entry,RET_VEC(Sp[0],1)); -UPD_FRAME_ENTRY_TEMPLATE(Upd_frame_2_entry,RET_VEC(Sp[0],2)); -UPD_FRAME_ENTRY_TEMPLATE(Upd_frame_3_entry,RET_VEC(Sp[0],3)); -UPD_FRAME_ENTRY_TEMPLATE(Upd_frame_4_entry,RET_VEC(Sp[0],4)); -UPD_FRAME_ENTRY_TEMPLATE(Upd_frame_5_entry,RET_VEC(Sp[0],5)); -UPD_FRAME_ENTRY_TEMPLATE(Upd_frame_6_entry,RET_VEC(Sp[0],6)); -UPD_FRAME_ENTRY_TEMPLATE(Upd_frame_7_entry,RET_VEC(Sp[0],7)); +UPD_FRAME_ENTRY_TEMPLATE(stg_upd_frame_entry,ENTRY_CODE(Sp[0])); +UPD_FRAME_ENTRY_TEMPLATE(stg_upd_frame_0_entry,RET_VEC(Sp[0],0)); +UPD_FRAME_ENTRY_TEMPLATE(stg_upd_frame_1_entry,RET_VEC(Sp[0],1)); +UPD_FRAME_ENTRY_TEMPLATE(stg_upd_frame_2_entry,RET_VEC(Sp[0],2)); +UPD_FRAME_ENTRY_TEMPLATE(stg_upd_frame_3_entry,RET_VEC(Sp[0],3)); +UPD_FRAME_ENTRY_TEMPLATE(stg_upd_frame_4_entry,RET_VEC(Sp[0],4)); +UPD_FRAME_ENTRY_TEMPLATE(stg_upd_frame_5_entry,RET_VEC(Sp[0],5)); +UPD_FRAME_ENTRY_TEMPLATE(stg_upd_frame_6_entry,RET_VEC(Sp[0],6)); +UPD_FRAME_ENTRY_TEMPLATE(stg_upd_frame_7_entry,RET_VEC(Sp[0],7)); /* Make sure this table is big enough to handle the maximum vectored return size! */ -#ifdef PROFILING -#define UPD_FRAME_BITMAP 3 +#if defined(PROFILING) +#define UPD_FRAME_BITMAP 7 #else #define UPD_FRAME_BITMAP 1 #endif @@ -126,7 +128,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,, EF_); +VEC_POLY_INFO_TABLE(stg_upd_frame,UPD_FRAME_BITMAP, NULL/*srt*/, 0/*srt_off*/, 0/*srt_len*/, UPDATE_FRAME,, EF_); /* ----------------------------------------------------------------------------- Entry Code for a PAP. @@ -140,8 +142,8 @@ 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); -STGFUN(PAP_entry) +INFO_TABLE(stg_PAP_info,stg_PAP_entry,/*special layout*/0,0,PAP,,EF_,"PAP","PAP"); +STGFUN(stg_PAP_entry) { nat Words; P_ p; @@ -205,6 +207,7 @@ STGFUN(PAP_entry) Sp -= Words; TICK_ENT_PAP(pap); + LDV_ENTER(pap); /* Enter PAP cost centre -- lexical scoping only */ ENTER_CCS_PAP_CL(pap); @@ -227,7 +230,7 @@ STGFUN(PAP_entry) This function is called whenever an argument satisfaction check fails. -------------------------------------------------------------------------- */ -EXTFUN(stg_update_PAP) +EXTFUN(__stg_update_PAP) { nat Words, PapSize; #ifdef PROFILING @@ -245,11 +248,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. */ @@ -289,26 +287,25 @@ EXTFUN(stg_update_PAP) * such as removing the update frame. */ if ((Hp += PapSize) > HpLim) { + HpAlloc = PapSize; Sp -= 1; Sp[0] = (W_)Fun; JMP_(stg_gc_entertop); } TICK_ALLOC_UPD_PAP(1/*fun*/ + Words, 0); -#ifdef PROFILING CCS_ALLOC(CCS_pap, PapSize); -#endif PapClosure = (StgPAP *)(Hp + 1 - PapSize); /* The new PapClosure */ - SET_HDR(PapClosure,&PAP_info,CCS_pap); + SET_HDR(PapClosure,&stg_PAP_info,CCS_pap); PapClosure->n_args = Words; PapClosure->fun = Fun; /* Now fill in the closure fields */ p = Hp; - for (i = Words-1; i >= 0; i--) { + for (i = Words; --i >= 0; ) { *p-- = (W_) Sp[i]; } } @@ -354,7 +351,7 @@ EXTFUN(stg_update_PAP) Updatee = Su->updatee; -#if defined(PROFILING) +#if defined(PROFILING) if (Words != 0) { UPD_IND(Updatee,PapClosure); TICK_UPD_PAP_IN_NEW(Words+1); @@ -386,7 +383,7 @@ EXTFUN(stg_update_PAP) /* * Squeeze out update frame from stack. */ - for (i = Words-1; i >= 0; i--) { + for (i = Words; --i >= 0; ) { Sp[i+(sizeofW(StgUpdateFrame))] = Sp[i]; } Sp += sizeofW(StgUpdateFrame); @@ -416,8 +413,8 @@ EXTFUN(stg_update_PAP) -------------------------------------------------------------------------- */ -INFO_TABLE(AP_UPD_info,AP_UPD_entry,/*special layout*/0,0,AP_UPD,,EF_,0,0); -STGFUN(AP_UPD_entry) +INFO_TABLE(stg_AP_UPD_info,stg_AP_UPD_entry,/*special layout*/0,0,AP_UPD,,EF_,"AP_UPD","AP_UPD"); +STGFUN(stg_AP_UPD_entry) { nat Words; P_ p; @@ -433,12 +430,13 @@ STGFUN(AP_UPD_entry) /* * Check for stack overflow. */ - STK_CHK(Words+sizeofW(StgUpdateFrame),AP_UPD_entry,R2.p,1,); + STK_CHK_GEN(Words+sizeofW(StgUpdateFrame), R1_PTR, stg_AP_UPD_entry, ); PUSH_UPD_FRAME(R1.p, 0); Sp -= sizeofW(StgUpdateFrame) + Words; TICK_ENT_AP_UPD(ap); + LDV_ENTER(ap); /* Enter PAP cost centre -- lexical scoping only */ ENTER_CCS_PAP_CL(ap); /* ToDo: ENTER_CC_AP_UPD_CL */ @@ -481,17 +479,17 @@ STGFUN(AP_UPD_entry) FE_ \ } -SEQ_FRAME_ENTRY_TEMPLATE(seq_frame_entry, ENTRY_CODE(Sp[0])); -SEQ_FRAME_ENTRY_TEMPLATE(seq_frame_0_entry,ENTRY_CODE(Sp[0])); -SEQ_FRAME_ENTRY_TEMPLATE(seq_frame_1_entry,ENTRY_CODE(Sp[0])); -SEQ_FRAME_ENTRY_TEMPLATE(seq_frame_2_entry,ENTRY_CODE(Sp[0])); -SEQ_FRAME_ENTRY_TEMPLATE(seq_frame_3_entry,ENTRY_CODE(Sp[0])); -SEQ_FRAME_ENTRY_TEMPLATE(seq_frame_4_entry,ENTRY_CODE(Sp[0])); -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])); +SEQ_FRAME_ENTRY_TEMPLATE(stg_seq_frame_entry, ENTRY_CODE(Sp[0])); +SEQ_FRAME_ENTRY_TEMPLATE(stg_seq_frame_0_entry,ENTRY_CODE(Sp[0])); +SEQ_FRAME_ENTRY_TEMPLATE(stg_seq_frame_1_entry,ENTRY_CODE(Sp[0])); +SEQ_FRAME_ENTRY_TEMPLATE(stg_seq_frame_2_entry,ENTRY_CODE(Sp[0])); +SEQ_FRAME_ENTRY_TEMPLATE(stg_seq_frame_3_entry,ENTRY_CODE(Sp[0])); +SEQ_FRAME_ENTRY_TEMPLATE(stg_seq_frame_4_entry,ENTRY_CODE(Sp[0])); +SEQ_FRAME_ENTRY_TEMPLATE(stg_seq_frame_5_entry,ENTRY_CODE(Sp[0])); +SEQ_FRAME_ENTRY_TEMPLATE(stg_seq_frame_6_entry,ENTRY_CODE(Sp[0])); +SEQ_FRAME_ENTRY_TEMPLATE(stg_seq_frame_7_entry,ENTRY_CODE(Sp[0])); -VEC_POLY_INFO_TABLE(seq_frame, UPD_FRAME_BITMAP, NULL/*srt*/, 0/*srt_off*/, 0/*srt_len*/, SEQ_FRAME,, EF_); +VEC_POLY_INFO_TABLE(stg_seq_frame, UPD_FRAME_BITMAP, NULL/*srt*/, 0/*srt_off*/, 0/*srt_len*/, SEQ_FRAME,, EF_); /* ----------------------------------------------------------------------------- * The seq infotable @@ -504,11 +502,11 @@ VEC_POLY_INFO_TABLE(seq_frame, UPD_FRAME_BITMAP, NULL/*srt*/, 0/*srt_off*/, 0/*s * It is used in deleteThread when reverting blackholes. * -------------------------------------------------------------------------- */ -INFO_TABLE(seq_info,seq_entry,1,0,FUN,,EF_,0,0); -STGFUN(seq_entry) +INFO_TABLE(stg_seq_info,stg_seq_entry,1,0,FUN,,EF_,0,0); +STGFUN(stg_seq_entry) { FB_ - STK_CHK_GEN(sizeofW(StgSeqFrame), NO_PTRS, seq_entry, ); + STK_CHK_GEN(sizeofW(StgSeqFrame), NO_PTRS, stg_seq_entry, ); Sp -= sizeofW(StgSeqFrame); PUSH_SEQ_FRAME(Sp); R1.cl = R1.cl->payload[0];