[project @ 1999-03-26 10:29:02 by simonm]

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

diff --git a/ghc/rts/Updates.hc b/ghc/rts/Updates.hc
index 8fc0fae..f5f6928 100644 (file)
--- a/ghc/rts/Updates.hc
+++ b/ghc/rts/Updates.hc
@@ -1,5 +1,7 @@
 /* -----------------------------------------------------------------------------
- * $Id: Updates.hc,v 1.8 1999/01/27 14:51:23 simonpj Exp $
+ * $Id: Updates.hc,v 1.13 1999/03/26 10:29:06 simonm Exp $
+ *
+ * (c) The GHC Team, 1998-1999
  *
  * Code to perform updates.
  *
@@ -110,9 +112,6 @@ INFO_TABLE(PAP_info,PAP_entry,/*special layout*/0,0,PAP,const,EF_,0,0);
 STGFUN(PAP_entry)
 {
   nat Words;
-#ifdef PROFILING
-  CostCentreStack *CCS_pap;
-#endif
   P_ p;
   nat i;
   StgPAP *pap;
@@ -140,10 +139,8 @@ 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;
+      ENTER_CCS_PAP(pap->header.prof.ccs);
 #endif /* PROFILING */
       
       Su = Su->link;
@@ -213,8 +210,8 @@ 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)
@@ -223,22 +220,14 @@ EXTFUN(stg_update_PAP)
 #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;
-    }
+    CCS_pap = Fun->header.prof.ccs;
 #endif
 
     if (Words == 0) { 
@@ -331,33 +320,36 @@ EXTFUN(stg_update_PAP)
        * either the new PAP or Node.
        */
       
-      Updatee = Su->updatee; 
-      UPD_IND(Updatee,PapClosure);
-      
+      Updatee = Su->updatee;
+
+#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 */
@@ -471,7 +463,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);
 
 /* -----------------------------------------------------------------------------
  * The seq infotable
@@ -489,7 +481,7 @@ 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));