projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2002-11-01 11:17:29 by simonmar]
[ghc-hetmet.git]
/
ghc
/
rts
/
Exception.hc
diff --git
a/ghc/rts/Exception.hc
b/ghc/rts/Exception.hc
index
e59cad9
..
81c1c36
100644
(file)
--- a/
ghc/rts/Exception.hc
+++ b/
ghc/rts/Exception.hc
@@
-1,5
+1,5
@@
/* -----------------------------------------------------------------------------
/* -----------------------------------------------------------------------------
- * $Id: Exception.hc,v 1.24 2002/02/28 18:44:28 sof Exp $
+ * $Id: Exception.hc,v 1.25 2002/04/23 06:34:26 sof Exp $
*
* (c) The GHC Team, 1998-2000
*
*
* (c) The GHC Team, 1998-2000
*
@@
-191,7
+191,7
@@
FN_(killThreadzh_fast)
*/
if (R1.t == CurrentTSO) {
SaveThreadState(); /* inline! */
*/
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);
if (CurrentTSO->what_next == ThreadKilled) {
R1.w = ThreadFinished;
JMP_(StgReturn);
@@
-205,7
+205,7
@@
FN_(killThreadzh_fast)
barf("killThreadzh_fast");
}
} else {
barf("killThreadzh_fast");
}
} else {
- STGCALL2(raiseAsync, R1.t, R2.cl);
+ STGCALL2(raiseAsyncWithLock, R1.t, R2.cl);
}
JMP_(ENTRY_CODE(Sp[0]));
}
JMP_(ENTRY_CODE(Sp[0]));