projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge up to ghc HEAD 16-Apr-2011
[ghc-hetmet.git]
/
rts
/
sm
/
GCAux.c
diff --git
a/rts/sm/GCAux.c
b/rts/sm/GCAux.c
index
f69c81d
..
12e106b
100644
(file)
--- a/
rts/sm/GCAux.c
+++ b/
rts/sm/GCAux.c
@@
-17,7
+17,7
@@
#include "Capability.h"
#include "Trace.h"
#include "Schedule.h"
#include "Capability.h"
#include "Trace.h"
#include "Schedule.h"
-// DO NOT include "GCThread.h", we don't want the register variable
+// DO NOT include "GCTDecl.h", we don't want the register variable
/* -----------------------------------------------------------------------------
isAlive determines whether the given closure is still alive (after
/* -----------------------------------------------------------------------------
isAlive determines whether the given closure is still alive (after
@@
-67,12
+67,7
@@
isAlive(StgClosure *p)
// large objects use the evacuated flag
if (bd->flags & BF_LARGE) {
// large objects use the evacuated flag
if (bd->flags & BF_LARGE) {
- if (get_itbl(q)->type == TSO &&
- ((StgTSO *)p)->what_next == ThreadRelocated) {
- p = (StgClosure *)((StgTSO *)p)->_link;
- continue;
- }
- return NULL;
+ return NULL;
}
// check the mark bit for compacted steps
}
// check the mark bit for compacted steps
@@
-84,7
+79,7
@@
isAlive(StgClosure *p)
if (IS_FORWARDING_PTR(info)) {
// alive!
if (IS_FORWARDING_PTR(info)) {
// alive!
- return (StgClosure*)UN_FORWARDING_PTR(info);
+ return TAG_CLOSURE(tag,(StgClosure*)UN_FORWARDING_PTR(info));
}
info = INFO_PTR_TO_STRUCT(info);
}
info = INFO_PTR_TO_STRUCT(info);
@@
-98,13
+93,6
@@
isAlive(StgClosure *p)
p = ((StgInd *)q)->indirectee;
continue;
p = ((StgInd *)q)->indirectee;
continue;
- case TSO:
- if (((StgTSO *)q)->what_next == ThreadRelocated) {
- p = (StgClosure *)((StgTSO *)q)->_link;
- continue;
- }
- return NULL;
-
default:
// dead.
return NULL;
default:
// dead.
return NULL;