From patchwork Tue Jun 26 13:00:27 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 167403 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id AD406B7015 for ; Tue, 26 Jun 2012 23:01:03 +1000 (EST) Received: from localhost ([::1]:41730 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SjVO8-0000N6-Nr for incoming@patchwork.ozlabs.org; Tue, 26 Jun 2012 09:01:00 -0400 Received: from eggs.gnu.org ([208.118.235.92]:47158) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SjVNv-0000Mu-4F for qemu-devel@nongnu.org; Tue, 26 Jun 2012 09:00:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SjVNk-0000oq-8J for qemu-devel@nongnu.org; Tue, 26 Jun 2012 09:00:46 -0400 Received: from mnementh.archaic.org.uk ([81.2.115.146]:59510) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SjVNk-0000le-1V for qemu-devel@nongnu.org; Tue, 26 Jun 2012 09:00:36 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1SjVNb-0007Lf-CY; Tue, 26 Jun 2012 14:00:27 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Tue, 26 Jun 2012 14:00:27 +0100 Message-Id: <1340715627-28224-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 81.2.115.146 Cc: patches@linaro.org Subject: [Qemu-devel] [PATCH] target-arm: Fix typo that meant TTBR1 accesses went to TTBR0 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Fix a copy-and-paste error in the register description for TTBR1 that meant it was a duplicate of TTBR0 rather than affecting the correct bit of CPU state. Signed-off-by: Peter Maydell --- Whoops. Spotted while I was looking at this bit of code for a different reason... target-arm/helper.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/target-arm/helper.c b/target-arm/helper.c index 2309923..ca5d8e9 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -679,7 +679,7 @@ static const ARMCPRegInfo vmsa_cp_reginfo[] = { .fieldoffset = offsetof(CPUARMState, cp15.c2_base0), .resetvalue = 0, }, { .name = "TTBR1", .cp = 15, .crn = 2, .crm = 0, .opc1 = 0, .opc2 = 1, .access = PL1_RW, - .fieldoffset = offsetof(CPUARMState, cp15.c2_base0), .resetvalue = 0, }, + .fieldoffset = offsetof(CPUARMState, cp15.c2_base1), .resetvalue = 0, }, { .name = "TTBCR", .cp = 15, .crn = 2, .crm = 0, .opc1 = 0, .opc2 = 2, .access = PL1_RW, .writefn = vmsa_ttbcr_write, .resetfn = vmsa_ttbcr_reset,