projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
stats fixes
[ghc-hetmet.git]
/
rts
/
sm
/
Scav.c-inc
diff --git
a/rts/sm/Scav.c-inc
b/rts/sm/Scav.c-inc
index
7b3a65f
..
28aa80d
100644
(file)
--- a/
rts/sm/Scav.c-inc
+++ b/
rts/sm/Scav.c-inc
@@
-1,4
+1,4
@@
-/* -----------------------------------------------------------------------------
+/* -----------------------------------------------------------------------*-c-*-
*
* (c) The GHC Team 1998-2006
*
*
* (c) The GHC Team 1998-2006
*
@@
-20,6
+20,7
@@
#else
#undef scavenge_block
#undef evacuate
#else
#undef scavenge_block
#undef evacuate
+#undef recordMutableGen_GC
#endif
static void scavenge_block (bdescr *bd, StgPtr scan);
#endif
static void scavenge_block (bdescr *bd, StgPtr scan);
@@
-43,6
+44,7
@@
scavenge_block (bdescr *bd, StgPtr scan)
StgInfoTable *info;
step *saved_evac_step;
rtsBool saved_eager_promotion;
StgInfoTable *info;
step *saved_evac_step;
rtsBool saved_eager_promotion;
+ step_workspace *ws;
p = scan;
p = scan;
@@
-54,10
+56,12
@@
scavenge_block (bdescr *bd, StgPtr scan)
saved_eager_promotion = gct->eager_promotion;
gct->failed_to_evac = rtsFalse;
saved_eager_promotion = gct->eager_promotion;
gct->failed_to_evac = rtsFalse;
+ ws = &gct->steps[bd->step->abs_no];
+
// we might be evacuating into the very object that we're
// scavenging, so we have to check the real bd->free pointer each
// time around the loop.
// we might be evacuating into the very object that we're
// scavenging, so we have to check the real bd->free pointer each
// time around the loop.
- while (p < bd->free) {
+ while (p < bd->free || (bd == ws->todo_bd && p < ws->todo_free)) {
ASSERT(LOOKS_LIKE_CLOSURE_PTR(p));
info = get_itbl((StgClosure *)p);
ASSERT(LOOKS_LIKE_CLOSURE_PTR(p));
info = get_itbl((StgClosure *)p);
@@
-462,6
+466,10
@@
scavenge_block (bdescr *bd, StgPtr scan)
}
}
}
}
+ if (p > bd->free) {
+ bd->free = p;
+ }
+
debugTrace(DEBUG_gc, " scavenged %ld bytes",
(unsigned long)((bd->free - scan) * sizeof(W_)));
}
debugTrace(DEBUG_gc, " scavenged %ld bytes",
(unsigned long)((bd->free - scan) * sizeof(W_)));
}