From: simonmar <unknown>
Date: Thu, 17 Mar 2005 13:16:55 +0000 (+0000)
Subject: [project @ 2005-03-17 13:16:55 by simonmar]
X-Git-Tag: Initial_conversion_from_CVS_complete~889
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=b71926a46df2421f8d0927f188c7e2d28a141b9d;p=ghc-hetmet.git

[project @ 2005-03-17 13:16:55 by simonmar]
Fix a few CCCS that should be W_[CCCS] that I just noticed.  I suspect
that heap-profiling STM code might run into difficulties in 6.4.
---

diff --git a/ghc/rts/PrimOps.cmm b/ghc/rts/PrimOps.cmm
index 1a944ed..3ddb2bc 100644
--- a/ghc/rts/PrimOps.cmm
+++ b/ghc/rts/PrimOps.cmm
@@ -1141,7 +1141,7 @@ atomicallyzh_fast
   Sp = Sp - SIZEOF_StgAtomicallyFrame;
   frame = Sp;
 
-  SET_HDR(frame,stg_atomically_frame_info,CCCS);
+  SET_HDR(frame,stg_atomically_frame_info, W_[CCCS]);
   StgAtomicallyFrame_waiting(frame) = 0 :: CInt; // False
   StgAtomicallyFrame_code(frame) = R1;
 
@@ -1168,7 +1168,7 @@ catchSTMzh_fast
   Sp = Sp - SIZEOF_StgCatchSTMFrame;
   frame = Sp;
 
-  SET_HDR(frame, stg_catch_stm_frame_info, CCCS);
+  SET_HDR(frame, stg_catch_stm_frame_info, W_[CCCS]);
   StgCatchSTMFrame_handler(frame) = R2;
 
   /* Apply R1 to the realworld token */
@@ -1196,7 +1196,7 @@ catchRetryzh_fast
   Sp = Sp - SIZEOF_StgCatchRetryFrame;
   frame = Sp;
   
-  SET_HDR(frame, stg_catch_retry_frame_info, CCCS);
+  SET_HDR(frame, stg_catch_retry_frame_info, W_[CCCS]);
   StgCatchRetryFrame_running_alt_code(frame) = 0 :: CInt; // false;
   StgCatchRetryFrame_first_code(frame) = R1;
   StgCatchRetryFrame_alt_code(frame) = R2;