gwj / at91sam9263 · Commits

Commit a4ae00bc0720ebd2b72c1f53cd1be33568f98436

Authored by balrog
1 parent 8fbd6b52

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
Inline Side-by-side
Showing 1 changed file with 8 additions and 0 deletions
linux-user/syscall.c
  View file @a4ae00b
@@ -5139,12 +5139,20 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, @@ -5139,12 +5139,20 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
5139 #endif 5139 #endif
5140 #ifdef TARGET_NR_pread 5140 #ifdef TARGET_NR_pread
5141 case TARGET_NR_pread: 5141 case TARGET_NR_pread:
  5142 +#ifdef TARGET_ARM
  5143 + if (((CPUARMState *)cpu_env)->eabi)
  5144 + arg4 = arg5;
  5145 +#endif
5142 if (!(p = lock_user(VERIFY_WRITE, arg2, arg3, 0))) 5146 if (!(p = lock_user(VERIFY_WRITE, arg2, arg3, 0)))
5143 goto efault; 5147 goto efault;
5144 ret = get_errno(pread(arg1, p, arg3, arg4)); 5148 ret = get_errno(pread(arg1, p, arg3, arg4));
5145 unlock_user(p, arg2, ret); 5149 unlock_user(p, arg2, ret);
5146 break; 5150 break;
5147 case TARGET_NR_pwrite: 5151 case TARGET_NR_pwrite:
  5152 +#ifdef TARGET_ARM
  5153 + if (((CPUARMState *)cpu_env)->eabi)
  5154 + arg4 = arg5;
  5155 +#endif
5148 if (!(p = lock_user(VERIFY_READ, arg2, arg3, 1))) 5156 if (!(p = lock_user(VERIFY_READ, arg2, arg3, 1)))
5149 goto efault; 5157 goto efault;
5150 ret = get_errno(pwrite(arg1, p, arg3, arg4)); 5158 ret = get_errno(pwrite(arg1, p, arg3, arg4));