[project @ 2002-04-23 06:34:26 by sof]

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

diff --git a/ghc/rts/Exception.hc b/ghc/rts/Exception.hc
index 817d6c2..81c1c36 100644 (file)
--- a/ghc/rts/Exception.hc
+++ b/ghc/rts/Exception.hc
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Exception.hc,v 1.23 2001/12/05 17:35:15 sewardj Exp $
+ * $Id: Exception.hc,v 1.25 2002/04/23 06:34:26 sof Exp $
  *
  * (c) The GHC Team, 1998-2000
  *
@@ -191,7 +191,7 @@ FN_(killThreadzh_fast)
    */
   if (R1.t == CurrentTSO) {
        SaveThreadState();      /* inline! */
-       STGCALL2(raiseAsync, R1.t, R2.cl);
+       STGCALL2(raiseAsyncWithLock, R1.t, R2.cl);
        if (CurrentTSO->what_next == ThreadKilled) {
                R1.w = ThreadFinished;
                JMP_(StgReturn);
@@ -205,7 +205,7 @@ FN_(killThreadzh_fast)
                barf("killThreadzh_fast");
        }
   } else {
-       STGCALL2(raiseAsync, R1.t, R2.cl);
+       STGCALL2(raiseAsyncWithLock, R1.t, R2.cl);
   }
 
   JMP_(ENTRY_CODE(Sp[0]));
@@ -213,16 +213,6 @@ FN_(killThreadzh_fast)
 }
 
 
-FN_(myThreadIdzh_fast)
-{
-  /* no args. */
-  FB_
-  R1.p = (P_)CurrentTSO;
-  JMP_(ENTRY_CODE(Sp[0]));
-  FE_
-}
-
-
 /* -----------------------------------------------------------------------------
    Catch frames
    -------------------------------------------------------------------------- */