From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37362) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b6HNp-0007VM-QF for qemu-devel@nongnu.org; Fri, 27 May 2016 09:01:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b6HNo-0001Dc-Mz for qemu-devel@nongnu.org; Fri, 27 May 2016 09:00:57 -0400 Received: from mail-lb0-x22f.google.com ([2a00:1450:4010:c04::22f]:34467) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b6HNn-0001Ct-Kw for qemu-devel@nongnu.org; Fri, 27 May 2016 09:00:56 -0400 Received: by mail-lb0-x22f.google.com with SMTP id sh2so31745963lbb.1 for ; Fri, 27 May 2016 06:00:55 -0700 (PDT) From: riku.voipio@linaro.org Date: Fri, 27 May 2016 16:00:09 +0300 Message-Id: In-Reply-To: References: Subject: [Qemu-devel] [PULL v2 18/38] linux-user: Support for restarting system calls for tilegx targets List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell From: Peter Maydell Update the tilegx main loop and sigreturn code: * on TARGET_ERESTARTSYS, wind guest PC backwards to repeat syscall insn * return -TARGET_QEMU_ESIGRETURN from sigreturn rather than current R_RE * handle TARGET_QEMU_ESIGRETURN in the main loop as the indication that the main loop should not touch any guest CPU state Note that this fixes a bug where a sigreturn which happened to have an errno value in TILEGX_R_RE would incorrectly cause TILEGX_R_ERR to get set. Signed-off-by: Peter Maydell Signed-off-by: Riku Voipio --- linux-user/main.c | 21 +++++++++++++-------- linux-user/signal.c | 2 +- linux-user/tilegx/target_signal.h | 1 + 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/linux-user/main.c b/linux-user/main.c index a532221..4607e48 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -3706,15 +3706,20 @@ void cpu_loop(CPUTLGState *env) cpu_exec_end(cs); switch (trapnr) { case TILEGX_EXCP_SYSCALL: - env->regs[TILEGX_R_RE] = do_syscall(env, env->regs[TILEGX_R_NR], - env->regs[0], env->regs[1], - env->regs[2], env->regs[3], - env->regs[4], env->regs[5], - env->regs[6], env->regs[7]); - env->regs[TILEGX_R_ERR] = TILEGX_IS_ERRNO(env->regs[TILEGX_R_RE]) - ? - env->regs[TILEGX_R_RE] - : 0; + { + abi_ulong ret = do_syscall(env, env->regs[TILEGX_R_NR], + env->regs[0], env->regs[1], + env->regs[2], env->regs[3], + env->regs[4], env->regs[5], + env->regs[6], env->regs[7]); + if (ret == -TARGET_ERESTARTSYS) { + env->pc -= 8; + } else if (ret != -TARGET_QEMU_ESIGRETURN) { + env->regs[TILEGX_R_RE] = ret; + env->regs[TILEGX_R_ERR] = TILEGX_IS_ERRNO(ret) ? -ret : 0; + } break; + } case TILEGX_EXCP_OPCODE_EXCH: do_exch(env, true, false); break; diff --git a/linux-user/signal.c b/linux-user/signal.c index 71a8e2a..b4641df 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -5709,7 +5709,7 @@ long do_rt_sigreturn(CPUTLGState *env) } unlock_user_struct(frame, frame_addr, 0); - return env->regs[TILEGX_R_RE]; + return -TARGET_QEMU_ESIGRETURN; badframe: diff --git a/linux-user/tilegx/target_signal.h b/linux-user/tilegx/target_signal.h index b595f98..fcf1040 100644 --- a/linux-user/tilegx/target_signal.h +++ b/linux-user/tilegx/target_signal.h @@ -25,4 +25,5 @@ static inline abi_ulong get_sp_from_cpustate(CPUTLGState *state) return state->regs[TILEGX_R_SP]; } + #endif /* TARGET_SIGNAL_H */ -- 2.1.4