Re: [Qemu-devel] [PATCH] target-arm: Fix some copy-and-paste errors in cp register names

[Igor Mitsyanko]

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 <address@hidden>
> ---
>   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 <address@hidden>