projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
26b80e2
)
remove old comments and commented-out code
author
Simon Marlow
<simonmar@microsoft.com>
Fri, 18 May 2007 12:23:33 +0000
(12:23 +0000)
committer
Simon Marlow
<simonmar@microsoft.com>
Fri, 18 May 2007 12:23:33 +0000
(12:23 +0000)
rts/Exception.cmm
patch
|
blob
|
history
diff --git
a/rts/Exception.cmm
b/rts/Exception.cmm
index
ec56738
..
5f6bd07
100644
(file)
--- a/
rts/Exception.cmm
+++ b/
rts/Exception.cmm
@@
-43,10
+43,7
@@
unsafePerformIO thunk will be updated with a stack object
containing the unblockAsyncExceptions_ret frame. Later, when
someone else evaluates this thunk, the blocked exception state is
unsafePerformIO thunk will be updated with a stack object
containing the unblockAsyncExceptions_ret frame. Later, when
someone else evaluates this thunk, the blocked exception state is
- not restored, and the result is that unblockAsyncExceptions_ret
- will attempt to unblock exceptions in the current thread, but it'll
- find that the CurrentTSO->blocked_exceptions is NULL. Hence, we
- work around this by checking for NULL in awakenBlockedQueue().
+ not restored.
-------------------------------------------------------------------------- */
-------------------------------------------------------------------------- */
@@
-55,9
+52,6
@@
INFO_TABLE_RET( stg_unblockAsyncExceptionszh_ret,
{
CInt r;
{
CInt r;
- // Not true: see comments above
- // ASSERT(StgTSO_blocked_exceptions(CurrentTSO) != NULL);
-
StgTSO_flags(CurrentTSO) = StgTSO_flags(CurrentTSO) &
~(TSO_BLOCKEX::I32|TSO_INTERRUPTIBLE::I32);
StgTSO_flags(CurrentTSO) = StgTSO_flags(CurrentTSO) &
~(TSO_BLOCKEX::I32|TSO_INTERRUPTIBLE::I32);
@@
-115,9
+109,6
@@
INFO_TABLE_RET( stg_unblockAsyncExceptionszh_ret,
INFO_TABLE_RET( stg_blockAsyncExceptionszh_ret,
0/*framesize*/, 0/*bitmap*/, RET_SMALL )
{
INFO_TABLE_RET( stg_blockAsyncExceptionszh_ret,
0/*framesize*/, 0/*bitmap*/, RET_SMALL )
{
- // Not true: see comments above
- // ASSERT(StgTSO_blocked_exceptions(CurrentTSO) == NULL);
-
StgTSO_flags(CurrentTSO) =
StgTSO_flags(CurrentTSO) | TSO_BLOCKEX::I32 | TSO_INTERRUPTIBLE::I32;
StgTSO_flags(CurrentTSO) =
StgTSO_flags(CurrentTSO) | TSO_BLOCKEX::I32 | TSO_INTERRUPTIBLE::I32;