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: 9622 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 0BEC923E37 for ; Tue, 26 Jun 2012 13:00:33 +0000 (UTC) Received: from mail-gh0-f180.google.com (mail-gh0-f180.google.com [209.85.160.180]) by fiordland.canonical.com (Postfix) with ESMTP id C2D96A18209 for ; Tue, 26 Jun 2012 13:00:32 +0000 (UTC) Received: by ghbz12 with SMTP id z12so4042741ghb.11 for ; Tue, 26 Jun 2012 06:00:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:x-gm-message-state; bh=0T3FAW2nfzxPSA/c6sIysvTn9JCK+O4NLFam1r19Irs=; b=hfiDReFzd8SbXGQAcs+EWBXTm+XL5B6KMf+FxRBS2nAeq2A/TSDYRdQuPNybmrtweh sFNaS2ZVnaDguwM2pr57C4wZ5bWSyjyfr0yCGdNoi2XQQOZJwgaPrlWmwhQlKpBMGl87 JqR9U6w1EKWDgOZ0pXS7ADewUT/SldcL0TRyIKnFSTKFXbNOOaxlNFJhkRBW/Z8dFnN2 Yaov20kqqIGnxVqmaTBVTPZMEZvfiDZTKAGFm72q3I6MAgUiopEnQzCS+e9BNu1RsTuP yUte+OX051LfDG1vTRrqqgd18NEjlHnGDuFumqrrTNhkxQm7Rans+5+6kWRhJ96igkUi jxxA== Received: by 10.50.40.193 with SMTP id z1mr10939046igk.0.1340715632155; Tue, 26 Jun 2012 06:00:32 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.24.148 with SMTP id v20csp77238ibb; Tue, 26 Jun 2012 06:00:31 -0700 (PDT) Received: by 10.216.207.85 with SMTP id m63mr8471777weo.183.1340715630533; Tue, 26 Jun 2012 06:00:30 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [81.2.115.146]) by mx.google.com with ESMTPS id eu2si3972155wib.8.2012.06.26.06.00.29 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 26 Jun 2012 06:00:30 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) client-ip=81.2.115.146; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) smtp.mail=pm215@archaic.org.uk 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 Cc: patches@linaro.org Subject: [PATCH] target-arm: Fix typo that meant TTBR1 accesses went to TTBR0 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-Gm-Message-State: ALoCoQloXmxp09Lp37yKYavFDljQs26wLaKuNOxwpn3wlQRby+9qpcC9rEECdFnU5tXc5/1SzPAZ 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,