[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 09/38] linux-user: Support for restarting system c
From: |
riku . voipio |
Subject: |
[Qemu-devel] [PULL v2 09/38] linux-user: Support for restarting system calls for PPC targets |
Date: |
Fri, 27 May 2016 16:00:00 +0300 |
From: Timothy E Baldwin <address@hidden>
Update the PPC main loop code:
* on TARGET_ERESTARTSYS, wind guest PC backwards to repeat syscall insn
(We already handle TARGET_QEMU_ESIGRETURN.)
Signed-off-by: Timothy Edward Baldwin <address@hidden>
Message-id: address@hidden
Reviewed-by: Peter Maydell <address@hidden>
[PMM: tweak commit message; drop TARGET_USE_ERESTARTSYS define]
Signed-off-by: Peter Maydell <address@hidden>
Signed-off-by: Riku Voipio <address@hidden>
---
linux-user/main.c | 4 ++++
linux-user/ppc/target_signal.h | 1 +
2 files changed, 5 insertions(+)
diff --git a/linux-user/main.c b/linux-user/main.c
index 73e3668..dfc098f 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -1987,6 +1987,10 @@ void cpu_loop(CPUPPCState *env)
ret = do_syscall(env, env->gpr[0], env->gpr[3], env->gpr[4],
env->gpr[5], env->gpr[6], env->gpr[7],
env->gpr[8], 0, 0);
+ if (ret == -TARGET_ERESTARTSYS) {
+ env->nip -= 4;
+ break;
+ }
if (ret == (target_ulong)(-TARGET_QEMU_ESIGRETURN)) {
/* Returning from a successful sigreturn syscall.
Avoid corrupting register state. */
diff --git a/linux-user/ppc/target_signal.h b/linux-user/ppc/target_signal.h
index a93b5cf..4f01dd4 100644
--- a/linux-user/ppc/target_signal.h
+++ b/linux-user/ppc/target_signal.h
@@ -26,4 +26,5 @@ static inline abi_ulong get_sp_from_cpustate(CPUPPCState
*state)
return state->gpr[1];
}
+
#endif /* TARGET_SIGNAL_H */
--
2.1.4
- [Qemu-devel] [PULL v2 00/38] linux-user pull request, riku . voipio, 2016/05/27
- [Qemu-devel] [PULL v2 04/38] linux-user: Define TARGET_ERESTART* errno values, riku . voipio, 2016/05/27
- [Qemu-devel] [PULL v2 01/38] linux-user: Check array bounds in errno conversion, riku . voipio, 2016/05/27
- [Qemu-devel] [PULL v2 06/38] linux-user: Support for restarting system calls for x86 targets, riku . voipio, 2016/05/27
- [Qemu-devel] [PULL v2 09/38] linux-user: Support for restarting system calls for PPC targets,
riku . voipio <=
- [Qemu-devel] [PULL v2 08/38] linux-user: Support for restarting system calls for MIPS targets, riku . voipio, 2016/05/27
- [Qemu-devel] [PULL v2 02/38] linux-user: Consistently return host errnos from do_openat(), riku . voipio, 2016/05/27
- [Qemu-devel] [PULL v2 07/38] linux-user: Support for restarting system calls for ARM targets, riku . voipio, 2016/05/27
- [Qemu-devel] [PULL v2 03/38] linux-user: Reindent signal handling, riku . voipio, 2016/05/27
- [Qemu-devel] [PULL v2 05/38] linux-user: Renumber TARGET_QEMU_ESIGRETURN, make it not arch-specific, riku . voipio, 2016/05/27
- [Qemu-devel] [PULL v2 10/38] linux-user: Support for restarting system calls for SPARC targets, riku . voipio, 2016/05/27
- [Qemu-devel] [PULL v2 16/38] linux-user: Support for restarting system calls for S390 targets, riku . voipio, 2016/05/27
- [Qemu-devel] [PULL v2 11/38] linux-user: Support for restarting system calls for SH4 targets, riku . voipio, 2016/05/27
- [Qemu-devel] [PULL v2 14/38] linux-user: Support for restarting system calls for OpenRISC targets, riku . voipio, 2016/05/27
- [Qemu-devel] [PULL v2 13/38] linux-user: Support for restarting system calls for UniCore32 targets, riku . voipio, 2016/05/27