diff options
| author | Kwok Cheung Yeung <kcy@codesourcery.com> | 2013-05-17 14:51:21 -0700 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2013-05-20 18:16:17 +0200 |
| commit | 1239b472bb0dba8060f1af29d40dafbc1b2860d4 (patch) | |
| tree | 6e2d54f5a06b03a0d274af56cbda5ccb180eeb96 /linux-user | |
| parent | ea3164aafccdfdd8a9543787cdfa25fac30a5def (diff) | |
linux-user: Save the correct resume address for MIPS signal handling
The current ISA mode needs to be saved in bit 0 of the resume address.
If the current instruction happens to be in a branch delay slot, then
the address of the preceding jump instruction should be stored instead.
exception_resume_pc already does both of these tasks, so it is
made available and reused.
MIPS_HFLAG_BMASK in hflags is cleared, otherwise QEMU may treat the
first instruction of the signal handler as a delay slot instruction.
Signed-off-by: Kwok Cheung Yeung <kcy@codesourcery.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Diffstat (limited to 'linux-user')
| -rw-r--r-- | linux-user/signal.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linux-user/signal.c b/linux-user/signal.c index dc34ae7bbb..5da8452b2a 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -2528,7 +2528,8 @@ setup_sigcontext(CPUMIPSState *regs, struct target_sigcontext *sc) int err = 0; int i; - err |= __put_user(regs->active_tc.PC, &sc->sc_pc); + err |= __put_user(exception_resume_pc(regs), &sc->sc_pc); + regs->hflags &= ~MIPS_HFLAG_BMASK; __put_user(0, &sc->sc_regs[0]); for (i = 1; i < 32; ++i) { |