[project @ 1999-07-03 18:39:40 by sof]

[ghc-hetmet.git] / ghc / rts / Updates.hc

diff --git a/ghc/rts/Updates.hc b/ghc/rts/Updates.hc
index adc9a6c..e9ac61f 100644 (file)
--- a/ghc/rts/Updates.hc
+++ b/ghc/rts/Updates.hc
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Updates.hc,v 1.14 1999/04/08 15:43:46 simonm Exp $
+ * $Id: Updates.hc,v 1.17 1999/05/13 17:31:14 simonm Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -9,8 +9,10 @@
 
 #include "Rts.h"
 #include "RtsUtils.h"
+#include "RtsFlags.h"
 #include "HeapStackCheck.h"
 #include "Storage.h"
+#include "ProfRts.h"
 
 /*
   The update frame return address must be *polymorphic*, that means
@@ -94,7 +96,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,7 +110,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,const,EF_,0,0);
+INFO_TABLE(PAP_info,PAP_entry,/*special layout*/0,0,PAP,,EF_,0,0);
 STGFUN(PAP_entry)
 {
   nat Words;
@@ -140,7 +142,6 @@ STGFUN(PAP_entry)
        */
       
       CCCS = Su->header.prof.ccs;
-      ENTER_CCS_PAP(pap->header.prof.ccs);
 #endif /* PROFILING */
       
       Su = Su->link;
@@ -200,7 +201,7 @@ EXTFUN(stg_update_PAP)
 {
   nat Words, PapSize;
 #ifdef PROFILING
-  CostCentreStack *CCS_pap, *CCS_blame;
+  CostCentreStack *CCS_pap;
 #endif
   StgPAP* PapClosure;
   StgClosure *Fun, *Updatee;
@@ -226,12 +227,9 @@ EXTFUN(stg_update_PAP)
     ASSERT((int)Words >= 0);
 
 #if defined(PROFILING)
-    /* set "CC_pap" to go in the updatee (see Sansom thesis, p 183) */
-    CCS_pap = Fun->header.prof.ccs;
-    CCS_blame = Fun->header.prof.ccs;
-    if (IS_CAF_OR_SUB_CCS(CCS_pap)) {
-      CCS_blame = CCCS;
-    }
+    /* pretend we just entered the function closure */
+    ENTER_CCS_FCL(Fun);
+    CCS_pap = CCCS;
 #endif
 
     if (Words == 0) { 
@@ -268,7 +266,7 @@ EXTFUN(stg_update_PAP)
 
        TICK_ALLOC_UPD_PAP(1/*fun*/ + Words, 0);
 #ifdef PROFILING
-       CCS_ALLOC(CCS_blame, PapSize);
+       CCS_ALLOC(CCS_pap, PapSize);
 #endif
 
        PapClosure = (StgPAP *)(Hp + 1 - PapSize); /* The new PapClosure */
@@ -324,7 +322,7 @@ EXTFUN(stg_update_PAP)
        * either the new PAP or Node.
        */
       
-      Updatee = Su->updatee;
+      Updatee = Su->updatee; 
 
 #if defined(PROFILING)
       if (Words != 0) {
@@ -348,10 +346,6 @@ EXTFUN(stg_update_PAP)
 #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 = Su->header.prof.ccs;
       ENTER_CCS_PAP(CCS_pap);
 #endif /* PROFILING */
@@ -378,7 +372,7 @@ EXTFUN(stg_update_PAP)
      */
     JMP_(GET_ENTRY(R1.cl));
     FE_
-} 
+}
 
 
 /* -----------------------------------------------------------------------------
@@ -392,7 +386,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;
@@ -467,7 +461,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, UPD_FRAME_BITMAP, 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
@@ -480,7 +474,7 @@ 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,const,EF_,0,0);
+INFO_TABLE(seq_info,seq_entry,1,0,FUN,,EF_,0,0);
 STGFUN(seq_entry)
 {
   FB_
@@ -532,7 +526,7 @@ CATCH_FRAME_ENTRY_TEMPLATE(catch_frame_7_entry,RET_VEC(Sp[0],7));
  * 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);
+VEC_POLY_INFO_TABLE(catch_frame, CATCH_FRAME_BITMAP, NULL/*srt*/, 0/*srt_off*/, 0/*srt_len*/, CATCH_FRAME,, EF_);
 
 /* -----------------------------------------------------------------------------
  * The catch infotable
@@ -544,7 +538,7 @@ VEC_POLY_INFO_TABLE(catch_frame, CATCH_FRAME_BITMAP, NULL/*srt*/, 0/*srt_off*/,
  * It is used in deleteThread when reverting blackholes.
  * -------------------------------------------------------------------------- */
 
-INFO_TABLE(catch_info,catch_entry,2,0,FUN,const,EF_,0,0);
+INFO_TABLE(catch_info,catch_entry,2,0,FUN,,EF_,0,0);
 STGFUN(catch_entry)
 {
   FB_
@@ -584,7 +578,7 @@ FN_(catchzh_fast)
  * 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);
+INFO_TABLE(raise_info,raise_entry,1,0,FUN,,EF_,0,0);
 STGFUN(raise_entry)
 {
   FB_