Patchwork sh4 linux-user: Fix syscall pipe2() retval

login
register
mail settings
Submitter takasi-y@ops.dti.ne.jp
Date Feb. 17, 2010, 3:35 p.m.
Message ID <201002171535.o1HFZ3Ra009730@smtp09.dti.ne.jp>
Download mbox | patch
Permalink /patch/45639/
State New
Headers show

Comments

takasi-y@ops.dti.ne.jp - Feb. 17, 2010, 3:35 p.m.
On linux/sh4
 pipe() return values by r0:r1 as SH C calling convention.
 pipe2() return values on memory as traditional unix way.

Signed-off-by: Takashi YOSHII <takasi-y@ops.dti.ne.jp>
---
 linux-user/syscall.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

Patch

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 9fb493f..034a2b0 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -969,10 +969,13 @@  static abi_long do_pipe(void *cpu_env, abi_ulong pipedes, int flags)
 #if defined(TARGET_MIPS)
     ((CPUMIPSState*)cpu_env)->active_tc.gpr[3] = host_pipe[1];
     ret = host_pipe[0];
-#elif defined(TARGET_SH4)
-    ((CPUSH4State*)cpu_env)->gregs[1] = host_pipe[1];
-    ret = host_pipe[0];
 #else
+#if defined(TARGET_SH4)
+    if (!flags) {
+        ((CPUSH4State*)cpu_env)->gregs[1] = host_pipe[1];
+        ret = host_pipe[0];
+    } else
+#endif
     if (put_user_s32(host_pipe[0], pipedes)
         || put_user_s32(host_pipe[1], pipedes + sizeof(host_pipe[0])))
         return -TARGET_EFAULT;