From patchwork Thu Jun 28 14:35:55 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 9687 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 F038023E4E for ; Thu, 28 Jun 2012 14:56:42 +0000 (UTC) Received: from mail-yx0-f180.google.com (mail-yx0-f180.google.com [209.85.213.180]) by fiordland.canonical.com (Postfix) with ESMTP id C0B31A18938 for ; Thu, 28 Jun 2012 14:56:42 +0000 (UTC) Received: by mail-yx0-f180.google.com with SMTP id q6so2087192yen.11 for ; Thu, 28 Jun 2012 07:56:42 -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:in-reply-to:references :x-gm-message-state; bh=AmBPjPFjVUptEzekUpjG9ai7M9aS9v2KvMGd1rHzbW8=; b=dCOklNyErKoH8ARQCVJ2NQXiyTEbGtUsTe4aXXFATIoUc3XzVsRyfQIHBZsCoUUznz vishsJrCK5Lcf4cLhZ24DpTmD5d5SnsZ17rxlyeIEStX0uoD5fZGAI3vQ3oSyqUMrDpu BmCe7HQXbUL4nDiTuy+O0l1FubfV74TBk/rzSM7dGWgqSfbReeuxUWPSQReGySSK7Bcq 9yGnFoh+98LkoINklhP4dxUjF9/VtB7yrLeqy/79+/kXMem52+nLlE2XKjgYo+QTGIzo obKhEaQMBAqqG7Ptyo7shomX4gXJ4bblErQveWRB5DR52j046MnFtyGxhMx3HiXZWTaU g9mA== Received: by 10.50.46.232 with SMTP id y8mr136724igm.57.1340895402402; Thu, 28 Jun 2012 07:56:42 -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 v20csp44004ibb; Thu, 28 Jun 2012 07:56:41 -0700 (PDT) Received: by 10.180.79.229 with SMTP id m5mr720379wix.13.1340895400957; Thu, 28 Jun 2012 07:56:40 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [81.2.115.146]) by mx.google.com with ESMTPS id cr7si1168028wib.1.2012.06.28.07.56.40 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 28 Jun 2012 07:56:40 -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 1SkFpG-0008MK-AN; Thu, 28 Jun 2012 15:36:06 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org Subject: [PATCH 02/13] target-arm: Fix typo that meant TTBR1 accesses went to TTBR0 Date: Thu, 28 Jun 2012 15:35:55 +0100 Message-Id: <1340894166-32105-3-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1340894166-32105-1-git-send-email-peter.maydell@linaro.org> References: <1340894166-32105-1-git-send-email-peter.maydell@linaro.org> X-Gm-Message-State: ALoCoQlrtF3WVyMzAnI89oSSqrT6ycLgt+t07ypxP42NFScSJh4T2OLHIaShkQSv8VKmTl4/Lzms 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 --- 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,