linux-user/elfload.c: Don't use _raw accessor functions
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 <peter.maydell@linaro.org> Reviewed-by: Richard Henderson <rth@twiddle.net> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> Message-id: 1421334118-3287-5-git-send-email-peter.maydell@linaro.org
This commit is contained in:
parent
eb513f82f0
commit
2ccf97ec0f
@ -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 */
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user