From patchwork Mon Nov 22 22:57:56 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 72615 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 1D7EEB70D6 for ; Tue, 23 Nov 2010 10:33:02 +1100 (EST) Received: from localhost ([127.0.0.1]:42624 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PKfsZ-0001HX-Gf for incoming@patchwork.ozlabs.org; Mon, 22 Nov 2010 18:32:59 -0500 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 Received: from are.twiddle.net (are.twiddle.net [75.101.38.216]) by a.mail.sonic.net (8.13.8.Beta0-Sonic/8.13.7) with ESMTP id oAMMw16C023885 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 22 Nov 2010 14:58:02 -0800 Received: from are.twiddle.net (localhost [127.0.0.1]) by are.twiddle.net (8.14.4/8.14.4) with ESMTP id oAMMw10X006392; Mon, 22 Nov 2010 14:58:01 -0800 Received: (from rth@localhost) by are.twiddle.net (8.14.4/8.14.4/Submit) id oAMMw18m006391; Mon, 22 Nov 2010 14:58:01 -0800 From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 22 Nov 2010 14:57:56 -0800 Message-Id: <1290466678-6337-6-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1290466678-6337-1-git-send-email-rth@twiddle.net> References: <1290466678-6337-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 Cc: aurelien@aurel32.net Subject: [Qemu-devel] [PATCH 5/7] tcg-ia64: Fix tlb read error for 32-bit targets. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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),