[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 18/38] linux-user: Support for restarting system call
From: |
riku . voipio |
Subject: |
[Qemu-devel] [PULL 18/38] linux-user: Support for restarting system calls for tilegx targets |
Date: |
Wed, 25 May 2016 13:31:50 +0300 |
From: Peter Maydell <address@hidden>
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 <address@hidden>
Signed-off-by: Riku Voipio <address@hidden>
---
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 834974a..1f604a7 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
- [Qemu-devel] [PULL 13/38] linux-user: Support for restarting system calls for UniCore32 targets, (continued)
- [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
- [Qemu-devel] [PULL 16/38] linux-user: Support for restarting system calls for S390 targets, riku . voipio, 2016/05/25
- [Qemu-devel] [PULL 21/38] linux-user: Add debug code to exercise restarting system calls, riku . voipio, 2016/05/25
- [Qemu-devel] [PULL 18/38] linux-user: Support for restarting system calls for tilegx targets,
riku . voipio <=
- [Qemu-devel] [PULL 23/38] linux-user: Use safe_syscall for read and write system calls, riku . voipio, 2016/05/25
- [Qemu-devel] [PULL 22/38] linux-user: Provide safe_syscall for fixing races between signals and syscalls, riku . voipio, 2016/05/25
- [Qemu-devel] [PULL 25/38] linux-user: Use safe_syscall for wait system calls, riku . voipio, 2016/05/25
- [Qemu-devel] [PULL 24/38] linux-user: Use safe_syscall for open and openat system calls, riku . voipio, 2016/05/25
- [Qemu-devel] [PULL 28/38] linux-user: Use safe_syscall for futex syscall, riku . voipio, 2016/05/25
- [Qemu-devel] [PULL 26/38] linux-user: Use safe_syscall for execve syscall, riku . voipio, 2016/05/25
- [Qemu-devel] [PULL 27/38] linux-user: Use safe_syscall for pselect, select syscalls, riku . voipio, 2016/05/25
- [Qemu-devel] [PULL 29/38] linux-user: Handle negative values in timespec conversion, riku . voipio, 2016/05/25
- [Qemu-devel] [PULL 31/38] linux-user: Use g_try_malloc() in do_msgrcv(), riku . voipio, 2016/05/25
- [Qemu-devel] [PULL 35/38] linux-user/signal.c: Generate opcode data for restorer in setup_rt_frame, riku . voipio, 2016/05/25