Commit 094a7d0b authored by Peter Maydell's avatar Peter Maydell
Browse files

target-arm: Remove incorrect ALIAS tags from ESR_EL2 and ESR_EL3 



The regdefs for the ESR_EL2 and ESR_EL3 system registers should not
be marked as ARM_CP_ALIAS, because these are the master copies; the
DFSR regdef in vmsa_pmsa_cp_reginfo[] is marked as an alias.
Remove the ALIAS tags so that these registers are correctly migrated.

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: default avatarSergey Fedorov <sergey.fedorov@linaro.rog>
Message-id: 1459435778-5526-3-git-send-email-peter.maydell@linaro.org
parent e24fdd23

target-arm/helper.c

+0 −2
Original line number Diff line number Diff line
@@ -3509,7 +3509,6 @@ static const ARMCPRegInfo el2_cp_reginfo[] = { 
      .access = PL2_RW,

      .fieldoffset = offsetof(CPUARMState, elr_el[2]) },

    { .name = "ESR_EL2", .state = ARM_CP_STATE_AA64,

      .type = ARM_CP_ALIAS,

      .opc0 = 3, .opc1 = 4, .crn = 5, .crm = 2, .opc2 = 0,

      .access = PL2_RW, .fieldoffset = offsetof(CPUARMState, cp15.esr_el[2]) },

    { .name = "FAR_EL2", .state = ARM_CP_STATE_AA64,
@@ -3759,7 +3758,6 @@ static const ARMCPRegInfo el3_cp_reginfo[] = { 
      .access = PL3_RW,

      .fieldoffset = offsetof(CPUARMState, elr_el[3]) },

    { .name = "ESR_EL3", .state = ARM_CP_STATE_AA64,

      .type = ARM_CP_ALIAS,

      .opc0 = 3, .opc1 = 6, .crn = 5, .crm = 2, .opc2 = 0,

      .access = PL3_RW, .fieldoffset = offsetof(CPUARMState, cp15.esr_el[3]) },

    { .name = "FAR_EL3", .state = ARM_CP_STATE_AA64,