From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47838) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b0uiR-0005i1-40 for qemu-devel@nongnu.org; Thu, 12 May 2016 13:48:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b0uiO-0002hW-SW for qemu-devel@nongnu.org; Thu, 12 May 2016 13:48:01 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:56919) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b0uiO-0002hB-Ls for qemu-devel@nongnu.org; Thu, 12 May 2016 13:48:00 -0400 From: Peter Maydell Date: Thu, 12 May 2016 18:47:37 +0100 Message-Id: <1463075272-9933-14-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1463075272-9933-1-git-send-email-peter.maydell@linaro.org> References: <1463075272-9933-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH v2 13/28] linux-user: Support for restarting system calls for UniCore32 targets List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: patches@linaro.org, Timothy Edward Baldwin , Riku Voipio , Richard Henderson From: Timothy E Baldwin Update the UniCore32 main loop 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 (We don't support signals on this target so there is no sigreturn code to update.) Signed-off-by: Timothy Edward Baldwin Message-id: 1441497448-32489-30-git-send-email-T.E.Baldwin99@members.leeds.ac.uk Reviewed-by: Peter Maydell [PMM: tweak commit message; drop TARGET_USE_ERESTARTSYS define] Signed-off-by: Peter Maydell --- linux-user/main.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/linux-user/main.c b/linux-user/main.c index 94dc2d4..5e5efa9 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -1170,7 +1170,7 @@ void cpu_loop(CPUUniCore32State *env) cpu_set_tls(env, env->regs[0]); env->regs[0] = 0; } else { - env->regs[0] = do_syscall(env, + abi_long ret = do_syscall(env, n, env->regs[0], env->regs[1], @@ -1179,6 +1179,11 @@ void cpu_loop(CPUUniCore32State *env) env->regs[4], env->regs[5], 0, 0); + if (ret == -TARGET_ERESTARTSYS) { + env->regs[31] -= 4; + } else if (ret != -TARGET_QEMU_ESIGRETURN) { + env->regs[0] = ret; + } } } else { goto error; -- 1.9.1