projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove non-boring directories
[ghc-hetmet.git]
/
rts
/
Exception.cmm
diff --git
a/rts/Exception.cmm
b/rts/Exception.cmm
index
6e656e0
..
0c1b664
100644
(file)
--- a/
rts/Exception.cmm
+++ b/
rts/Exception.cmm
@@
-123,6
+123,9
@@
unblockAsyncExceptionszh_fast
foreign "C" awakenBlockedExceptionQueue(MyCapability() "ptr",
CurrentTSO "ptr") [R1];
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);
/* avoid growing the stack unnecessarily */
if (Sp(0) == stg_unblockAsyncExceptionszh_ret_info) {
Sp_adj(1);
@@
-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.
*/
/* 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) != 0) {
+ if (RtsFlags_ProfFlags_showCCSOnException(RtsFlags) != 0::I32) {
foreign "C" fprintCCS_stderr(W_[CCCS] "ptr");
}
#endif
foreign "C" fprintCCS_stderr(W_[CCCS] "ptr");
}
#endif