projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2000-05-15 12:53:39 by rrt]
[ghc-hetmet.git]
/
ghc
/
rts
/
Updates.hc
diff --git
a/ghc/rts/Updates.hc
b/ghc/rts/Updates.hc
index
53f2476
..
1a9c56c
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.27 2000/04/19 10:52:36 simonmar Exp $
*
* (c) The GHC Team, 1998-1999
*
*
* (c) The GHC Team, 1998-1999
*
@@
-12,7
+12,9
@@
#include "RtsFlags.h"
#include "HeapStackCheck.h"
#include "Storage.h"
#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
/*
The update frame return address must be *polymorphic*, that means
@@
-140,7
+142,7
@@
VEC_POLY_INFO_TABLE(Upd_frame,UPD_FRAME_BITMAP, NULL/*srt*/, 0/*srt_off*/, 0/*sr
really an optimisation? --SDM)
-------------------------------------------------------------------------- */
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;
STGFUN(PAP_entry)
{
nat Words;
@@
-245,11
+247,6
@@
EXTFUN(stg_update_PAP)
*/
Fun = R1.cl;
*/
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.
*/
/* 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;
STGFUN(AP_UPD_entry)
{
nat Words;