diff options
| author | Timothy E Baldwin <T.E.Baldwin99@members.leeds.ac.uk> | 2016-05-12 18:47:34 +0100 |
|---|---|---|
| committer | Riku Voipio <riku.voipio@linaro.org> | 2016-05-27 14:49:49 +0300 |
| commit | c0bea68f9ea48f0dea7a06a259a613bfd3a7e35e (patch) | |
| tree | f46658f976a156b5e5b981a567cddf4582dd9df1 /linux-user | |
| parent | 6db9d00e2f05db0dfcc1a4d8b811fdd40170c91c (diff) | |
linux-user: Support for restarting system calls for SPARC targets
Update the SPARC main loop and sigreturn code:
* on TARGET_ERESTARTSYS, wind guest PC backwards to repeat syscall insn
* set all guest CPU state within signal.c code on sigreturn
* handle TARGET_QEMU_ESIGRETURN in the main loop as the indication
that the main loop should not touch any guest CPU state
Signed-off-by: Timothy Edward Baldwin <T.E.Baldwin99@members.leeds.ac.uk>
Message-id: 1441497448-32489-9-git-send-email-T.E.Baldwin99@members.leeds.ac.uk
[PMM: Commit message tweaks; drop TARGET_USE_ERESTARTSYS define]
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
Diffstat (limited to 'linux-user')
| -rw-r--r-- | linux-user/main.c | 3 | ||||
| -rw-r--r-- | linux-user/signal.c | 2 | ||||
| -rw-r--r-- | linux-user/sparc/target_signal.h | 1 | ||||
| -rw-r--r-- | linux-user/sparc64/target_signal.h | 1 |
4 files changed, 6 insertions, 1 deletions
diff --git a/linux-user/main.c b/linux-user/main.c index dfc098f121..04a9b9b4c1 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -1376,6 +1376,9 @@ void cpu_loop (CPUSPARCState *env) env->regwptr[2], env->regwptr[3], env->regwptr[4], env->regwptr[5], 0, 0); + if (ret == -TARGET_ERESTARTSYS || ret == -TARGET_QEMU_ESIGRETURN) { + break; + } if ((abi_ulong)ret >= (abi_ulong)(-515)) { #if defined(TARGET_SPARC64) && !defined(TARGET_ABI32) env->xcc |= PSR_CARRY; diff --git a/linux-user/signal.c b/linux-user/signal.c index 14e58b05b2..e742347a26 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -2449,7 +2449,7 @@ long do_sigreturn(CPUSPARCState *env) goto segv_and_exit; } unlock_user_struct(sf, sf_addr, 0); - return env->regwptr[0]; + return -TARGET_QEMU_ESIGRETURN; segv_and_exit: unlock_user_struct(sf, sf_addr, 0); diff --git a/linux-user/sparc/target_signal.h b/linux-user/sparc/target_signal.h index c7de300cd7..2df38c805f 100644 --- a/linux-user/sparc/target_signal.h +++ b/linux-user/sparc/target_signal.h @@ -33,4 +33,5 @@ static inline abi_ulong get_sp_from_cpustate(CPUSPARCState *state) return state->regwptr[UREG_FP]; } + #endif /* TARGET_SIGNAL_H */ diff --git a/linux-user/sparc64/target_signal.h b/linux-user/sparc64/target_signal.h index c7de300cd7..2df38c805f 100644 --- a/linux-user/sparc64/target_signal.h +++ b/linux-user/sparc64/target_signal.h @@ -33,4 +33,5 @@ static inline abi_ulong get_sp_from_cpustate(CPUSPARCState *state) return state->regwptr[UREG_FP]; } + #endif /* TARGET_SIGNAL_H */ |