From: takasi-y@ops.dti.ne.jp <takasi-y@ops.dti.ne.jp>
Date: Wed, 17 Feb 2010 15:35:03 +0000 (+0900)
Subject: linux-user: Fix syscall pipe2() retval on sh4
X-Git-Tag: TizenStudio_2.0_p2.3.2~208^2~8548
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=597c0212a7b3f16af26dc29fbb5653999b8cd31f;p=sdk%2Femulator%2Fqemu.git

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

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>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
---

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 38eb35f..80d8633 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;