From patchwork Thu Jun 28 13:42:57 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 9674 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 2504523E40 for ; Thu, 28 Jun 2012 13:43:05 +0000 (UTC) Received: from mail-gg0-f180.google.com (mail-gg0-f180.google.com [209.85.161.180]) by fiordland.canonical.com (Postfix) with ESMTP id E1231A188FC for ; Thu, 28 Jun 2012 13:43:04 +0000 (UTC) Received: by ggnf1 with SMTP id f1so1990701ggn.11 for ; Thu, 28 Jun 2012 06:43:04 -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=Czj52d/WlN+ascOrhaipC2tyhweZ2ecrPQvTZ8WCjVo=; b=Gsf4XUAvrTwa/VrwX14sd42hKjoIXS3NZNBoZq/j/ReeSSXkcfGjt9IjBHLi65VsKy gDU7XEhLXHVk2mShK2BBQ4thIWdrDtOAyV18qCiBs/9nd9sg62sgqG/zlT+cEUPbBIl5 fr4B7mi1KYvp/tZ4sgYqVSLDEEJZw8XDHjkMqhf9lmQRNEOQ4YuZyigpik0pKujTDh5s Q/GwJ3oj85HHicfbtjg3HbWFUkGjLykqkoymvvsxXpsQVU3TijTYXc7g7eTMDbr7AKrC NqKe3GeAp8BwYv8I9qYIZmbdeEKVOvkWx4ncLIrX3Yxn7Er2/y6eiUek9mugd/s0H8xW +D5g== Received: by 10.50.87.227 with SMTP id bb3mr696153igb.57.1340890983970; Thu, 28 Jun 2012 06:43:03 -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 v20csp42181ibb; Thu, 28 Jun 2012 06:43:03 -0700 (PDT) Received: by 10.216.50.80 with SMTP id y58mr1154319web.106.1340890982665; Thu, 28 Jun 2012 06:43:02 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [81.2.115.146]) by mx.google.com with ESMTPS id m17si27237457wee.132.2012.06.28.06.43.02 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 28 Jun 2012 06:43:02 -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 1SkEzq-0008Kt-1C; Thu, 28 Jun 2012 14:42:58 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org Subject: [PATCH] target-arm: Fix some copy-and-paste errors in cp register names Date: Thu, 28 Jun 2012 14:42:57 +0100 Message-Id: <1340890977-32020-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 X-Gm-Message-State: ALoCoQnqKnD5BeRGx8pM9qzDNy5uZLWLQ6tdgZyep6tRFzQFq8fB1qgU81sZhve4iCaXQ0bVGKAy Fix a couple of cases where cp register names were copy-and-pasted. These are harmless since we don't use the name for anything (except debugging convenience) but could be confusing. Signed-off-by: Peter Maydell Reviewed-by: Igor Mitsyanko --- target-arm/helper.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/target-arm/helper.c b/target-arm/helper.c index 2309923..7a9ad8d 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -216,9 +216,9 @@ static const ARMCPRegInfo v6_cp_reginfo[] = { .access = PL1_W, .type = ARM_CP_NOP }, { .name = "ISB", .cp = 15, .crn = 7, .crm = 5, .opc1 = 0, .opc2 = 4, .access = PL0_W, .type = ARM_CP_NOP }, - { .name = "ISB", .cp = 15, .crn = 7, .crm = 10, .opc1 = 0, .opc2 = 4, + { .name = "DSB", .cp = 15, .crn = 7, .crm = 10, .opc1 = 0, .opc2 = 4, .access = PL0_W, .type = ARM_CP_NOP }, - { .name = "ISB", .cp = 15, .crn = 7, .crm = 10, .opc1 = 0, .opc2 = 5, + { .name = "DMB", .cp = 15, .crn = 7, .crm = 10, .opc1 = 0, .opc2 = 5, .access = PL0_W, .type = ARM_CP_NOP }, { .name = "IFAR", .cp = 15, .crn = 6, .crm = 0, .opc1 = 0, .opc2 = 2, .access = PL1_RW, .fieldoffset = offsetof(CPUARMState, cp15.c6_insn), @@ -346,7 +346,7 @@ static const ARMCPRegInfo v7_cp_reginfo[] = { */ { .name = "DBGDRAR", .cp = 14, .crn = 1, .crm = 0, .opc1 = 0, .opc2 = 0, .access = PL0_R, .type = ARM_CP_CONST, .resetvalue = 0 }, - { .name = "DBGDRAR", .cp = 14, .crn = 2, .crm = 0, .opc1 = 0, .opc2 = 0, + { .name = "DBGDSAR", .cp = 14, .crn = 2, .crm = 0, .opc1 = 0, .opc2 = 0, .access = PL0_R, .type = ARM_CP_CONST, .resetvalue = 0 }, /* the old v6 WFI, UNPREDICTABLE in v7 but we choose to NOP */ { .name = "NOP", .cp = 15, .crn = 7, .crm = 0, .opc1 = 0, .opc2 = 4,