[project @ 2000-06-20 15:18:40 by simonmar]

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

diff --git a/ghc/rts/Updates.hc b/ghc/rts/Updates.hc
index 53f2476..c6cc04d 100644 (file)
--- 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.28 2000/05/16 15:56:00 simonmar Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -12,7 +12,9 @@
 #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,15 +102,15 @@
        }
 #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(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));
 
 /*
   Make sure this table is big enough to handle the maximum vectored
@@ -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(upd_frame,UPD_FRAME_BITMAP, NULL/*srt*/, 0/*srt_off*/, 0/*srt_len*/, UPDATE_FRAME,, EF_);
 
 /* -----------------------------------------------------------------------------
    Entry Code for a PAP.
@@ -140,7 +142,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,,EF_,0,0);
+INFO_TABLE(PAP_info,PAP_entry,/*special layout*/0,0,PAP,,EF_,"PAP","PAP");
 STGFUN(PAP_entry)
 {
   nat Words;
@@ -245,11 +247,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.
      */
@@ -416,7 +413,7 @@ EXTFUN(stg_update_PAP)
    -------------------------------------------------------------------------- */
 
 
-INFO_TABLE(AP_UPD_info,AP_UPD_entry,/*special layout*/0,0,AP_UPD,,EF_,0,0);
+INFO_TABLE(AP_UPD_info,AP_UPD_entry,/*special layout*/0,0,AP_UPD,,EF_,"AP_UPD","AP_UPD");
 STGFUN(AP_UPD_entry)
 {
   nat Words;