X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FStable.c;h=94a756a380e99de025f360dce2c889a038f9da51;hb=8aaa9ef471cadbc79fca58b234b198065f650dcf;hp=a6b8ddf7381a0291219d6a583674d5e1d762079c;hpb=ddd8dea08710d6ddefb40d7fb216080119bf3bbf;p=ghc-hetmet.git

diff --git a/rts/Stable.c b/rts/Stable.c
index a6b8ddf..94a756a 100644
--- a/rts/Stable.c
+++ b/rts/Stable.c
@@ -6,9 +6,6 @@
  *
  * ---------------------------------------------------------------------------*/
 
-// Make static versions of inline functions in Stable.h:
-#define RTS_STABLE_C
-
 #include "PosixSource.h"
 #include "Rts.h"
 #include "Hash.h"
@@ -218,6 +215,9 @@ lookupStableName_(StgPtr p)
    */
   p = (StgPtr)removeIndirections((StgClosure*)p);
 
+  // register the untagged pointer.  This just makes things simpler.
+  p = (StgPtr)UNTAG_CLOSURE((StgClosure*)p);
+
   sn_tmp = lookupHashTable(addrToStableHash,(W_)p);
   sn = (StgWord)sn_tmp;
   
@@ -323,7 +323,7 @@ enlargeStablePtrTable(void)
  * -------------------------------------------------------------------------- */
 
 void
-markStablePtrTable(evac_fn evac)
+markStablePtrTable(evac_fn evac, void *user)
 {
     snEntry *p, *end_stable_ptr_table;
     StgPtr q;
@@ -347,7 +347,7 @@ markStablePtrTable(evac_fn evac)
 
 	    // if the ref is non-zero, treat addr as a root
 	    if (p->ref != 0) {
-		evac((StgClosure **)&p->addr);
+		evac(user, (StgClosure **)&p->addr);
 	    }
 	}
     }
@@ -362,7 +362,7 @@ markStablePtrTable(evac_fn evac)
  * -------------------------------------------------------------------------- */
 
 void
-threadStablePtrTable( evac_fn evac )
+threadStablePtrTable( evac_fn evac, void *user )
 {
     snEntry *p, *end_stable_ptr_table;
     StgPtr q;
@@ -372,12 +372,12 @@ threadStablePtrTable( evac_fn evac )
     for (p = stable_ptr_table+1; p < end_stable_ptr_table; p++) {
 	
 	if (p->sn_obj != NULL) {
-	    evac((StgClosure **)&p->sn_obj);
+	    evac(user, (StgClosure **)&p->sn_obj);
 	}
 
 	q = p->addr;
 	if (q && (q < (P_)stable_ptr_table || q >= (P_)end_stable_ptr_table)) {
-	    evac((StgClosure **)&p->addr);
+	    evac(user, (StgClosure **)&p->addr);
 	}
     }
 }