summaryrefslogtreecommitdiffstats
path: root/linux-user
diff options
context:
space:
mode:
authortakasi-y@ops.dti.ne.jp2010-02-17 16:35:03 +0100
committerAurelien Jarno2010-03-06 19:35:18 +0100
commit597c0212a7b3f16af26dc29fbb5653999b8cd31f (patch)
tree2c9669e7a726af9f0fd62761115270cdf7b275b3 /linux-user
parenttarget-i386: Fix long jumps/calls in long mode with REX.W set (diff)
downloadqemu-597c0212a7b3f16af26dc29fbb5653999b8cd31f.tar.gz
qemu-597c0212a7b3f16af26dc29fbb5653999b8cd31f.tar.xz
qemu-597c0212a7b3f16af26dc29fbb5653999b8cd31f.zip
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>
Diffstat (limited to 'linux-user')
-rw-r--r--linux-user/syscall.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 38eb35f542..80d8633473 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;