[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 08/38] linux-user: Support for restarting system call
From: |
riku . voipio |
Subject: |
[Qemu-devel] [PULL 08/38] linux-user: Support for restarting system calls for MIPS targets |
Date: |
Wed, 25 May 2016 13:31:40 +0300 |
From: Timothy E Baldwin <address@hidden>
Update the MIPS 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/mips/target_signal.h | 1 +
linux-user/mips64/target_signal.h | 1 +
3 files changed, 6 insertions(+)
diff --git a/linux-user/main.c b/linux-user/main.c
index 0e3da58..3b47045 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -2528,6 +2528,10 @@ done_syscall:
env->active_tc.gpr[8], env->active_tc.gpr[9],
env->active_tc.gpr[10], env->active_tc.gpr[11]);
# endif /* O32 */
+ if (ret == -TARGET_ERESTARTSYS) {
+ env->active_tc.PC -= 4;
+ break;
+ }
if (ret == -TARGET_QEMU_ESIGRETURN) {
/* Returning from a successful sigreturn syscall.
Avoid clobbering register state. */
diff --git a/linux-user/mips/target_signal.h b/linux-user/mips/target_signal.h
index 6e1dc8b..460cc9f 100644
--- a/linux-user/mips/target_signal.h
+++ b/linux-user/mips/target_signal.h
@@ -26,4 +26,5 @@ static inline abi_ulong get_sp_from_cpustate(CPUMIPSState
*state)
return state->active_tc.gpr[29];
}
+
#endif /* TARGET_SIGNAL_H */
diff --git a/linux-user/mips64/target_signal.h
b/linux-user/mips64/target_signal.h
index 5fb6a2c..a2dc514 100644
--- a/linux-user/mips64/target_signal.h
+++ b/linux-user/mips64/target_signal.h
@@ -26,4 +26,5 @@ static inline abi_ulong get_sp_from_cpustate(CPUMIPSState
*state)
return state->active_tc.gpr[29];
}
+
#endif /* TARGET_SIGNAL_H */
--
2.1.4
- [Qemu-devel] [PULL 00/38] linux-user update, riku . voipio, 2016/05/25
- [Qemu-devel] [PULL 02/38] linux-user: Consistently return host errnos from do_openat(), riku . voipio, 2016/05/25
- [Qemu-devel] [PULL 01/38] linux-user: Check array bounds in errno conversion, riku . voipio, 2016/05/25
- [Qemu-devel] [PULL 04/38] linux-user: Define TARGET_ERESTART* errno values, riku . voipio, 2016/05/25
- [Qemu-devel] [PULL 06/38] linux-user: Support for restarting system calls for x86 targets, riku . voipio, 2016/05/25
- [Qemu-devel] [PULL 05/38] linux-user: Renumber TARGET_QEMU_ESIGRETURN, make it not arch-specific, riku . voipio, 2016/05/25
- [Qemu-devel] [PULL 07/38] linux-user: Support for restarting system calls for ARM targets, riku . voipio, 2016/05/25
- [Qemu-devel] [PULL 03/38] linux-user: Reindent signal handling, riku . voipio, 2016/05/25
- [Qemu-devel] [PULL 08/38] linux-user: Support for restarting system calls for MIPS targets,
riku . voipio <=
- [Qemu-devel] [PULL 10/38] linux-user: Support for restarting system calls for SPARC targets, riku . voipio, 2016/05/25
- [Qemu-devel] [PULL 11/38] linux-user: Support for restarting system calls for SH4 targets, riku . voipio, 2016/05/25
- [Qemu-devel] [PULL 13/38] linux-user: Support for restarting system calls for UniCore32 targets, riku . voipio, 2016/05/25
- [Qemu-devel] [PULL 12/38] linux-user: Support for restarting system calls for Alpha targets, riku . voipio, 2016/05/25
- [Qemu-devel] [PULL 14/38] linux-user: Support for restarting system calls for OpenRISC targets, riku . voipio, 2016/05/25
- [Qemu-devel] [PULL 17/38] linux-user: Support for restarting system calls for CRIS targets, riku . voipio, 2016/05/25
- [Qemu-devel] [PULL 09/38] linux-user: Support for restarting system calls for PPC targets, riku . voipio, 2016/05/25
- [Qemu-devel] [PULL 15/38] linux-user: Support for restarting system calls for M68K targets, riku . voipio, 2016/05/25
- [Qemu-devel] [PULL 20/38] linux-user: Support for restarting system calls for Microblaze targets, riku . voipio, 2016/05/25
- [Qemu-devel] [PULL 19/38] linux-user: Set r14 on exit from microblaze syscall, riku . voipio, 2016/05/25