From: simonmar <unknown>
Date: Mon, 4 Sep 2000 15:17:03 +0000 (+0000)
Subject: [project @ 2000-09-04 15:17:03 by simonmar]
X-Git-Tag: Approximately_9120_patches~3805
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=c3ddb90bbe44f8cfce239859fb7f5519b54aef7a;hp=4c0ca9cf79b66fb6048b409e80b5868366358cdb;p=ghc-hetmet.git

[project @ 2000-09-04 15:17:03 by simonmar]
- debugging: print weights as unsigned
- clean up getStablePtr a bit
- correct a comment
---

diff --git a/ghc/rts/Stable.c b/ghc/rts/Stable.c
index 56b029b..5b2635b 100644
--- a/ghc/rts/Stable.c
+++ b/ghc/rts/Stable.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Stable.c,v 1.12 2000/09/04 15:08:42 simonmar Exp $
+ * $Id: Stable.c,v 1.13 2000/09/04 15:17:03 simonmar Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -107,7 +107,7 @@ unsigned int SPT_size;
  *
  * A stable pointer has a weighted reference count N attached to it
  * (actually in its upper 5 bits), which represents the weight
- * 2^N.  The stable name entry keeps a 32-bit reference count, which
+ * 2^(N-1).  The stable name entry keeps a 32-bit reference count, which
  * represents any weight between 1 and 2^32 (represented as zero).
  * When the weight is 2^32, the stable name table owns "all" of the
  * stable pointers to this object, and the entry can be garbage
@@ -225,7 +225,7 @@ StgStablePtr
 getStablePtr(StgPtr p)
 {
   StgWord sn = lookupStableName(p);
-  StgWord weight, weight_2;
+  StgWord weight, n;
   weight = stable_ptr_table[sn].weight;
   if (weight == 0) {
     weight = (StgWord)1 << (BITS_IN(StgWord)-1);
@@ -238,11 +238,11 @@ getStablePtr(StgPtr p)
   else {
     weight /= 2;
     /* find log2(weight) */
-    for (weight_2 = 1; weight != 1; weight_2++) {
+    for (n = 0; weight != 1; n++) {
       weight >>= 1;
     }
-    stable_ptr_table[sn].weight -= 1 << (weight_2 - 1);
-    return (StgStablePtr)(sn + (weight_2 << STABLEPTR_WEIGHT_SHIFT));
+    stable_ptr_table[sn].weight -= 1 << n;
+    return (StgStablePtr)(sn + ((n+1) << STABLEPTR_WEIGHT_SHIFT));
   }
 }
 
@@ -322,7 +322,7 @@ markStablePtrTable(rtsBool full)
 	  }
 	  (StgClosure *)p->addr = new;
 	}
-	IF_DEBUG(stable, fprintf(stderr,"Stable ptr %d still alive at %p, weight %d\n", p - stable_ptr_table, new, p->weight));
+	IF_DEBUG(stable, fprintf(stderr,"Stable ptr %d still alive at %p, weight %u\n", p - stable_ptr_table, new, p->weight));
       }
     }
   }