On 6 September 2015 at 00:57, Timothy E Baldwin
<t.e.baldwi...@members.leeds.ac.uk> wrote:
> Signed-off-by: Timothy Edward Baldwin <t.e.baldwi...@members.leeds.ac.uk>
> ---
>
> WARNING - NOT TESTED
>
> linux-user/main.c | 12 +++++++++---
> linux-user/s390x/syscall.h | 2 ++
> linux-user/signal.c | 4 ++--
> 3 files changed, 13 insertions(+), 5 deletions(-)
>
> diff --git a/linux-user/main.c b/linux-user/main.c
> index 0863945..a59907e 100644
> --- a/linux-user/main.c
> +++ b/linux-user/main.c
> @@ -3355,6 +3355,7 @@ void cpu_loop(CPUS390XState *env)
> int trapnr, n, sig;
> target_siginfo_t info;
> target_ulong addr;
> + abi_long ret;
>
> while (1) {
> cpu_exec_start(cs);
> @@ -3372,9 +3373,14 @@ void cpu_loop(CPUS390XState *env)
> n = env->regs[1];
> }
> env->psw.addr += env->int_svc_ilen;
> - env->regs[2] = do_syscall(env, n, env->regs[2], env->regs[3],
> - env->regs[4], env->regs[5],
> - env->regs[6], env->regs[7], 0, 0);
> + ret = do_syscall(env, n, env->regs[2], env->regs[3],
> + env->regs[4], env->regs[5],
> + env->regs[6], env->regs[7], 0, 0);
> + if (ret == -TARGET_ERESTARTSYS) {
> + env->psw.addr -= env->int_svc_ilen;;
Stray doubled semicolon.
Otherwise
Reviewed-by: Peter Maydell <peter.mayd...@linaro.org>
thanks
-- PMM
