commit a4ae00bc0720ebd2b72c1f53cd1be33568f98436
author balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162> Sat Sep 20 03:14:14 2008 +0000
committer balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162> Sat Sep 20 03:14:14 2008 +0000
tree 12955bc511bf6c76a86265963f938725a7576b72
parent 8fbd6b526725aeef0b34e0e1f1be766054b0845e

Fix pread() and pwrite() syscall on ARM EABI (Kirill Shutemov).

pread() and pwrite() have differences in arguments between ARM EABI and
OABI.   

See arch/arm/kernel/entry-common.S in Linux kernel source for
additional information.
 
Signed-off-by: Kirill A. Shutemov <kirill@shutemov.name>


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5272 c046a42c-6fe2-441c-8c8c-71466251a162

linux-user/syscall.c

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index bceb831..a3b975d 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -5139,12 +5139,20 @@
 #endif
 #ifdef TARGET_NR_pread
     case TARGET_NR_pread:
+#ifdef TARGET_ARM
+        if (((CPUARMState *)cpu_env)->eabi)
+            arg4 = arg5;
+#endif
         if (!(p = lock_user(VERIFY_WRITE, arg2, arg3, 0)))
             goto efault;
         ret = get_errno(pread(arg1, p, arg3, arg4));
         unlock_user(p, arg2, ret);
         break;
     case TARGET_NR_pwrite:
+#ifdef TARGET_ARM
+        if (((CPUARMState *)cpu_env)->eabi)
+            arg4 = arg5;
+#endif
         if (!(p = lock_user(VERIFY_READ, arg2, arg3, 1)))
             goto efault;
         ret = get_errno(pwrite(arg1, p, arg3, arg4));