From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=52427 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PKfq2-0000J6-O0 for qemu-devel@nongnu.org; Mon, 22 Nov 2010 18:30:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PKfpp-00065Z-Se for qemu-devel@nongnu.org; Mon, 22 Nov 2010 18:30:22 -0500 Received: from a.mail.sonic.net ([64.142.16.245]:51152) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PKfpp-000656-Ed for qemu-devel@nongnu.org; Mon, 22 Nov 2010 18:30:09 -0500 From: Richard Henderson Date: Mon, 22 Nov 2010 14:57:56 -0800 Message-Id: <1290466678-6337-6-git-send-email-rth@twiddle.net> In-Reply-To: <1290466678-6337-1-git-send-email-rth@twiddle.net> References: <1290466678-6337-1-git-send-email-rth@twiddle.net> Subject: [Qemu-devel] [PATCH 5/7] tcg-ia64: Fix tlb read error for 32-bit targets. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aurelien@aurel32.net Use ld4 not ld8 for reading the tlb of 32-bit targets. Signed-off-by: Richard Henderson --- tcg/ia64/tcg-target.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/tcg/ia64/tcg-target.c b/tcg/ia64/tcg-target.c index 62f0804..da81f1b 100644 --- a/tcg/ia64/tcg-target.c +++ b/tcg/ia64/tcg-target.c @@ -1459,7 +1459,9 @@ static inline void tcg_out_qemu_tlb(TCGContext *s, TCGArg addr_reg, tcg_opc_a1 (TCG_REG_P0, OPC_ADD_A1, TCG_REG_R2, TCG_REG_R2, TCG_AREG0)); tcg_out_bundle(s, mII, - tcg_opc_m3 (TCG_REG_P0, OPC_LD8_M3, TCG_REG_R57, + tcg_opc_m3 (TCG_REG_P0, + (TARGET_LONG_BITS == 32 + ? OPC_LD4_M3 : OPC_LD8_M3), TCG_REG_R57, TCG_REG_R2, offset_addend - offset_rw), tcg_opc_a1 (TCG_REG_P0, OPC_AND_A1, TCG_REG_R3, TCG_REG_R3, TCG_REG_R56), -- 1.7.2.3