From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41291) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b5W73-00016e-BA for qemu-devel@nongnu.org; Wed, 25 May 2016 06:32:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b5W6s-00035n-4H for qemu-devel@nongnu.org; Wed, 25 May 2016 06:32:28 -0400 Received: from mail-lf0-x22d.google.com ([2a00:1450:4010:c07::22d]:35093) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b5W6r-00035G-NJ for qemu-devel@nongnu.org; Wed, 25 May 2016 06:32:18 -0400 Received: by mail-lf0-x22d.google.com with SMTP id w16so4190381lfd.2 for ; Wed, 25 May 2016 03:32:17 -0700 (PDT) From: riku.voipio@linaro.org Date: Wed, 25 May 2016 13:31:44 +0300 Message-Id: In-Reply-To: References: Subject: [Qemu-devel] [PULL 12/38] linux-user: Support for restarting system calls for Alpha targets List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Timothy E Baldwin From: Timothy E Baldwin Update the Alpha main loop and sigreturn code: * on TARGET_ERESTARTSYS, wind guest PC backwards to repeat syscall insn * 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 Message-id: 1441497448-32489-13-git-send-email-T.E.Baldwin99@members.leeds.ac.uk Reviewed-by: Peter Maydell [PMM: tweak commit message; drop TARGET_USE_ERESTARTSYS define; PC is env->pc, not env->ir[IR_PV]] Signed-off-by: Peter Maydell Signed-off-by: Riku Voipio --- linux-user/alpha/target_signal.h | 1 + linux-user/main.c | 7 +++++-- linux-user/signal.c | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/linux-user/alpha/target_signal.h b/linux-user/alpha/target_signal.h index d3822da..4c78319 100644 --- a/linux-user/alpha/target_signal.h +++ b/linux-user/alpha/target_signal.h @@ -27,6 +27,7 @@ static inline abi_ulong get_sp_from_cpustate(CPUAlphaState *state) return state->ir[IR_SP]; } + /* From . */ #define TARGET_GEN_INTOVF -1 /* integer overflow */ #define TARGET_GEN_INTDIV -2 /* integer division by zero */ diff --git a/linux-user/main.c b/linux-user/main.c index 838d9b3..eeea8f5 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -3267,8 +3267,11 @@ void cpu_loop(CPUAlphaState *env) env->ir[IR_A2], env->ir[IR_A3], env->ir[IR_A4], env->ir[IR_A5], 0, 0); - if (trapnr == TARGET_NR_sigreturn - || trapnr == TARGET_NR_rt_sigreturn) { + if (sysret == -TARGET_ERESTARTSYS) { + env->pc -= 4; + break; + } + if (sysret == -TARGET_QEMU_ESIGRETURN) { break; } /* Syscall writes 0 to V0 to bypass error check, similar diff --git a/linux-user/signal.c b/linux-user/signal.c index 8b5ddf2..559e764 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -5527,7 +5527,7 @@ long do_sigreturn(CPUAlphaState *env) restore_sigcontext(env, sc); unlock_user_struct(sc, sc_addr, 0); - return env->ir[IR_V0]; + return -TARGET_QEMU_ESIGRETURN; badframe: force_sig(TARGET_SIGSEGV); @@ -5554,7 +5554,7 @@ long do_rt_sigreturn(CPUAlphaState *env) } unlock_user_struct(frame, frame_addr, 0); - return env->ir[IR_V0]; + return -TARGET_QEMU_ESIGRETURN; badframe: -- 2.1.4