X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=ghc%2Frts%2FException.hc;h=31a1ae2c2ae7c57a57f60ecbfbb270608763d90c;hp=d3605bde942a3e374974d48cd4ca287c8ecfb1cb;hb=50027272414438955dbc41696541cbd25da55883;hpb=34a98f40dea6d31ced5213b7810dc39b4989c395

diff --git a/ghc/rts/Exception.hc b/ghc/rts/Exception.hc
index d3605bd..31a1ae2 100644
--- a/ghc/rts/Exception.hc
+++ b/ghc/rts/Exception.hc
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Exception.hc,v 1.15 2000/11/13 14:40:37 simonmar Exp $
+ * $Id: Exception.hc,v 1.20 2001/03/23 16:36:21 simonmar Exp $
  *
  * (c) The GHC Team, 1998-2000
  *
@@ -7,6 +7,7 @@
  *
  * ---------------------------------------------------------------------------*/
 
+#include "Stg.h"
 #include "Rts.h"
 #include "Exception.h"
 #include "Schedule.h"
@@ -75,12 +76,12 @@ FN_(stg_unblockAsyncExceptionszh_ret_entry)
     ASSERT(CurrentTSO->blocked_exceptions != NULL);
 #if defined(GRAN)
       awakenBlockedQueue(CurrentTSO->blocked_exceptions, 
-	                 CurrentTSO->block_info.closure);
+	                 (StgClosure*)NULL); 
 #elif defined(PAR)
-      // is CurrentTSO->block_info.closure always set to the node
-      // holding the blocking queue !? -- HWL
+      /* we don't need node info (2nd arg) in this case
+	 (note that CurrentTSO->block_info.closure isn't always set) */
       awakenBlockedQueue(CurrentTSO->blocked_exceptions, 
-	                 CurrentTSO->block_info.closure);
+	                 (StgClosure*)NULL); 
 #else
     awakenBlockedQueue(CurrentTSO->blocked_exceptions);
 #endif
@@ -282,8 +283,8 @@ VEC_POLY_INFO_TABLE(stg_catch_frame, CATCH_FRAME_BITMAP, NULL/*srt*/, 0/*srt_off
  * It is used in deleteThread when reverting blackholes.
  * -------------------------------------------------------------------------- */
 
-INFO_TABLE(catch_info,catch_entry,2,0,FUN,,EF_,0,0);
-STGFUN(catch_entry)
+INFO_TABLE(stg_catch_info,stg_catch_entry,2,0,FUN,,EF_,0,0);
+STGFUN(stg_catch_entry)
 {
   FB_
   R2.cl = R1.cl->payload[1]; /* h */
@@ -329,8 +330,8 @@ FN_(catchzh_fast)
  * It is used in raisezh_fast to update thunks on the update list
  * -------------------------------------------------------------------------- */
 
-INFO_TABLE(stg_raise_info,raise_entry,1,0,THUNK,,EF_,0,0);
-STGFUN(raise_entry)
+INFO_TABLE(stg_raise_info,stg_raise_entry,1,0,THUNK,,EF_,0,0);
+STGFUN(stg_raise_entry)
 {
   FB_
   R1.cl = R1.cl->payload[0];