On 09/15/2017 08:58 AM, James Clarke wrote:
Fixes: https://bugs.launchpad.net/qemu/+bug/1716767
Signed-off-by: James Clarke <jrt...@jrtc27.com>
---
linux-user/syscall.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 9b6364a266..24d6a81c21 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -10495,20 +10495,32 @@ abi_long do_syscall(void *cpu_env, int num, abi_long
arg1,
#endif
#ifdef TARGET_NR_pread64
case TARGET_NR_pread64:
+#if defined(TARGET_SH4)
+ /* SH4 doesn't align register pairs, except for p{read,write}64 */
+ arg4 = arg5;
+ arg5 = arg6;
+#else
if (regpairs_aligned(cpu_env)) {
arg4 = arg5;
arg5 = arg6;
}
+#endif
if (!(p = lock_user(VERIFY_WRITE, arg2, arg3, 0)))
goto efault;
ret = get_errno(pread64(arg1, p, arg3, target_offset64(arg4, arg5)));
unlock_user(p, arg2, ret);
break;
case TARGET_NR_pwrite64:
+#if defined(TARGET_SH4)
+ /* SH4 doesn't align register pairs, except for p{read,write}64 */
+ arg4 = arg5;
+ arg5 = arg6;
+#else
if (regpairs_aligned(cpu_env)) {
arg4 = arg5;
arg5 = arg6;
}
+#endif
if (!(p = lock_user(VERIFY_READ, arg2, arg3, 1)))
goto efault;
ret = get_errno(pwrite64(arg1, p, arg3, target_offset64(arg4, arg5)));
--
2.13.2
Tested-By: John Paul Adrian Glaubitz <glaub...@physik.fu-berlin.de>
--
.''`. John Paul Adrian Glaubitz
: :' : Debian Developer - glaub...@debian.org
`. `' Freie Universitaet Berlin - glaub...@physik.fu-berlin.de
`- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913