X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FPrimOps.cmm;h=2d306f69c098a5abf694fe03e6339b256d8c90c2;hb=02251fd0db14cb1e494a36544cb6f1e6208b121f;hp=42ae582a406b3487b5667196b1470f7ece63322d;hpb=ec0984a97cec59d0403ae1f23e23f100666e8148;p=ghc-hetmet.git

diff --git a/ghc/rts/PrimOps.cmm b/ghc/rts/PrimOps.cmm
index 42ae582..2d306f6 100644
--- a/ghc/rts/PrimOps.cmm
+++ b/ghc/rts/PrimOps.cmm
@@ -289,7 +289,7 @@ mkWeakzh_fast
   StgWeak_link(w)	= W_[weak_ptr_list];
   W_[weak_ptr_list] 	= w;
 
-  IF_DEBUG(weak, foreign "C" fprintf(stderr,stg_weak_msg,w));
+  IF_DEBUG(weak, foreign "C" fprintf(W_[stderr] "ptr",stg_weak_msg,w));
 
   RET_P(w);
 }
@@ -1673,15 +1673,15 @@ makeStableNamezh_fast
     index = foreign "C" lookupStableName(R1 "ptr");
 
     /* Is there already a StableName for this heap object?
-     *  stable_ptr_table is an array of snEntry structs.
+     *  stable_ptr_table is a pointer to an array of snEntry structs.
      */
-    if ( snEntry_sn_obj(stable_ptr_table + index*SIZEOF_snEntry) == NULL ) {
+    if ( snEntry_sn_obj(W_[stable_ptr_table] + index*SIZEOF_snEntry) == NULL ) {
 	sn_obj = Hp - SIZEOF_StgStableName + WDS(1);
 	SET_HDR(sn_obj, stg_STABLE_NAME_info, W_[CCCS]);
 	StgStableName_sn(sn_obj) = index;
-	snEntry_sn_obj(stable_ptr_table + index*SIZEOF_snEntry) = sn_obj;
+	snEntry_sn_obj(W_[stable_ptr_table] + index*SIZEOF_snEntry) = sn_obj;
     } else {
-	sn_obj = snEntry_sn_obj(stable_ptr_table + index*SIZEOF_snEntry);
+	sn_obj = snEntry_sn_obj(W_[stable_ptr_table] + index*SIZEOF_snEntry);
     }
     
     RET_P(sn_obj);
@@ -1702,7 +1702,7 @@ deRefStablePtrzh_fast
     /* Args: R1 = the stable ptr */
     W_ r, sp;
     sp = R1;
-    r = snEntry_addr(stable_ptr_table + sp*SIZEOF_snEntry);
+    r = snEntry_addr(W_[stable_ptr_table] + sp*SIZEOF_snEntry);
     RET_P(r);
 }