From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:53709) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UWphL-0001A4-JJ for qemu-devel@nongnu.org; Mon, 29 Apr 2013 11:09:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UWphH-00082p-VM for qemu-devel@nongnu.org; Mon, 29 Apr 2013 11:08:59 -0400 Received: from mail-wg0-x22e.google.com ([2a00:1450:400c:c00::22e]:33084) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UWphH-00082E-Oi for qemu-devel@nongnu.org; Mon, 29 Apr 2013 11:08:55 -0400 Received: by mail-wg0-f46.google.com with SMTP id e11so3657303wgh.25 for ; Mon, 29 Apr 2013 08:08:55 -0700 (PDT) Sender: Richard Henderson From: Richard Henderson Date: Mon, 29 Apr 2013 08:08:22 -0700 Message-Id: <1367248103-1492-2-git-send-email-rth@twiddle.net> In-Reply-To: <1367248103-1492-1-git-send-email-rth@twiddle.net> References: <1367248103-1492-1-git-send-email-rth@twiddle.net> Subject: [Qemu-devel] [PATCH for-1.5 1/2] tcg-arm: Fix 64-bit tlb load for pre-v6 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, aurelien@aurel32.net Found by inspection, since the effect of the bug was simply to send all memory ops through the slow path. Signed-off-by: Richard Henderson --- tcg/arm/tcg-target.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tcg/arm/tcg-target.c b/tcg/arm/tcg-target.c index 7216f7a..12edad4 100644 --- a/tcg/arm/tcg-target.c +++ b/tcg/arm/tcg-target.c @@ -1190,7 +1190,7 @@ static void tcg_out_tlb_read(TCGContext *s, TCGReg addrlo, TCGReg addrhi, tcg_out_memop_12(s, COND_AL, INSN_LDR_IMM, TCG_REG_R0, TCG_REG_R2, tlb_offset, 1, 1); if (TARGET_LONG_BITS == 64) { - tcg_out_memop_12(s, COND_AL, INSN_LDR_IMM, TCG_REG_R0, + tcg_out_memop_12(s, COND_AL, INSN_LDR_IMM, TCG_REG_R1, TCG_REG_R2, 4, 1, 0); } } -- 1.8.1.4