Merge branch 'master' of ssh://git.haskell.org/ghc
[ghc.git] / rts / sm / GCAux.c
index 404e9bb..13316e4 100644 (file)
@@ -2,7 +2,7 @@
  *
  * (c) The GHC Team 1998-2008
  *
- * Functions called from outside the GC need to be separate from GC.c, 
+ * Functions called from outside the GC need to be separate from GC.c,
  * because GC.c is compiled with register variable(s).
  *
  * ---------------------------------------------------------------------------*/
@@ -17,7 +17,7 @@
 #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
@@ -43,44 +43,43 @@ isAlive(StgClosure *p)
 
     ASSERT(LOOKS_LIKE_CLOSURE_PTR(q));
 
-    // ignore static closures 
+    // ignore static closures
+    //
+    // ToDo: This means we never look through IND_STATIC, which means
+    // isRetainer needs to handle the IND_STATIC case rather than
+    // raising an error.
     //
     // ToDo: for static closures, check the static link field.
     // Problem here is that we sometimes don't set the link field, eg.
     // for static closures with an empty SRT or CONSTR_STATIC_NOCAFs.
     //
     if (!HEAP_ALLOCED_GC(q)) {
-       return p;
+        return p;
     }
 
-    // ignore closures in generations that we're not collecting. 
+    // ignore closures in generations that we're not collecting.
     bd = Bdescr((P_)q);
 
     // if it's a pointer into to-space, then we're done
     if (bd->flags & BF_EVACUATED) {
-       return p;
+        return p;
     }
 
     // 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
     if ((bd->flags & BF_MARKED) && is_marked((P_)q,bd)) {
-       return p;
+        return p;
     }
 
     info = q->header.info;
 
     if (IS_FORWARDING_PTR(info)) {
-        // alive! 
-        return (StgClosure*)UN_FORWARDING_PTR(info);
+        // alive!
+        return TAG_CLOSURE(tag,(StgClosure*)UN_FORWARDING_PTR(info));
     }
 
     info = INFO_PTR_TO_STRUCT(info);
@@ -90,21 +89,20 @@ isAlive(StgClosure *p)
     case IND:
     case IND_STATIC:
     case IND_PERM:
-    case IND_OLDGEN:           // rely on compatible layout with StgInd 
-    case IND_OLDGEN_PERM:
-      // follow indirections 
+      // follow indirections
       p = ((StgInd *)q)->indirectee;
       continue;
 
-    case TSO:
-      if (((StgTSO *)q)->what_next == ThreadRelocated) {
-       p = (StgClosure *)((StgTSO *)q)->_link;
-       continue;
-      } 
-      return NULL;
+    case BLACKHOLE:
+        p = ((StgInd*)q)->indirectee;
+        if (GET_CLOSURE_TAG(p) != 0) {
+            continue;
+        } else {
+            return NULL;
+        }
 
     default:
-      // dead. 
+      // dead.
       return NULL;
     }
   }
@@ -119,14 +117,15 @@ revertCAFs( void )
 {
     StgIndStatic *c;
 
-    for (c = (StgIndStatic *)revertible_caf_list; c != NULL; 
-        c = (StgIndStatic *)c->static_link) 
+    for (c = revertible_caf_list;
+         c != (StgIndStatic *)END_OF_STATIC_LIST;
+         c = (StgIndStatic *)c->static_link)
     {
-       SET_INFO(c, c->saved_info);
-       c->saved_info = NULL;
-       // could, but not necessary: c->static_link = NULL; 
+        SET_INFO((StgClosure *)c, c->saved_info);
+        c->saved_info = NULL;
+        // could, but not necessary: c->static_link = NULL;
     }
-    revertible_caf_list = NULL;
+    revertible_caf_list = (StgIndStatic*)END_OF_STATIC_LIST;
 }
 
 void
@@ -134,14 +133,16 @@ markCAFs (evac_fn evac, void *user)
 {
     StgIndStatic *c;
 
-    for (c = (StgIndStatic *)caf_list; c != NULL; 
-        c = (StgIndStatic *)c->static_link) 
+    for (c = dyn_caf_list;
+         c != (StgIndStatic*)END_OF_STATIC_LIST;
+         c = (StgIndStatic *)c->static_link)
     {
-       evac(user, &c->indirectee);
+        evac(user, &c->indirectee);
     }
-    for (c = (StgIndStatic *)revertible_caf_list; c != NULL; 
-        c = (StgIndStatic *)c->static_link) 
+    for (c = revertible_caf_list;
+         c != (StgIndStatic*)END_OF_STATIC_LIST;
+         c = (StgIndStatic *)c->static_link)
     {
-       evac(user, &c->indirectee);
+        evac(user, &c->indirectee);
     }
 }