[project @ 2005-03-17 13:14:59 by simonmar]

[ghc-hetmet.git] / ghc / rts / Exception.cmm

diff --git a/ghc/rts/Exception.cmm b/ghc/rts/Exception.cmm
index e8cd4cd..edabf54 100644 (file)
--- a/ghc/rts/Exception.cmm
+++ b/ghc/rts/Exception.cmm
@@ -210,8 +210,7 @@ killThreadzh_fast
    {                                           \
       W_ rval;                                 \
       rval = Sp(0);                            \
-      Sp_adj(1);                               \
-      Sp = Sp + SIZEOF_StgCatchFrame - WDS(1);  \
+      Sp = Sp + SIZEOF_StgCatchFrame;          \
       Sp(0) = rval;                            \
       jump ret;                                        \
    }
@@ -286,7 +285,7 @@ catchzh_fast
   
     /* Set up the catch frame */
     Sp = Sp - SIZEOF_StgCatchFrame;
-    SET_HDR(Sp,stg_catch_frame_info,CCCS);
+    SET_HDR(Sp,stg_catch_frame_info,W_[CCCS]);
     
     StgCatchFrame_handler(Sp) = R2;
     StgCatchFrame_exceptions_blocked(Sp) = 
@@ -331,7 +330,7 @@ raisezh_fast
      * the info was only displayed for an *uncaught* exception.
      */
     if (RtsFlags_ProfFlags_showCCSOnException(RtsFlags)) {
-      foreign "C" fprintCCS(stderr,CCCS);
+      foreign "C" fprintCCS(stderr,W_[CCCS]);
     }
 #endif