Skip to content
Snippets Groups Projects
Commit f2a6a280 authored by Simon Marlow's avatar Simon Marlow
Browse files

[project @ 1999-04-23 09:45:27 by simonm] 

Don't forget to set the CCCS from the thunk when entering std thunks.
parent 12b5aeae
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 13 additions and 1 deletion
ghc/rts/StgStdThunks.hc
+ 13
− 1
View file @ f2a6a280
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
* $Id: StgStdThunks.hc,v 1.4 1999/03/26 10:29:05 simonm Exp $ * $Id: StgStdThunks.hc,v 1.5 1999/04/23 09:45:27 simonm Exp $
* *
* (c) The GHC Team, 1998-1999 * (c) The GHC Team, 1998-1999
* *
...@@ -29,10 +29,12 @@ ...@@ -29,10 +29,12 @@
#ifdef PROFILING #ifdef PROFILING
#define SAVE_CCCS(fs) CCS_HDR(Sp-fs)=CCCS #define SAVE_CCCS(fs) CCS_HDR(Sp-fs)=CCCS
#define GET_SAVED_CCCS RESTORE_CCCS(CCS_HDR(Sp)) #define GET_SAVED_CCCS RESTORE_CCCS(CCS_HDR(Sp))
#define ENTER_CCS(p) ENTER_CCS_TCL(p)
#define RET_BITMAP 1 #define RET_BITMAP 1
#else #else
#define SAVE_CCCS(fs) /* empty */ #define SAVE_CCCS(fs) /* empty */
#define GET_SAVED_CCCS /* empty */ #define GET_SAVED_CCCS /* empty */
#define ENTER_CCS(p) /* empty */
#define RET_BITMAP 0 #define RET_BITMAP 0
#endif #endif
...@@ -55,6 +57,7 @@ ...@@ -55,6 +57,7 @@
STK_CHK_NP(UPD_FRAME_SIZE,1,); \ STK_CHK_NP(UPD_FRAME_SIZE,1,); \
UPD_BH_UPDATABLE(R1.p); \ UPD_BH_UPDATABLE(R1.p); \
PUSH_UPD_FRAME(R1.p,0); \ PUSH_UPD_FRAME(R1.p,0); \
ENTER_CCS(R1.p); \
SAVE_CCCS(UPD_FRAME_SIZE); \ SAVE_CCCS(UPD_FRAME_SIZE); \
Sp[-UPD_FRAME_SIZE]=(W_)__sel_ret_##offset##_upd_ret; \ Sp[-UPD_FRAME_SIZE]=(W_)__sel_ret_##offset##_upd_ret; \
R1.p = (P_)R1.cl->payload[0]; \ R1.p = (P_)R1.cl->payload[0]; \
...@@ -97,6 +100,7 @@ SELECTOR_CODE_UPD(15); ...@@ -97,6 +100,7 @@ SELECTOR_CODE_UPD(15);
EF_(__sel_##offset##_noupd_entry) { \ EF_(__sel_##offset##_noupd_entry) { \
FB_ \ FB_ \
STK_CHK_NP(NOUPD_FRAME_SIZE,1,) \ STK_CHK_NP(NOUPD_FRAME_SIZE,1,) \
ENTER_CCS(R1.p); \
SAVE_CCCS(NOUPD_FRAME_SIZE); \ SAVE_CCCS(NOUPD_FRAME_SIZE); \
Sp[-NOUPD_FRAME_SIZE]=(W_)__sel_ret_##offset##_noupd_ret; \ Sp[-NOUPD_FRAME_SIZE]=(W_)__sel_ret_##offset##_noupd_ret; \
R1.p = (P_)R1.cl->payload[0]; \ R1.p = (P_)R1.cl->payload[0]; \
...@@ -156,6 +160,7 @@ FN_(__ap_1_upd_entry) { ...@@ -156,6 +160,7 @@ FN_(__ap_1_upd_entry) {
FB_ FB_
STK_CHK_NP(sizeofW(StgUpdateFrame),1,); STK_CHK_NP(sizeofW(StgUpdateFrame),1,);
UPD_BH_UPDATABLE(R1.p); UPD_BH_UPDATABLE(R1.p);
ENTER_CCS(R1.p);
PUSH_UPD_FRAME(R1.p,0); PUSH_UPD_FRAME(R1.p,0);
R1.p=(P_)(R1.cl->payload[0]); R1.p=(P_)(R1.cl->payload[0]);
Sp = Sp - sizeofW(StgUpdateFrame); Sp = Sp - sizeofW(StgUpdateFrame);
...@@ -168,6 +173,7 @@ FN_(__ap_2_upd_entry) { ...@@ -168,6 +173,7 @@ FN_(__ap_2_upd_entry) {
FB_ FB_
STK_CHK_NP(sizeofW(StgUpdateFrame)+1,1,); STK_CHK_NP(sizeofW(StgUpdateFrame)+1,1,);
UPD_BH_UPDATABLE(R1.p); UPD_BH_UPDATABLE(R1.p);
ENTER_CCS(R1.p);
PUSH_UPD_FRAME(R1.p,0); PUSH_UPD_FRAME(R1.p,0);
Sp[-UF_SIZE-1]=(W_)(R1.cl->payload[1]); Sp[-UF_SIZE-1]=(W_)(R1.cl->payload[1]);
R1.p=(P_)(R1.cl->payload[0]); R1.p=(P_)(R1.cl->payload[0]);
...@@ -181,6 +187,7 @@ FN_(__ap_3_upd_entry) { ...@@ -181,6 +187,7 @@ FN_(__ap_3_upd_entry) {
FB_ FB_
STK_CHK_NP(sizeofW(StgUpdateFrame)+2,1,); STK_CHK_NP(sizeofW(StgUpdateFrame)+2,1,);
UPD_BH_UPDATABLE(R1.p); UPD_BH_UPDATABLE(R1.p);
ENTER_CCS(R1.p);
PUSH_UPD_FRAME(R1.p,0); PUSH_UPD_FRAME(R1.p,0);
Sp[-UF_SIZE-1]=(W_)(R1.cl->payload[2]); Sp[-UF_SIZE-1]=(W_)(R1.cl->payload[2]);
Sp[-UF_SIZE-2]=(W_)(R1.cl->payload[1]); Sp[-UF_SIZE-2]=(W_)(R1.cl->payload[1]);
...@@ -195,6 +202,7 @@ FN_(__ap_4_upd_entry) { ...@@ -195,6 +202,7 @@ FN_(__ap_4_upd_entry) {
FB_ FB_
STK_CHK_NP(sizeofW(StgUpdateFrame)+3,1,); STK_CHK_NP(sizeofW(StgUpdateFrame)+3,1,);
UPD_BH_UPDATABLE(R1.p); UPD_BH_UPDATABLE(R1.p);
ENTER_CCS(R1.p);
PUSH_UPD_FRAME(R1.p,0); PUSH_UPD_FRAME(R1.p,0);
Sp[-UF_SIZE-1]=(W_)(R1.cl->payload[3]); Sp[-UF_SIZE-1]=(W_)(R1.cl->payload[3]);
Sp[-UF_SIZE-2]=(W_)(R1.cl->payload[2]); Sp[-UF_SIZE-2]=(W_)(R1.cl->payload[2]);
...@@ -210,6 +218,7 @@ FN_(__ap_5_upd_entry) { ...@@ -210,6 +218,7 @@ FN_(__ap_5_upd_entry) {
FB_ FB_
STK_CHK_NP(sizeofW(StgUpdateFrame)+4,1,); STK_CHK_NP(sizeofW(StgUpdateFrame)+4,1,);
UPD_BH_UPDATABLE(R1.p); UPD_BH_UPDATABLE(R1.p);
ENTER_CCS(R1.p);
PUSH_UPD_FRAME(R1.p,0); PUSH_UPD_FRAME(R1.p,0);
Sp[-UF_SIZE-1]=(W_)(R1.cl->payload[4]); Sp[-UF_SIZE-1]=(W_)(R1.cl->payload[4]);
Sp[-UF_SIZE-2]=(W_)(R1.cl->payload[3]); Sp[-UF_SIZE-2]=(W_)(R1.cl->payload[3]);
...@@ -226,6 +235,7 @@ FN_(__ap_6_upd_entry) { ...@@ -226,6 +235,7 @@ FN_(__ap_6_upd_entry) {
FB_ FB_
STK_CHK_NP(sizeofW(StgUpdateFrame)+5,1,); STK_CHK_NP(sizeofW(StgUpdateFrame)+5,1,);
UPD_BH_UPDATABLE(R1.p); UPD_BH_UPDATABLE(R1.p);
ENTER_CCS(R1.p);
PUSH_UPD_FRAME(R1.p,0); PUSH_UPD_FRAME(R1.p,0);
Sp[-UF_SIZE-1]=(W_)(R1.cl->payload[5]); Sp[-UF_SIZE-1]=(W_)(R1.cl->payload[5]);
Sp[-UF_SIZE-2]=(W_)(R1.cl->payload[4]); Sp[-UF_SIZE-2]=(W_)(R1.cl->payload[4]);
...@@ -243,6 +253,7 @@ FN_(__ap_7_upd_entry) { ...@@ -243,6 +253,7 @@ FN_(__ap_7_upd_entry) {
FB_ FB_
STK_CHK_NP(sizeofW(StgUpdateFrame)+6,1,); STK_CHK_NP(sizeofW(StgUpdateFrame)+6,1,);
UPD_BH_UPDATABLE(R1.p); UPD_BH_UPDATABLE(R1.p);
ENTER_CCS(R1.p);
PUSH_UPD_FRAME(R1.p,0); PUSH_UPD_FRAME(R1.p,0);
Sp[-UF_SIZE-1]=(W_)(R1.cl->payload[6]); Sp[-UF_SIZE-1]=(W_)(R1.cl->payload[6]);
Sp[-UF_SIZE-2]=(W_)(R1.cl->payload[5]); Sp[-UF_SIZE-2]=(W_)(R1.cl->payload[5]);
...@@ -261,6 +272,7 @@ FN_(__ap_8_upd_entry) { ...@@ -261,6 +272,7 @@ FN_(__ap_8_upd_entry) {
FB_ FB_
STK_CHK_NP(sizeofW(StgUpdateFrame)+7,1,); STK_CHK_NP(sizeofW(StgUpdateFrame)+7,1,);
UPD_BH_UPDATABLE(R1.p); UPD_BH_UPDATABLE(R1.p);
ENTER_CCS(R1.p);
PUSH_UPD_FRAME(R1.p,0); PUSH_UPD_FRAME(R1.p,0);
Sp[-UF_SIZE-1]=(W_)(R1.cl->payload[7]); Sp[-UF_SIZE-1]=(W_)(R1.cl->payload[7]);
Sp[-UF_SIZE-2]=(W_)(R1.cl->payload[6]); Sp[-UF_SIZE-2]=(W_)(R1.cl->payload[6]);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment