changeset 5b80960dcf08 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=5b80960dcf08
description:
arm: update AArch{64,32} register mappings
Change-Id: Idaaaeb3f7b1a0bdbf18d8e2d46686c78bb411317
Reviewed-by: Andreas Sandberg <[email protected]>
diffstat:
src/arch/arm/isa.cc | 200 ++++++++++++++++++---------
src/arch/arm/isa.hh | 70 +---------
src/arch/arm/miscregs.hh | 8 +-
util/cpt_upgraders/arm-sysreg-mapping-ns.py | 72 ++++++++++
4 files changed, 210 insertions(+), 140 deletions(-)
diffs (truncated from 427 to 300 lines):
diff -r 6ef6e5dbff2d -r 5b80960dcf08 src/arch/arm/isa.cc
--- a/src/arch/arm/isa.cc Mon Dec 19 16:25:40 2016 +0000
+++ b/src/arch/arm/isa.cc Mon Dec 19 11:03:27 2016 -0600
@@ -56,71 +56,151 @@
/**
- * Some registers aliase with others, and therefore need to be translated.
+ * Some registers alias with others, and therefore need to be translated.
* For each entry:
* The first value is the misc register that is to be looked up
* the second value is the lower part of the translation
* the third the upper part
+ * aligned with reference documentation ARM DDI 0487A.i pp 1540-1543
*/
const struct ISA::MiscRegInitializerEntry
- ISA::MiscRegSwitch[miscRegTranslateMax] = {
- {MISCREG_CSSELR_EL1, {MISCREG_CSSELR, 0}},
- {MISCREG_SCTLR_EL1, {MISCREG_SCTLR, 0}},
- {MISCREG_SCTLR_EL2, {MISCREG_HSCTLR, 0}},
- {MISCREG_ACTLR_EL1, {MISCREG_ACTLR, 0}},
+ ISA::MiscRegSwitch[] = {
+ {MISCREG_ACTLR_EL1, {MISCREG_ACTLR_NS, 0}},
+ {MISCREG_AFSR0_EL1, {MISCREG_ADFSR_NS, 0}},
+ {MISCREG_AFSR1_EL1, {MISCREG_AIFSR_NS, 0}},
+ {MISCREG_AMAIR_EL1, {MISCREG_AMAIR0_NS, MISCREG_AMAIR1_NS}},
+ {MISCREG_CONTEXTIDR_EL1, {MISCREG_CONTEXTIDR_NS, 0}},
+ {MISCREG_CPACR_EL1, {MISCREG_CPACR, 0}},
+ {MISCREG_CSSELR_EL1, {MISCREG_CSSELR_NS, 0}},
+ {MISCREG_DACR32_EL2, {MISCREG_DACR_NS, 0}},
+ {MISCREG_FAR_EL1, {MISCREG_DFAR_NS, MISCREG_IFAR_NS}},
+ // ESR_EL1 -> DFSR
+ {MISCREG_HACR_EL2, {MISCREG_HACR, 0}},
{MISCREG_ACTLR_EL2, {MISCREG_HACTLR, 0}},
- {MISCREG_CPACR_EL1, {MISCREG_CPACR, 0}},
- {MISCREG_CPTR_EL2, {MISCREG_HCPTR, 0}},
- {MISCREG_HCR_EL2, {MISCREG_HCR, 0}},
- {MISCREG_MDCR_EL2, {MISCREG_HDCR, 0}},
- {MISCREG_HSTR_EL2, {MISCREG_HSTR, 0}},
- {MISCREG_HACR_EL2, {MISCREG_HACR, 0}},
- {MISCREG_TTBR0_EL1, {MISCREG_TTBR0, 0}},
- {MISCREG_TTBR1_EL1, {MISCREG_TTBR1, 0}},
- {MISCREG_TTBR0_EL2, {MISCREG_HTTBR, 0}},
- {MISCREG_VTTBR_EL2, {MISCREG_VTTBR, 0}},
- {MISCREG_TCR_EL1, {MISCREG_TTBCR, 0}},
- {MISCREG_TCR_EL2, {MISCREG_HTCR, 0}},
- {MISCREG_VTCR_EL2, {MISCREG_VTCR, 0}},
- {MISCREG_AFSR0_EL1, {MISCREG_ADFSR, 0}},
- {MISCREG_AFSR1_EL1, {MISCREG_AIFSR, 0}},
{MISCREG_AFSR0_EL2, {MISCREG_HADFSR, 0}},
{MISCREG_AFSR1_EL2, {MISCREG_HAIFSR, 0}},
+ {MISCREG_AMAIR_EL2, {MISCREG_HAMAIR0, MISCREG_HAMAIR1}},
+ {MISCREG_CPTR_EL2, {MISCREG_HCPTR, 0}},
+ {MISCREG_HCR_EL2, {MISCREG_HCR, 0 /*MISCREG_HCR2*/}},
+ {MISCREG_MDCR_EL2, {MISCREG_HDCR, 0}},
+ {MISCREG_FAR_EL2, {MISCREG_HDFAR, MISCREG_HIFAR}},
+ {MISCREG_MAIR_EL2, {MISCREG_HMAIR0, MISCREG_HMAIR1}},
+ {MISCREG_HPFAR_EL2, {MISCREG_HPFAR, 0}},
+ {MISCREG_SCTLR_EL2, {MISCREG_HSCTLR, 0}},
{MISCREG_ESR_EL2, {MISCREG_HSR, 0}},
- {MISCREG_FAR_EL1, {MISCREG_DFAR, MISCREG_IFAR}},
- {MISCREG_FAR_EL2, {MISCREG_HDFAR, MISCREG_HIFAR}},
- {MISCREG_HPFAR_EL2, {MISCREG_HPFAR, 0}},
- {MISCREG_PAR_EL1, {MISCREG_PAR, 0}},
- {MISCREG_MAIR_EL1, {MISCREG_PRRR, MISCREG_NMRR}},
- {MISCREG_MAIR_EL2, {MISCREG_HMAIR0, MISCREG_HMAIR1}},
- {MISCREG_AMAIR_EL1, {MISCREG_AMAIR0, MISCREG_AMAIR1}},
- {MISCREG_VBAR_EL1, {MISCREG_VBAR, 0}},
+ {MISCREG_HSTR_EL2, {MISCREG_HSTR, 0}},
+ {MISCREG_TCR_EL2, {MISCREG_HTCR, 0}},
+ {MISCREG_TPIDR_EL2, {MISCREG_HTPIDR, 0}},
+ {MISCREG_TTBR0_EL2, {MISCREG_HTTBR, 0}},
{MISCREG_VBAR_EL2, {MISCREG_HVBAR, 0}},
- {MISCREG_CONTEXTIDR_EL1, {MISCREG_CONTEXTIDR, 0}},
- {MISCREG_TPIDR_EL0, {MISCREG_TPIDRURW, 0}},
- {MISCREG_TPIDRRO_EL0, {MISCREG_TPIDRURO, 0}},
- {MISCREG_TPIDR_EL1, {MISCREG_TPIDRPRW, 0}},
- {MISCREG_TPIDR_EL2, {MISCREG_HTPIDR, 0}},
- {MISCREG_TEECR32_EL1, {MISCREG_TEECR, 0}},
+ {MISCREG_IFSR32_EL2, {MISCREG_IFSR_NS, 0}},
+ {MISCREG_MAIR_EL1, {MISCREG_PRRR_NS, MISCREG_NMRR_NS}},
+ {MISCREG_PAR_EL1, {MISCREG_PAR_NS, 0}},
+ // RMR_EL1 -> RMR
+ // RMR_EL2 -> HRMR
+ {MISCREG_SCTLR_EL1, {MISCREG_SCTLR_NS, 0}},
+ {MISCREG_SDER32_EL3, {MISCREG_SDER, 0}},
+ {MISCREG_TPIDR_EL1, {MISCREG_TPIDRPRW_NS, 0}},
+ {MISCREG_TPIDRRO_EL0, {MISCREG_TPIDRURO_NS, 0}},
+ {MISCREG_TPIDR_EL0, {MISCREG_TPIDRURW_NS, 0}},
+ {MISCREG_TCR_EL1, {MISCREG_TTBCR_NS, 0}},
+ {MISCREG_TTBR0_EL1, {MISCREG_TTBR0_NS, 0}},
+ {MISCREG_TTBR1_EL1, {MISCREG_TTBR1_NS, 0}},
+ {MISCREG_VBAR_EL1, {MISCREG_VBAR_NS, 0}},
+ {MISCREG_VMPIDR_EL2, {MISCREG_VMPIDR, 0}},
+ {MISCREG_VPIDR_EL2, {MISCREG_VPIDR, 0}},
+ {MISCREG_VTCR_EL2, {MISCREG_VTCR, 0}},
+ {MISCREG_VTTBR_EL2, {MISCREG_VTTBR, 0}},
{MISCREG_CNTFRQ_EL0, {MISCREG_CNTFRQ, 0}},
- {MISCREG_CNTPCT_EL0, {MISCREG_CNTPCT, 0}},
- {MISCREG_CNTVCT_EL0, {MISCREG_CNTVCT, 0}},
- {MISCREG_CNTVOFF_EL2, {MISCREG_CNTVOFF, 0}},
+ {MISCREG_CNTHCTL_EL2, {MISCREG_CNTHCTL, 0}},
+ {MISCREG_CNTHP_CTL_EL2, {MISCREG_CNTHP_CTL, 0}},
+ {MISCREG_CNTHP_CVAL_EL2, {MISCREG_CNTHP_CVAL, 0}}, /* 64b */
+ {MISCREG_CNTHP_TVAL_EL2, {MISCREG_CNTHP_TVAL, 0}},
{MISCREG_CNTKCTL_EL1, {MISCREG_CNTKCTL, 0}},
- {MISCREG_CNTHCTL_EL2, {MISCREG_CNTHCTL, 0}},
- {MISCREG_CNTP_TVAL_EL0, {MISCREG_CNTP_TVAL, 0}},
- {MISCREG_CNTP_CTL_EL0, {MISCREG_CNTP_CTL, 0}},
- {MISCREG_CNTP_CVAL_EL0, {MISCREG_CNTP_CVAL, 0}},
+ {MISCREG_CNTP_CTL_EL0, {MISCREG_CNTP_CTL_NS, 0}},
+ {MISCREG_CNTP_CVAL_EL0, {MISCREG_CNTP_CVAL_NS, 0}}, /* 64b */
+ {MISCREG_CNTP_TVAL_EL0, {MISCREG_CNTP_TVAL_NS, 0}},
+ {MISCREG_CNTPCT_EL0, {MISCREG_CNTPCT, 0}}, /* 64b */
+ {MISCREG_CNTV_CTL_EL0, {MISCREG_CNTV_CTL, 0}},
+ {MISCREG_CNTV_CVAL_EL0, {MISCREG_CNTV_CVAL, 0}}, /* 64b */
{MISCREG_CNTV_TVAL_EL0, {MISCREG_CNTV_TVAL, 0}},
- {MISCREG_CNTV_CTL_EL0, {MISCREG_CNTV_CTL, 0}},
- {MISCREG_CNTV_CVAL_EL0, {MISCREG_CNTV_CVAL, 0}},
- {MISCREG_CNTHP_TVAL_EL2, {MISCREG_CNTHP_TVAL, 0}},
- {MISCREG_CNTHP_CTL_EL2, {MISCREG_CNTHP_CTL, 0}},
- {MISCREG_CNTHP_CVAL_EL2, {MISCREG_CNTHP_CVAL, 0}},
- {MISCREG_DACR32_EL2, {MISCREG_DACR, 0}},
- {MISCREG_IFSR32_EL2, {MISCREG_IFSR, 0}},
- {MISCREG_TEEHBR32_EL1, {MISCREG_TEEHBR, 0}},
- {MISCREG_SDER32_EL3, {MISCREG_SDER, 0}}
+ {MISCREG_CNTVCT_EL0, {MISCREG_CNTVCT, 0}}, /* 64b */
+ {MISCREG_CNTVOFF_EL2, {MISCREG_CNTVOFF, 0}}, /* 64b */
+ {MISCREG_DBGAUTHSTATUS_EL1, {MISCREG_DBGAUTHSTATUS, 0}},
+ {MISCREG_DBGBCR0_EL1, {MISCREG_DBGBCR0, 0}},
+ {MISCREG_DBGBCR1_EL1, {MISCREG_DBGBCR1, 0}},
+ {MISCREG_DBGBCR2_EL1, {MISCREG_DBGBCR2, 0}},
+ {MISCREG_DBGBCR3_EL1, {MISCREG_DBGBCR3, 0}},
+ {MISCREG_DBGBCR4_EL1, {MISCREG_DBGBCR4, 0}},
+ {MISCREG_DBGBCR5_EL1, {MISCREG_DBGBCR5, 0}},
+ {MISCREG_DBGBVR0_EL1, {MISCREG_DBGBVR0, 0 /* MISCREG_DBGBXVR0 */}},
+ {MISCREG_DBGBVR1_EL1, {MISCREG_DBGBVR1, 0 /* MISCREG_DBGBXVR1 */}},
+ {MISCREG_DBGBVR2_EL1, {MISCREG_DBGBVR2, 0 /* MISCREG_DBGBXVR2 */}},
+ {MISCREG_DBGBVR3_EL1, {MISCREG_DBGBVR3, 0 /* MISCREG_DBGBXVR3 */}},
+ {MISCREG_DBGBVR4_EL1, {MISCREG_DBGBVR4, MISCREG_DBGBXVR4}},
+ {MISCREG_DBGBVR5_EL1, {MISCREG_DBGBVR5, MISCREG_DBGBXVR5}},
+ {MISCREG_DBGCLAIMSET_EL1, {MISCREG_DBGCLAIMSET, 0}},
+ {MISCREG_DBGCLAIMCLR_EL1, {MISCREG_DBGCLAIMCLR, 0}},
+ // DBGDTR_EL0 -> DBGDTR{R or T}Xint
+ // DBGDTRRX_EL0 -> DBGDTRRXint
+ // DBGDTRTX_EL0 -> DBGDTRRXint
+ {MISCREG_DBGPRCR_EL1, {MISCREG_DBGPRCR, 0}},
+ {MISCREG_DBGVCR32_EL2, {MISCREG_DBGVCR, 0}},
+ {MISCREG_DBGWCR0_EL1, {MISCREG_DBGWCR0, 0}},
+ {MISCREG_DBGWCR1_EL1, {MISCREG_DBGWCR1, 0}},
+ {MISCREG_DBGWCR2_EL1, {MISCREG_DBGWCR2, 0}},
+ {MISCREG_DBGWCR3_EL1, {MISCREG_DBGWCR3, 0}},
+ {MISCREG_DBGWVR0_EL1, {MISCREG_DBGWVR0, 0}},
+ {MISCREG_DBGWVR1_EL1, {MISCREG_DBGWVR1, 0}},
+ {MISCREG_DBGWVR2_EL1, {MISCREG_DBGWVR2, 0}},
+ {MISCREG_DBGWVR3_EL1, {MISCREG_DBGWVR3, 0}},
+ {MISCREG_ID_DFR0_EL1, {MISCREG_ID_DFR0, 0}},
+ {MISCREG_MDCCSR_EL0, {MISCREG_DBGDSCRint, 0}},
+ {MISCREG_MDRAR_EL1, {MISCREG_DBGDRAR, 0}},
+ {MISCREG_MDSCR_EL1, {MISCREG_DBGDSCRext, 0}},
+ {MISCREG_OSDLR_EL1, {MISCREG_DBGOSDLR, 0}},
+ {MISCREG_OSDTRRX_EL1, {MISCREG_DBGDTRRXext, 0}},
+ {MISCREG_OSDTRTX_EL1, {MISCREG_DBGDTRTXext, 0}},
+ {MISCREG_OSECCR_EL1, {MISCREG_DBGOSECCR, 0}},
+ {MISCREG_OSLAR_EL1, {MISCREG_DBGOSLAR, 0}},
+ {MISCREG_OSLSR_EL1, {MISCREG_DBGOSLSR, 0}},
+ {MISCREG_PMCCNTR_EL0, {MISCREG_PMCCNTR, 0}},
+ {MISCREG_PMCEID0_EL0, {MISCREG_PMCEID0, 0}},
+ {MISCREG_PMCEID1_EL0, {MISCREG_PMCEID1, 0}},
+ {MISCREG_PMCNTENSET_EL0, {MISCREG_PMCNTENSET, 0}},
+ {MISCREG_PMCNTENCLR_EL0, {MISCREG_PMCNTENCLR, 0}},
+ {MISCREG_PMCR_EL0, {MISCREG_PMCR, 0}},
+/* {MISCREG_PMEVCNTR0_EL0, {MISCREG_PMEVCNTR0, 0}},
+ {MISCREG_PMEVCNTR1_EL0, {MISCREG_PMEVCNTR1, 0}},
+ {MISCREG_PMEVCNTR2_EL0, {MISCREG_PMEVCNTR2, 0}},
+ {MISCREG_PMEVCNTR3_EL0, {MISCREG_PMEVCNTR3, 0}},
+ {MISCREG_PMEVCNTR4_EL0, {MISCREG_PMEVCNTR4, 0}},
+ {MISCREG_PMEVCNTR5_EL0, {MISCREG_PMEVCNTR5, 0}},
+ {MISCREG_PMEVTYPER0_EL0, {MISCREG_PMEVTYPER0, 0}},
+ {MISCREG_PMEVTYPER1_EL0, {MISCREG_PMEVTYPER1, 0}},
+ {MISCREG_PMEVTYPER2_EL0, {MISCREG_PMEVTYPER2, 0}},
+ {MISCREG_PMEVTYPER3_EL0, {MISCREG_PMEVTYPER3, 0}},
+ {MISCREG_PMEVTYPER4_EL0, {MISCREG_PMEVTYPER4, 0}},
+ {MISCREG_PMEVTYPER5_EL0, {MISCREG_PMEVTYPER5, 0}}, */
+ {MISCREG_PMINTENCLR_EL1, {MISCREG_PMINTENCLR, 0}},
+ {MISCREG_PMINTENSET_EL1, {MISCREG_PMINTENSET, 0}},
+// {MISCREG_PMOVSCLR_EL0, {MISCREG_PMOVSCLR, 0}},
+ {MISCREG_PMOVSSET_EL0, {MISCREG_PMOVSSET, 0}},
+ {MISCREG_PMSELR_EL0, {MISCREG_PMSELR, 0}},
+ {MISCREG_PMSWINC_EL0, {MISCREG_PMSWINC, 0}},
+ {MISCREG_PMUSERENR_EL0, {MISCREG_PMUSERENR, 0}},
+ {MISCREG_PMXEVCNTR_EL0, {MISCREG_PMXEVCNTR, 0}},
+ {MISCREG_PMXEVTYPER_EL0, {MISCREG_PMXEVTYPER, 0}},
+
+ // from ARM DDI 0487A.i, template text
+ // "AArch64 System register ___ can be mapped to
+ // AArch32 System register ___, but this is not
+ // architecturally mandated."
+ {MISCREG_SCR_EL3, {MISCREG_SCR, 0}}, // D7-2005
+ // MDCR_EL3 -> SDCR, D7-2108 (the latter is unimpl. in gem5)
+ {MISCREG_SPSR_EL1, {MISCREG_SPSR_SVC, 0}}, // C5.2.17 SPSR_EL1
+ {MISCREG_SPSR_EL2, {MISCREG_SPSR_HYP, 0}}, // C5.2.18 SPSR_EL2
+ {MISCREG_SPSR_EL3, {MISCREG_SPSR_MON, 0}}, // C5.2.19 SPSR_EL3
};
@@ -160,13 +240,8 @@
}
/** Fill in the miscReg translation table */
- for (uint32_t i = 0; i < miscRegTranslateMax; i++) {
- struct MiscRegLUTEntry new_entry;
-
- uint32_t select = MiscRegSwitch[i].index;
- new_entry = MiscRegSwitch[i].entry;
-
- lookUpMiscReg[select] = new_entry;
+ for (auto sw : MiscRegSwitch) {
+ lookUpMiscReg[sw.index] = sw.entry;
}
preUnflattenMiscReg();
@@ -719,15 +794,6 @@
return (readMiscRegNoEffect(MISCREG_HSCTLR) & ~mask) |
(readMiscRegNoEffect(MISCREG_SCTLR) & mask);
}
- case MISCREG_SCR:
- {
- CPSR cpsr = readMiscRegNoEffect(MISCREG_CPSR);
- if (cpsr.width) {
- return readMiscRegNoEffect(MISCREG_SCR);
- } else {
- return readMiscRegNoEffect(MISCREG_SCR_EL3);
- }
- }
// Generic Timer registers
case MISCREG_CNTFRQ ... MISCREG_CNTHP_CTL:
diff -r 6ef6e5dbff2d -r 5b80960dcf08 src/arch/arm/isa.hh
--- a/src/arch/arm/isa.hh Mon Dec 19 16:25:40 2016 +0000
+++ b/src/arch/arm/isa.hh Mon Dec 19 11:03:27 2016 -0600
@@ -60,73 +60,6 @@
namespace ArmISA
{
-
- /**
- * At the moment there are 57 registers which need to be aliased/
- * translated with other registers in the ISA. This enum helps with that
- * translation.
- */
- enum translateTable {
- miscRegTranslateCSSELR_EL1,
- miscRegTranslateSCTLR_EL1,
- miscRegTranslateSCTLR_EL2,
- miscRegTranslateACTLR_EL1,
- miscRegTranslateACTLR_EL2,
- miscRegTranslateCPACR_EL1,
- miscRegTranslateCPTR_EL2,
- miscRegTranslateHCR_EL2,
- miscRegTranslateMDCR_EL2,
- miscRegTranslateHSTR_EL2,
- miscRegTranslateHACR_EL2,
- miscRegTranslateTTBR0_EL1,
- miscRegTranslateTTBR1_EL1,
- miscRegTranslateTTBR0_EL2,
- miscRegTranslateVTTBR_EL2,
- miscRegTranslateTCR_EL1,
- miscRegTranslateTCR_EL2,
- miscRegTranslateVTCR_EL2,
- miscRegTranslateAFSR0_EL1,
- miscRegTranslateAFSR1_EL1,
- miscRegTranslateAFSR0_EL2,
- miscRegTranslateAFSR1_EL2,
- miscRegTranslateESR_EL2,
- miscRegTranslateFAR_EL1,
- miscRegTranslateFAR_EL2,
- miscRegTranslateHPFAR_EL2,
- miscRegTranslatePAR_EL1,
- miscRegTranslateMAIR_EL1,
- miscRegTranslateMAIR_EL2,
- miscRegTranslateAMAIR_EL1,
- miscRegTranslateVBAR_EL1,
- miscRegTranslateVBAR_EL2,
- miscRegTranslateCONTEXTIDR_EL1,
- miscRegTranslateTPIDR_EL0,
- miscRegTranslateTPIDRRO_EL0,
- miscRegTranslateTPIDR_EL1,
- miscRegTranslateTPIDR_EL2,
- miscRegTranslateTEECR32_EL1,
- miscRegTranslateCNTFRQ_EL0,
- miscRegTranslateCNTPCT_EL0,
- miscRegTranslateCNTVCT_EL0,
- miscRegTranslateCNTVOFF_EL2,
- miscRegTranslateCNTKCTL_EL1,
- miscRegTranslateCNTHCTL_EL2,
- miscRegTranslateCNTP_TVAL_EL0,
- miscRegTranslateCNTP_CTL_EL0,
- miscRegTranslateCNTP_CVAL_EL0,
- miscRegTranslateCNTV_TVAL_EL0,
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
