From patchwork Mon Jan 11 14:49:48 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgar E. Iglesias" X-Patchwork-Id: 42626 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 D68DFB7C16 for ; Tue, 12 Jan 2010 02:03:54 +1100 (EST) Received: from localhost ([127.0.0.1]:35712 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NULhT-0001Va-JA for incoming@patchwork.ozlabs.org; Mon, 11 Jan 2010 09:56:59 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NULfy-0001Jj-HG for qemu-devel@nongnu.org; Mon, 11 Jan 2010 09:55:26 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NULft-0001FW-Dg for qemu-devel@nongnu.org; Mon, 11 Jan 2010 09:55:25 -0500 Received: from [199.232.76.173] (port=58791 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NULft-0001FL-9L for qemu-devel@nongnu.org; Mon, 11 Jan 2010 09:55:21 -0500 Received: from miranda.se.axis.com ([193.13.178.8]:43293) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NULfs-0003iC-Cv for qemu-devel@nongnu.org; Mon, 11 Jan 2010 09:55:20 -0500 Received: from edde (edgar.se.axis.com [10.93.151.1]) by miranda.se.axis.com (8.13.4/8.13.4/Debian-3sarge3) with SMTP id o0BEt68J022017; Mon, 11 Jan 2010 15:55:06 +0100 Received: by edde (sSMTP sendmail emulation); Mon, 11 Jan 2010 15:49:54 +0100 From: "Edgar E. Iglesias" To: qemu-devel@nongnu.org Date: Mon, 11 Jan 2010 15:49:48 +0100 Message-Id: <1263221391-3642-2-git-send-email-edgar.iglesias@gmail.com> X-Mailer: git-send-email 1.6.4.4 In-Reply-To: <1263221391-3642-1-git-send-email-edgar.iglesias@gmail.com> References: <1263221391-3642-1-git-send-email-edgar.iglesias@gmail.com> X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: "Edgar E. Iglesias" Subject: [Qemu-devel] [PATCH 1/4] ppc-40x: Get TLB attributes from TLBLO. 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 The ZSEL was incorrectly beeing decoded from TLBHI. Decode it from TLBLO instead. Signed-off-by: Edgar E. Iglesias --- target-ppc/op_helper.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/target-ppc/op_helper.c b/target-ppc/op_helper.c index cea27f2..3575b29 100644 --- a/target-ppc/op_helper.c +++ b/target-ppc/op_helper.c @@ -3990,7 +3990,6 @@ void helper_4xx_tlbwe_hi (target_ulong entry, target_ulong val) cpu_abort(env, "Little-endian TLB entries are not supported by now\n"); } tlb->PID = env->spr[SPR_40x_PID]; /* PID */ - tlb->attr = val & 0xFF; LOG_SWTLB("%s: set up TLB %d RPN " TARGET_FMT_plx " EPN " TARGET_FMT_lx " size " TARGET_FMT_lx " prot %c%c%c%c PID %d\n", __func__, (int)entry, tlb->RPN, tlb->EPN, tlb->size, @@ -4016,6 +4015,7 @@ void helper_4xx_tlbwe_lo (target_ulong entry, target_ulong val) val); entry &= 0x3F; tlb = &env->tlb[entry].tlbe; + tlb->attr = val & 0xFF; tlb->RPN = val & 0xFFFFFC00; tlb->prot = PAGE_READ; if (val & 0x200)