summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsimonmar <unknown>2001-11-28 14:29:33 +0000
committersimonmar <unknown>2001-11-28 14:29:33 +0000
commit46eb785ac81270932654bd90a5e14aa58274a7d6 (patch)
tree6503ba50d1834891df3e15ee8d4e2239656a1e45
parent68d65b1e8dbf8dedb0f620908ce05abc9db2e860 (diff)
downloadhaskell-46eb785ac81270932654bd90a5e14aa58274a7d6.tar.gz
[project @ 2001-11-28 14:29:33 by simonmar]
oops! There's a hand-written magic heap check in stg_update_PAP that I missed when I did the recent HpAlloc changes to fix the big block alloc problem. Also remove a redundant comment about LDV profiling, and a redundant #ifdef.
-rw-r--r--ghc/rts/Updates.hc13
1 files changed, 2 insertions, 11 deletions
diff --git a/ghc/rts/Updates.hc b/ghc/rts/Updates.hc
index 81f49de86f..45e00debe9 100644
--- a/ghc/rts/Updates.hc
+++ b/ghc/rts/Updates.hc
@@ -1,5 +1,5 @@
/* -----------------------------------------------------------------------------
- * $Id: Updates.hc,v 1.36 2001/11/22 14:25:12 simonmar Exp $
+ * $Id: Updates.hc,v 1.37 2001/11/28 14:29:33 simonmar Exp $
*
* (c) The GHC Team, 1998-1999
*
@@ -287,23 +287,14 @@ EXTFUN(__stg_update_PAP)
* such as removing the update frame.
*/
if ((Hp += PapSize) > HpLim) {
-#ifdef PROFILING
- // @LDV profiling
- // Not filling the slop for the object (because there is none), but
- // filling in the trailing words in the current block.
- // This is unnecessary because we fills the entire nursery with
- // zeroes after each garbage collection.
- // FILL_SLOP(HpLim, PapSize - (Hp - HpLim));
-#endif
+ HpAlloc = PapSize;
Sp -= 1;
Sp[0] = (W_)Fun;
JMP_(stg_gc_entertop);
}
TICK_ALLOC_UPD_PAP(1/*fun*/ + Words, 0);
-#ifdef PROFILING
CCS_ALLOC(CCS_pap, PapSize);
-#endif
PapClosure = (StgPAP *)(Hp + 1 - PapSize); /* The new PapClosure */