From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53734) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YBm8c-0004AT-2B for qemu-devel@nongnu.org; Thu, 15 Jan 2015 10:15:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YBm8W-0003e7-63 for qemu-devel@nongnu.org; Thu, 15 Jan 2015 10:15:10 -0500 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:54864) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YBm8V-0003XX-Q4 for qemu-devel@nongnu.org; Thu, 15 Jan 2015 10:15:04 -0500 From: Peter Maydell Date: Thu, 15 Jan 2015 15:01:47 +0000 Message-Id: <1421334118-3287-5-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1421334118-3287-1-git-send-email-peter.maydell@linaro.org> References: <1421334118-3287-1-git-send-email-peter.maydell@linaro.org> Subject: [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: qemu-devel@nongnu.org Cc: Paolo Bonzini , Riku Voipio , Richard Henderson , patches@linaro.org 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 --- 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 */ } -- 1.9.1