X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=rts%2FException.cmm;h=0c1b6648d5c89c5bf1313f4ee3343b55bdd4bfe1;hp=f4327b9ce24aab743331294ba5708b6f81d692c8;hb=143f4381d242e4a1c3174e8a0732a1e48f00a1aa;hpb=b1953bbb1ed3cb16497e5447db7487f0c2d9e41a

diff --git a/rts/Exception.cmm b/rts/Exception.cmm
index f4327b9..0c1b664 100644
--- a/rts/Exception.cmm
+++ b/rts/Exception.cmm
@@ -119,10 +119,13 @@ unblockAsyncExceptionszh_fast
     /* Args: R1 :: IO a */
     STK_CHK_GEN( WDS(2), R1_PTR, unblockAsyncExceptionszh_fast);
 
-    if (TO_W_(StgTSO_flags(CurrentTSO)) & TSO_BLOCKEX) {
+    if ((TO_W_(StgTSO_flags(CurrentTSO)) & TSO_BLOCKEX) != 0) {
 	foreign "C" awakenBlockedExceptionQueue(MyCapability() "ptr", 
 						CurrentTSO "ptr") [R1];
 
+	StgTSO_flags(CurrentTSO) = StgTSO_flags(CurrentTSO) & 
+	   ~(TSO_BLOCKEX::I32|TSO_INTERRUPTIBLE::I32);
+
 	/* avoid growing the stack unnecessarily */
 	if (Sp(0) == stg_unblockAsyncExceptionszh_ret_info) {
 	    Sp_adj(1);
@@ -148,7 +151,7 @@ killThreadzh_fast
     target = R1;
     exception = R2;
     
-    STK_CHK_GEN( WDS(3), R1_PTR | R2_PTR, killThreadzh_fast);
+    STK_CHK_GEN( WDS(3), R1_PTR & R2_PTR, killThreadzh_fast);
 
     /* 
      * We might have killed ourselves.  In which case, better be *very*
@@ -329,7 +332,7 @@ raisezh_fast
     /* ToDo: currently this is a hack.  Would be much better if
      * the info was only displayed for an *uncaught* exception.
      */
-    if (RtsFlags_ProfFlags_showCCSOnException(RtsFlags)) {
+    if (RtsFlags_ProfFlags_showCCSOnException(RtsFlags) != 0::I32) {
       foreign "C" fprintCCS_stderr(W_[CCCS] "ptr");
     }
 #endif
@@ -348,7 +351,7 @@ retry_pop_stack:
       r = foreign "C" stmValidateNestOfTransactions(trec "ptr");
       foreign "C" stmAbortTransaction(MyCapability() "ptr", trec "ptr");
       StgTSO_trec(CurrentTSO) = NO_TREC;
-      if (r) {
+      if (r != 0) {
         // Transaction was valid: continue searching for a catch frame
         Sp = Sp + SIZEOF_StgAtomicallyFrame;
         goto retry_pop_stack;