Re: [Qemu-devel] [PATCH 2/2] linux-user: register align p{read, write}64

[Alex Barcelo]

On Sun, Sep 30, 2012 at 3:32 AM, Alexander Graf <address@hidden> wrote:
> pread64 and pwrite64 pass 64bit parameters which for some architectures need
> to be aligned to special argument pairs, creating a gap argument.
>
> Handle this special case the same way we handle it in other places of the 
> code.
>
> Reported-by: Alex Barcelo <address@hidden>
> Signed-off-by: Alexander Graf <address@hidden>
> ---
>  linux-user/syscall.c |    8 ++++++++
>  1 files changed, 8 insertions(+), 0 deletions(-)
>
> diff --git a/linux-user/syscall.c b/linux-user/syscall.c
> index 8cd56f2..7992b1b 100644
> --- a/linux-user/syscall.c
> +++ b/linux-user/syscall.c
> @@ -7423,12 +7423,20 @@ abi_long do_syscall(void *cpu_env, int num, abi_long 
> arg1,
>  #endif
>  #ifdef TARGET_NR_pread64
>      case TARGET_NR_pread64:
> +        if (regpairs_aligned(cpu_env)) {
> +            arg4 = arg5;
> +            arg5 = arg6;
> +        }
>          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 (regpairs_aligned(cpu_env)) {
> +            arg4 = arg5;
> +            arg5 = arg6;
> +        }
>          if (!(p = lock_user(VERIFY_READ, arg2, arg3, 1)))
>              goto efault;
>          ret = get_errno(pwrite64(arg1, p, arg3, target_offset64(arg4, 
> arg5)));
> --
> 1.6.0.2
>
>

Tested-by: Alex Barcelo <address@hidden>