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

[project @ 2000-09-04 15:08:42 by simonmar]
Fix a couple of bugs in the StablePtr weigthed reference counting.
---

diff --git a/ghc/rts/Stable.c b/ghc/rts/Stable.c
index bf5e6aa..56b029b 100644
--- a/ghc/rts/Stable.c
+++ b/ghc/rts/Stable.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Stable.c,v 1.11 2000/04/24 22:05:08 panne Exp $
+ * $Id: Stable.c,v 1.12 2000/09/04 15:08:42 simonmar Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -230,7 +230,7 @@ getStablePtr(StgPtr p)
   if (weight == 0) {
     weight = (StgWord)1 << (BITS_IN(StgWord)-1);
     stable_ptr_table[sn].weight = weight;
-    return (StgStablePtr)(sn + ((BITS_IN(StgWord)-1) << STABLEPTR_WEIGHT_SHIFT));
+    return (StgStablePtr)(sn + (BITS_IN(StgWord) << STABLEPTR_WEIGHT_SHIFT));
   } 
   else if (weight == 1) {
     barf("getStablePtr: too light");
@@ -241,7 +241,7 @@ getStablePtr(StgPtr p)
     for (weight_2 = 1; weight != 1; weight_2++) {
       weight >>= 1;
     }
-    stable_ptr_table[sn].weight -= 2^weight_2;
+    stable_ptr_table[sn].weight -= 1 << (weight_2 - 1);
     return (StgStablePtr)(sn + (weight_2 << STABLEPTR_WEIGHT_SHIFT));
   }
 }