From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38083) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YBmmA-0002eE-4W for qemu-devel@nongnu.org; Thu, 15 Jan 2015 10:56:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YBmm5-0003Gk-8d for qemu-devel@nongnu.org; Thu, 15 Jan 2015 10:56:02 -0500 Received: from static.88-198-71-155.clients.your-server.de ([88.198.71.155]:37843 helo=socrates.bennee.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YBmm5-0003Gf-1m for qemu-devel@nongnu.org; Thu, 15 Jan 2015 10:55:57 -0500 References: <1421334118-3287-1-git-send-email-peter.maydell@linaro.org> <1421334118-3287-5-git-send-email-peter.maydell@linaro.org> From: Alex =?utf-8?Q?Benn=C3=A9e?= In-reply-to: <1421334118-3287-5-git-send-email-peter.maydell@linaro.org> Date: Thu, 15 Jan 2015 15:56:05 +0000 Message-ID: <87y4p411ii.fsf@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH 04/15] linux-user/elfload.c: Don't use _raw accessor functions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell Cc: Paolo Bonzini , Riku Voipio , qemu-devel@nongnu.org, patches@linaro.org, Richard Henderson Peter Maydell 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 Reviewed-by: Alex Bennée > --- > 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