projects / ghc-hetmet.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
[project @ 1999-10-21 09:18:02 by simonmar]
[ghc-hetmet.git] / ghc / rts / StgStdThunks.hc
diff --git a/ghc/rts/StgStdThunks.hc b/ghc/rts/StgStdThunks.hc
index 35a75c1..b54148f 100644 (file)
--- a/ghc/rts/StgStdThunks.hc
+++ b/ghc/rts/StgStdThunks.hc
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: StgStdThunks.hc,v 1.6 1999/05/13 17:31:13 simonm Exp $
+ * $Id: StgStdThunks.hc,v 1.8 1999/10/21 09:18:02 simonmar Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -39,13 +39,14 @@
 #endif
 
 #define SELECTOR_CODE_UPD(offset) \
-  IF_(__sel_ret_##offset##_upd_ret);                                   \
-  INFO_TABLE_SRT_BITMAP(__sel_ret_##offset##_upd_info,__sel_ret_##offset##_upd_ret, RET_BITMAP, 0, 0, 0, RET_SMALL, static, IF_, 0, 0);                        \
-  IF_(__sel_ret_##offset##_upd_ret) {                                  \
+  EF_(__sel_ret_##offset##_upd_ret);                                   \
+  INFO_TABLE_SRT_BITMAP(__sel_ret_##offset##_upd_info,__sel_ret_##offset##_upd_ret, RET_BITMAP, 0, 0, 0, RET_SMALL, static, EF_, 0, 0);                        \
+  EF_(__sel_ret_##offset##_upd_ret) {                                  \
     FB_                                                                        \
       R1.p=(P_)R1.cl->payload[offset];                                 \
       GET_SAVED_CCCS;                                                  \
       Sp=Sp+sizeofW(StgHeader);                                                \
+      TICK_ENT_VIA_NODE();                                             \
       JMP_(ENTRY_CODE(*R1.p));                                         \
     FE_                                                                        \
   }                                                                    \
@@ -54,6 +55,7 @@
   INFO_TABLE_SELECTOR(__sel_##offset##_upd_info, __sel_##offset##_upd_entry, offset,, EF_, 0,0);\
   EF_(__sel_##offset##_upd_entry) {                                    \
     FB_                                                                        \
+      TICK_ENT_THK();                                                  \
       STK_CHK_NP(UPD_FRAME_SIZE,1,);                                   \
       UPD_BH_UPDATABLE(R1.p);                                          \
       PUSH_UPD_FRAME(R1.p,0);                                          \
@@ -62,6 +64,7 @@
       Sp[-UPD_FRAME_SIZE]=(W_)&__sel_ret_##offset##_upd_info;          \
       R1.p = (P_)R1.cl->payload[0];                                    \
       Sp=Sp-UPD_FRAME_SIZE;                                            \
+      TICK_ENT_VIA_NODE();                                             \
       JMP_(ENTRY_CODE(*R1.p));                                         \
     FE_                                                                        \
   }
@@ -84,13 +87,13 @@ SELECTOR_CODE_UPD(14);
 SELECTOR_CODE_UPD(15);
 
 #define SELECTOR_CODE_NOUPD(offset) \
-  IF_(__sel_ret_##offset##_noupd_ret);                                 \
-  INFO_TABLE_SRT_BITMAP(__sel_ret_##offset##_noupd_info, __sel_ret_##offset##_noupd_ret, RET_BITMAP, 0, 0, 0, RET_SMALL, static, IF_, 0, 0);   \
-  IF_(__sel_ret_##offset##_noupd_ret) {                                        \
+  INFO_TABLE_SRT_BITMAP(__sel_ret_##offset##_noupd_info, __sel_ret_##offset##_noupd_ret, RET_BITMAP, 0, 0, 0, RET_SMALL, static, EF_, 0, 0);   \
+  EF_(__sel_ret_##offset##_noupd_ret) {                                        \
     FB_                                                                        \
       R1.p=(P_)R1.cl->payload[offset];                                 \
       GET_SAVED_CCCS;                                                  \
       Sp=Sp+sizeofW(StgHeader);                                                \
+      TICK_ENT_VIA_NODE();                                             \
       JMP_(ENTRY_CODE(*R1.p));                                         \
     FE_                                                                        \
   }                                                                    \
@@ -99,12 +102,14 @@ SELECTOR_CODE_UPD(15);
   INFO_TABLE_SELECTOR(__sel_##offset##_noupd_info, __sel_##offset##_noupd_entry, offset,, EF_, 0,0);\
   EF_(__sel_##offset##_noupd_entry) {                                  \
     FB_                                                                        \
+      TICK_ENT_THK();                                                  \
       STK_CHK_NP(NOUPD_FRAME_SIZE,1,)                                  \
       ENTER_CCS(R1.p);                                                 \
       SAVE_CCCS(NOUPD_FRAME_SIZE);                                     \
-      Sp[-NOUPD_FRAME_SIZE]=(W_)__sel_ret_##offset##_noupd_ret;                \
+      Sp[-NOUPD_FRAME_SIZE]=(W_)&__sel_ret_##offset##_noupd_info;      \
       R1.p = (P_)R1.cl->payload[0];                                    \
       Sp=Sp-NOUPD_FRAME_SIZE;                                          \
+      TICK_ENT_VIA_NODE();                                             \
       JMP_(ENTRY_CODE(*R1.p));                                         \
     FE_                                                                        \
   }
@@ -158,12 +163,14 @@ FN_(__ap_8_upd_entry);
 INFO_TABLE_SRT(__ap_1_upd_info,__ap_1_upd_entry,1,0,0,0,0,THUNK,,EF_,0,0);
 FN_(__ap_1_upd_entry) {
   FB_
+  TICK_ENT_THK();
   STK_CHK_NP(sizeofW(StgUpdateFrame),1,);
   UPD_BH_UPDATABLE(R1.p);
   ENTER_CCS(R1.p);
   PUSH_UPD_FRAME(R1.p,0);
   R1.p=(P_)(R1.cl->payload[0]);
   Sp = Sp - sizeofW(StgUpdateFrame);
+  TICK_ENT_VIA_NODE();
   JMP_(ENTRY_CODE(*R1.p));
   FE_
 }
@@ -171,6 +178,7 @@ FN_(__ap_1_upd_entry) {
 INFO_TABLE_SRT(__ap_2_upd_info,__ap_2_upd_entry,2,0,0,0,0,THUNK,,EF_,0,0);
 FN_(__ap_2_upd_entry) {
   FB_
+  TICK_ENT_THK();
   STK_CHK_NP(sizeofW(StgUpdateFrame)+1,1,);
   UPD_BH_UPDATABLE(R1.p);
   ENTER_CCS(R1.p);
@@ -178,6 +186,7 @@ FN_(__ap_2_upd_entry) {
   Sp[-UF_SIZE-1]=(W_)(R1.cl->payload[1]);
   R1.p=(P_)(R1.cl->payload[0]);
   Sp = Sp - (sizeofW(StgUpdateFrame)+1);
+  TICK_ENT_VIA_NODE();
   JMP_(ENTRY_CODE(*R1.p));
   FE_
 }
@@ -185,6 +194,7 @@ FN_(__ap_2_upd_entry) {
 INFO_TABLE_SRT(__ap_3_upd_info,__ap_3_upd_entry,3,0,0,0,0,THUNK,,EF_,0,0);
 FN_(__ap_3_upd_entry) {
   FB_
+  TICK_ENT_THK();
   STK_CHK_NP(sizeofW(StgUpdateFrame)+2,1,);
   UPD_BH_UPDATABLE(R1.p);
   ENTER_CCS(R1.p);
@@ -193,6 +203,7 @@ FN_(__ap_3_upd_entry) {
   Sp[-UF_SIZE-2]=(W_)(R1.cl->payload[1]);
   R1.p=(P_)(R1.cl->payload[0]);
   Sp = Sp - (sizeofW(StgUpdateFrame)+2);
+  TICK_ENT_VIA_NODE();
   JMP_(ENTRY_CODE(*R1.p));
   FE_
 }
@@ -200,6 +211,7 @@ FN_(__ap_3_upd_entry) {
 INFO_TABLE_SRT(__ap_4_upd_info,__ap_4_upd_entry,4,0,0,0,0,THUNK,,EF_,0,0);
 FN_(__ap_4_upd_entry) {
   FB_
+  TICK_ENT_THK();
   STK_CHK_NP(sizeofW(StgUpdateFrame)+3,1,);
   UPD_BH_UPDATABLE(R1.p);
   ENTER_CCS(R1.p);
@@ -209,6 +221,7 @@ FN_(__ap_4_upd_entry) {
   Sp[-UF_SIZE-3]=(W_)(R1.cl->payload[1]);
   R1.p=(P_)(R1.cl->payload[0]);
   Sp = Sp - (sizeofW(StgUpdateFrame)+3);
+  TICK_ENT_VIA_NODE();
   JMP_(ENTRY_CODE(*R1.p));
   FE_
 }
@@ -216,6 +229,7 @@ FN_(__ap_4_upd_entry) {
 INFO_TABLE_SRT(__ap_5_upd_info,__ap_5_upd_entry,5,0,0,0,0,THUNK,,EF_,0,0);
 FN_(__ap_5_upd_entry) {
   FB_
+  TICK_ENT_THK();
   STK_CHK_NP(sizeofW(StgUpdateFrame)+4,1,);
   UPD_BH_UPDATABLE(R1.p);
   ENTER_CCS(R1.p);
@@ -226,6 +240,7 @@ FN_(__ap_5_upd_entry) {
   Sp[-UF_SIZE-4]=(W_)(R1.cl->payload[1]);
   R1.p=(P_)(R1.cl->payload[0]);
   Sp = Sp - (sizeofW(StgUpdateFrame)+4);
+  TICK_ENT_VIA_NODE();
   JMP_(ENTRY_CODE(*R1.p));
   FE_
 }
@@ -233,6 +248,7 @@ FN_(__ap_5_upd_entry) {
 INFO_TABLE_SRT(__ap_6_upd_info,__ap_6_upd_entry,6,0,0,0,0,THUNK,,EF_,0,0);
 FN_(__ap_6_upd_entry) {
   FB_
+  TICK_ENT_THK();
   STK_CHK_NP(sizeofW(StgUpdateFrame)+5,1,);
   UPD_BH_UPDATABLE(R1.p);
   ENTER_CCS(R1.p);
@@ -244,6 +260,7 @@ FN_(__ap_6_upd_entry) {
   Sp[-UF_SIZE-5]=(W_)(R1.cl->payload[1]);
   R1.p=(P_)(R1.cl->payload[0]);
   Sp = Sp - (sizeofW(StgUpdateFrame)+5);
+  TICK_ENT_VIA_NODE();
   JMP_(ENTRY_CODE(*R1.p));
   FE_
 }
@@ -251,6 +268,7 @@ FN_(__ap_6_upd_entry) {
 INFO_TABLE_SRT(__ap_7_upd_info,__ap_7_upd_entry,7,0,0,0,0,THUNK,,EF_,0,0);
 FN_(__ap_7_upd_entry) {
   FB_
+  TICK_ENT_THK();
   STK_CHK_NP(sizeofW(StgUpdateFrame)+6,1,);
   UPD_BH_UPDATABLE(R1.p);
   ENTER_CCS(R1.p);
@@ -263,6 +281,7 @@ FN_(__ap_7_upd_entry) {
   Sp[-UF_SIZE-6]=(W_)(R1.cl->payload[1]);
   R1.p=(P_)(R1.cl->payload[0]);
   Sp = Sp - (sizeofW(StgUpdateFrame)+6);
+  TICK_ENT_VIA_NODE();
   JMP_(ENTRY_CODE(*R1.p));
   FE_
 }
@@ -270,6 +289,7 @@ FN_(__ap_7_upd_entry) {
 INFO_TABLE_SRT(__ap_8_upd_info,__ap_8_upd_entry,8,0,0,0,0,THUNK,,EF_,0,0);
 FN_(__ap_8_upd_entry) {
   FB_
+  TICK_ENT_THK();
   STK_CHK_NP(sizeofW(StgUpdateFrame)+7,1,);
   UPD_BH_UPDATABLE(R1.p);
   ENTER_CCS(R1.p);
@@ -283,6 +303,7 @@ FN_(__ap_8_upd_entry) {
   Sp[-UF_SIZE-7]=(W_)(R1.cl->payload[1]);
   R1.p=(P_)(R1.cl->payload[0]);
   Sp=Sp-10;
+  TICK_ENT_VIA_NODE();
   JMP_(ENTRY_CODE(*R1.p));
   FE_
 }
Glasgow Haskell Compiler with heterogeneous metaprogramming (generalized arrows and modal types)