diff options
| author | Shenghou Ma <minux.ma@gmail.com> | 2013-05-27 20:46:53 +0800 |
|---|---|---|
| committer | Shenghou Ma <minux.ma@gmail.com> | 2013-05-27 20:46:53 +0800 |
| commit | ae73b903696981ae3c4da203a3ea4e083e401b46 (patch) | |
| tree | 1521e38d5a024d9db96e60a3946c13034c93faa2 /src/pkg/runtime | |
| parent | 5782f4117dcb4c8fc40f8110a57ac531a2abdb99 (diff) | |
| download | go-ae73b903696981ae3c4da203a3ea4e083e401b46.tar.xz | |
runtime: make arm signal handler call runtime.badsignal
In preparation for CL 9249043 (already submitted).
Fixes #5553.
R=golang-dev, iant, capnm9, dave
CC=golang-dev
https://golang.org/cl/9251043
Diffstat (limited to 'src/pkg/runtime')
| -rw-r--r-- | src/pkg/runtime/sys_freebsd_arm.s | 7 | ||||
| -rw-r--r-- | src/pkg/runtime/sys_linux_arm.s | 7 | ||||
| -rw-r--r-- | src/pkg/runtime/sys_netbsd_arm.s | 7 |
3 files changed, 18 insertions, 3 deletions
diff --git a/src/pkg/runtime/sys_freebsd_arm.s b/src/pkg/runtime/sys_freebsd_arm.s index 5531936ffd..e59fb72d08 100644 --- a/src/pkg/runtime/sys_freebsd_arm.s +++ b/src/pkg/runtime/sys_freebsd_arm.s @@ -154,12 +154,17 @@ TEXT runtime·sigtramp(SB),7,$24 // this might be called in external code context, // where g and m are not set. // first save R0, because _cgo_load_gm will clobber it - // TODO(adonovan): call runtime·badsignal if m=0, like other platforms? MOVW R0, 4(R13) // signum MOVW _cgo_load_gm(SB), R0 CMP $0, R0 BL.NE (R0) + CMP $0, m + BNE 3(PC) + // signal number is already prepared in 4(R13) + BL runtime·badsignal(SB) + RET + // save g MOVW R10, R4 MOVW R10, 20(R13) diff --git a/src/pkg/runtime/sys_linux_arm.s b/src/pkg/runtime/sys_linux_arm.s index 7f813482d1..ffcb1ec69a 100644 --- a/src/pkg/runtime/sys_linux_arm.s +++ b/src/pkg/runtime/sys_linux_arm.s @@ -286,12 +286,17 @@ TEXT runtime·sigtramp(SB),7,$24 // this might be called in external code context, // where g and m are not set. // first save R0, because _cgo_load_gm will clobber it - // TODO(adonovan): call runtime·badsignal if m=0, like other platforms? MOVW R0, 4(R13) MOVW _cgo_load_gm(SB), R0 CMP $0, R0 BL.NE (R0) + CMP $0, m + BNE 3(PC) + // signal number is already prepared in 4(R13) + BL runtime·badsignal(SB) + RET + // save g MOVW g, R3 MOVW g, 20(R13) diff --git a/src/pkg/runtime/sys_netbsd_arm.s b/src/pkg/runtime/sys_netbsd_arm.s index 3ff335f4df..2f2052bd37 100644 --- a/src/pkg/runtime/sys_netbsd_arm.s +++ b/src/pkg/runtime/sys_netbsd_arm.s @@ -201,12 +201,17 @@ TEXT runtime·sigtramp(SB),7,$24 // this might be called in external code context, // where g and m are not set. // first save R0, because _cgo_load_gm will clobber it - // TODO(adonovan): call runtime·badsignal if m=0, like other platforms? MOVW R0, 4(R13) // signum MOVW _cgo_load_gm(SB), R0 CMP $0, R0 BL.NE (R0) + CMP $0, m + BNE 3(PC) + // signal number is already prepared in 4(R13) + BL runtime·badsignal(SB) + RET + // save g MOVW R10, R4 MOVW R10, 20(R13) |