diff options
| author | Sergei Trofimovich <siarheit@google.com> | 2016-03-11 22:31:58 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <siarheit@google.com> | 2016-03-11 23:19:47 +0000 |
| commit | e46742f5c51938bc7c992ac37fecc6df8cab7647 (patch) | |
| tree | 2170df7cc8257e8c0d139633c0c25af3c4a4f829 | |
| parent | 2f45cf3f48162a5f843005755dafa1c5c1b451a7 (diff) | |
| download | haskell-e46742f5c51938bc7c992ac37fecc6df8cab7647.tar.gz | |
rts: fix threadStackUnderflow type in cmm
stg_stack_underflow_frame had an incorrect
call of C function 'threadStackUnderflow':
("ptr" ret_off) =
foreign "C" threadStackUnderflow(
MyCapability(),
CurrentTSO);
Which means it's prototype is:
void * (*) (W_, void*);
While real prototype is:
W_ (*) (Capability *cap, StgTSO *tso);
The fix is simple. Fix type annotations:
(ret_off) =
foreign "C" threadStackUnderflow(
MyCapability() "ptr",
CurrentTSO "ptr");
Noticed when debugged T9045 test failure
on m68k target which distincts between
pointer and non pointer return types
(uses different registers)
While at it noticed and fixed return types
for 'throwTo' and 'findSpark'.
Trac #11395
Signed-off-by: Sergei Trofimovich <siarheit@google.com>
| -rw-r--r-- | rts/Exception.cmm | 2 | ||||
| -rw-r--r-- | rts/PrimOps.cmm | 2 | ||||
| -rw-r--r-- | rts/StgMiscClosures.cmm | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/rts/Exception.cmm b/rts/Exception.cmm index a89bd19eb3..2a07eaa6f3 100644 --- a/rts/Exception.cmm +++ b/rts/Exception.cmm @@ -307,7 +307,7 @@ stg_killThreadzh (P_ target, P_ exception) } else { W_ msg; - (msg) = ccall throwTo(MyCapability() "ptr", + ("ptr" msg) = ccall throwTo(MyCapability() "ptr", CurrentTSO "ptr", target "ptr", exception "ptr"); diff --git a/rts/PrimOps.cmm b/rts/PrimOps.cmm index 7add8357ca..a802e6780e 100644 --- a/rts/PrimOps.cmm +++ b/rts/PrimOps.cmm @@ -2344,7 +2344,7 @@ stg_getSparkzh () #ifndef THREADED_RTS return (0,ghczmprim_GHCziTypes_False_closure); #else - (spark) = ccall findSpark(MyCapability()); + ("ptr" spark) = ccall findSpark(MyCapability() "ptr"); if (spark != 0) { return (1,spark); } else { diff --git a/rts/StgMiscClosures.cmm b/rts/StgMiscClosures.cmm index 757730e5fa..905f81ec2e 100644 --- a/rts/StgMiscClosures.cmm +++ b/rts/StgMiscClosures.cmm @@ -32,8 +32,8 @@ INFO_TABLE_RET (stg_stack_underflow_frame, UNDERFLOW_FRAME, SAVE_STGREGS SAVE_THREAD_STATE(); - ("ptr" ret_off) = foreign "C" threadStackUnderflow(MyCapability(), - CurrentTSO); + (ret_off) = foreign "C" threadStackUnderflow(MyCapability() "ptr", + CurrentTSO); LOAD_THREAD_STATE(); RESTORE_STGREGS |