From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:38153) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SlOAO-0005EX-23 for qemu-devel@nongnu.org; Sun, 01 Jul 2012 13:42:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SlOAL-0005lq-Vh for qemu-devel@nongnu.org; Sun, 01 Jul 2012 13:42:35 -0400 Received: from mail-lb0-f173.google.com ([209.85.217.173]:60596) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SlOAL-0005lh-LG for qemu-devel@nongnu.org; Sun, 01 Jul 2012 13:42:33 -0400 Received: by lbok6 with SMTP id k6so5955012lbo.4 for ; Sun, 01 Jul 2012 10:42:29 -0700 (PDT) Message-ID: <4FF08C05.8090504@gmail.com> Date: Sun, 01 Jul 2012 21:42:29 +0400 From: Igor Mitsyanko MIME-Version: 1.0 References: <1340890977-32020-1-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1340890977-32020-1-git-send-email-peter.maydell@linaro.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] target-arm: Fix some copy-and-paste errors in cp register names List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell Cc: qemu-devel@nongnu.org, patches@linaro.org On 6/28/2012 5:42 PM, Peter Maydell wrote: > 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 > --- > 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, > just like it named in architecture reference manual Reviewed-by: Igor Mitsyanko