Re: [Qemu-devel] [PATCH 04/15] linux-user/elfload.c: Don't use _raw accessor functions

[Alex Bennée]

Peter Maydell <address@hidden> writes:

> The _raw accessor functions are an implementation detail that has
> leaked out to some callsites. Use get_user_u64() instead of ldq_raw().
>
> Signed-off-by: Peter Maydell <address@hidden>

Reviewed-by: Alex Bennée <address@hidden>

> ---
>  linux-user/elfload.c | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/linux-user/elfload.c b/linux-user/elfload.c
> index e2596a4..399c021 100644
> --- a/linux-user/elfload.c
> +++ b/linux-user/elfload.c
> @@ -829,8 +829,11 @@ static inline void init_thread(struct target_pt_regs 
> *_regs, struct image_info *
>      _regs->gpr[1] = infop->start_stack;
>  #if defined(TARGET_PPC64) && !defined(TARGET_ABI32)
>      if (get_ppc64_abi(infop) < 2) {
> -        _regs->gpr[2] = ldq_raw(infop->entry + 8) + infop->load_bias;
> -        infop->entry = ldq_raw(infop->entry) + infop->load_bias;
> +        uint64_t val;
> +        get_user_u64(val, infop->entry + 8);
> +        _regs->gpr[2] = val + infop->load_bias;
> +        get_user_u64(val, infop->entry);
> +        infop->entry = val + infop->load_bias;
>      } else {
>          _regs->gpr[12] = infop->entry;  /* r12 set to global entry address */
>      }

-- 
Alex Bennée