diff mbox

[07/34] linux-user: Support for restarting system calls for PPC targets

Message ID 1441497448-32489-8-git-send-email-T.E.Baldwin99@members.leeds.ac.uk
State New
Headers show

Commit Message

Timothy Baldwin Sept. 5, 2015, 11:57 p.m. UTC 
Signed-off-by: Timothy Edward Baldwin <T.E.Baldwin99@members.leeds.ac.uk>
---
 linux-user/main.c        | 4 ++++
 linux-user/ppc/syscall.h | 2 ++
 2 files changed, 6 insertions(+)

Comments

Peter Maydell Sept. 10, 2015, 6:10 p.m. UTC | #1 
On 6 September 2015 at 00:57, Timothy E Baldwin
<T.E.Baldwin99@members.leeds.ac.uk> wrote:
> Signed-off-by: Timothy Edward Baldwin <T.E.Baldwin99@members.leeds.ac.uk>
> ---
>  linux-user/main.c        | 4 ++++
>  linux-user/ppc/syscall.h | 2 ++
>  2 files changed, 6 insertions(+)

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

thanks
-- PMM
diff mbox

Patch

diff --git a/linux-user/main.c b/linux-user/main.c
index 124e9cc..5e9e3a8 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -1948,6 +1948,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_ulong)(-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/syscall.h b/linux-user/ppc/syscall.h
index 532cbbd..e75da7f 100644
--- a/linux-user/ppc/syscall.h
+++ b/linux-user/ppc/syscall.h
@@ -71,3 +71,5 @@  struct target_revectored_struct {
 #define TARGET_MINSIGSTKSZ 2048
 #define TARGET_MLOCKALL_MCL_CURRENT 0x2000
 #define TARGET_MLOCKALL_MCL_FUTURE  0x4000
+
+#define TARGET_USE_ERESTARTSYS 1