From 4e9cc940d82a8a548202416ef8e10f5345b0116d Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Mon, 4 Apr 2016 17:33:51 +0100 Subject: 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: Peter Maydell Reviewed-by: Sergey Fedorov Message-id: 1459435778-5526-3-git-send-email-peter.maydell@linaro.org --- target-arm/helper.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/target-arm/helper.c b/target-arm/helper.c index fb0947f..8b99a50 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -3512,7 +3512,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, @@ -3762,7 +3761,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, -- cgit v1.1