diff --git a/src/arch/arm/isa.cc b/src/arch/arm/isa.cc
index 7096889..6a803fe 100644
--- a/src/arch/arm/isa.cc
+++ b/src/arch/arm/isa.cc
@@ -58,152 +58,163 @@
 
 /**
  * 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
+ * When two mapping registers are given, they are the 32b lower and
+ * upper halves, respectively, of the 64b register being mapped.
  * aligned with reference documentation ARM DDI 0487A.i pp 1540-1543
  */
-const struct ISA::MiscRegInitializerEntry
-    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}},
+void
+ISA::initializeMiscRegMetadata()
+{
+    InitReg(MISCREG_ACTLR_EL1).mapsTo(MISCREG_ACTLR_NS);
+    InitReg(MISCREG_AFSR0_EL1).mapsTo(MISCREG_ADFSR_NS);
+    InitReg(MISCREG_AFSR1_EL1).mapsTo(MISCREG_AIFSR_NS);
+    InitReg(MISCREG_AMAIR_EL1).mapsTo(MISCREG_AMAIR0_NS,
+                                      MISCREG_AMAIR1_NS);
+    InitReg(MISCREG_CONTEXTIDR_EL1).mapsTo(MISCREG_CONTEXTIDR_NS);
+    InitReg(MISCREG_CPACR_EL1).mapsTo(MISCREG_CPACR);
+    InitReg(MISCREG_CSSELR_EL1).mapsTo(MISCREG_CSSELR_NS);
+    InitReg(MISCREG_DACR32_EL2).mapsTo(MISCREG_DACR_NS);
+    InitReg(MISCREG_FAR_EL1).mapsTo(MISCREG_DFAR_NS,
+                                    MISCREG_IFAR_NS);
     // ESR_EL1 -> DFSR
-    {MISCREG_HACR_EL2, {MISCREG_HACR, 0}},
-    {MISCREG_ACTLR_EL2, {MISCREG_HACTLR, 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_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_IFSR32_EL2, {MISCREG_IFSR_NS, 0}},
-    {MISCREG_MAIR_EL1, {MISCREG_PRRR_NS, MISCREG_NMRR_NS}},
-    {MISCREG_PAR_EL1, {MISCREG_PAR_NS, 0}},
+    InitReg(MISCREG_HACR_EL2).mapsTo(MISCREG_HACR);
+    InitReg(MISCREG_ACTLR_EL2).mapsTo(MISCREG_HACTLR);
+    InitReg(MISCREG_AFSR0_EL2).mapsTo(MISCREG_HADFSR);
+    InitReg(MISCREG_AFSR1_EL2).mapsTo(MISCREG_HAIFSR);
+    InitReg(MISCREG_AMAIR_EL2).mapsTo(MISCREG_HAMAIR0,
+                                      MISCREG_HAMAIR1);
+    InitReg(MISCREG_CPTR_EL2).mapsTo(MISCREG_HCPTR);
+    InitReg(MISCREG_HCR_EL2).mapsTo(MISCREG_HCR /*,
+                                    MISCREG_HCR2*/);
+    InitReg(MISCREG_MDCR_EL2).mapsTo(MISCREG_HDCR);
+    InitReg(MISCREG_FAR_EL2).mapsTo(MISCREG_HDFAR,
+                                    MISCREG_HIFAR);
+    InitReg(MISCREG_MAIR_EL2).mapsTo(MISCREG_HMAIR0,
+                                     MISCREG_HMAIR1);
+    InitReg(MISCREG_HPFAR_EL2).mapsTo(MISCREG_HPFAR);
+    InitReg(MISCREG_SCTLR_EL2).mapsTo(MISCREG_HSCTLR);
+    InitReg(MISCREG_ESR_EL2).mapsTo(MISCREG_HSR);
+    InitReg(MISCREG_HSTR_EL2).mapsTo(MISCREG_HSTR);
+    InitReg(MISCREG_TCR_EL2).mapsTo(MISCREG_HTCR);
+    InitReg(MISCREG_TPIDR_EL2).mapsTo(MISCREG_HTPIDR);
+    InitReg(MISCREG_TTBR0_EL2).mapsTo(MISCREG_HTTBR);
+    InitReg(MISCREG_VBAR_EL2).mapsTo(MISCREG_HVBAR);
+    InitReg(MISCREG_IFSR32_EL2).mapsTo(MISCREG_IFSR_NS);
+    InitReg(MISCREG_MAIR_EL1).mapsTo(MISCREG_PRRR_NS,
+                                     MISCREG_NMRR_NS);
+    InitReg(MISCREG_PAR_EL1).mapsTo(MISCREG_PAR_NS);
     // 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_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_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_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}},
+    InitReg(MISCREG_SCTLR_EL1).mapsTo(MISCREG_SCTLR_NS);
+    InitReg(MISCREG_SDER32_EL3).mapsTo(MISCREG_SDER);
+    InitReg(MISCREG_TPIDR_EL1).mapsTo(MISCREG_TPIDRPRW_NS);
+    InitReg(MISCREG_TPIDRRO_EL0).mapsTo(MISCREG_TPIDRURO_NS);
+    InitReg(MISCREG_TPIDR_EL0).mapsTo(MISCREG_TPIDRURW_NS);
+    InitReg(MISCREG_TCR_EL1).mapsTo(MISCREG_TTBCR_NS);
+    InitReg(MISCREG_TTBR0_EL1).mapsTo(MISCREG_TTBR0_NS);
+    InitReg(MISCREG_TTBR1_EL1).mapsTo(MISCREG_TTBR1_NS);
+    InitReg(MISCREG_VBAR_EL1).mapsTo(MISCREG_VBAR_NS);
+    InitReg(MISCREG_VMPIDR_EL2).mapsTo(MISCREG_VMPIDR);
+    InitReg(MISCREG_VPIDR_EL2).mapsTo(MISCREG_VPIDR);
+    InitReg(MISCREG_VTCR_EL2).mapsTo(MISCREG_VTCR);
+    InitReg(MISCREG_VTTBR_EL2).mapsTo(MISCREG_VTTBR);
+    InitReg(MISCREG_CNTFRQ_EL0).mapsTo(MISCREG_CNTFRQ);
+    InitReg(MISCREG_CNTHCTL_EL2).mapsTo(MISCREG_CNTHCTL);
+    InitReg(MISCREG_CNTHP_CTL_EL2).mapsTo(MISCREG_CNTHP_CTL);
+    InitReg(MISCREG_CNTHP_CVAL_EL2).mapsTo(MISCREG_CNTHP_CVAL); /* 64b */
+    InitReg(MISCREG_CNTHP_TVAL_EL2).mapsTo(MISCREG_CNTHP_TVAL);
+    InitReg(MISCREG_CNTKCTL_EL1).mapsTo(MISCREG_CNTKCTL);
+    InitReg(MISCREG_CNTP_CTL_EL0).mapsTo(MISCREG_CNTP_CTL_NS);
+    InitReg(MISCREG_CNTP_CVAL_EL0).mapsTo(MISCREG_CNTP_CVAL_NS); /* 64b */
+    InitReg(MISCREG_CNTP_TVAL_EL0).mapsTo(MISCREG_CNTP_TVAL_NS);
+    InitReg(MISCREG_CNTPCT_EL0).mapsTo(MISCREG_CNTPCT); /* 64b */
+    InitReg(MISCREG_CNTV_CTL_EL0).mapsTo(MISCREG_CNTV_CTL);
+    InitReg(MISCREG_CNTV_CVAL_EL0).mapsTo(MISCREG_CNTV_CVAL); /* 64b */
+    InitReg(MISCREG_CNTV_TVAL_EL0).mapsTo(MISCREG_CNTV_TVAL);
+    InitReg(MISCREG_CNTVCT_EL0).mapsTo(MISCREG_CNTVCT); /* 64b */
+    InitReg(MISCREG_CNTVOFF_EL2).mapsTo(MISCREG_CNTVOFF); /* 64b */
+    InitReg(MISCREG_DBGAUTHSTATUS_EL1).mapsTo(MISCREG_DBGAUTHSTATUS);
+    InitReg(MISCREG_DBGBCR0_EL1).mapsTo(MISCREG_DBGBCR0);
+    InitReg(MISCREG_DBGBCR1_EL1).mapsTo(MISCREG_DBGBCR1);
+    InitReg(MISCREG_DBGBCR2_EL1).mapsTo(MISCREG_DBGBCR2);
+    InitReg(MISCREG_DBGBCR3_EL1).mapsTo(MISCREG_DBGBCR3);
+    InitReg(MISCREG_DBGBCR4_EL1).mapsTo(MISCREG_DBGBCR4);
+    InitReg(MISCREG_DBGBCR5_EL1).mapsTo(MISCREG_DBGBCR5);
+    InitReg(MISCREG_DBGBVR0_EL1).mapsTo(MISCREG_DBGBVR0 /*,
+                                        MISCREG_DBGBXVR0 */);
+    InitReg(MISCREG_DBGBVR1_EL1).mapsTo(MISCREG_DBGBVR1 /*,
+                                        MISCREG_DBGBXVR1 */);
+    InitReg(MISCREG_DBGBVR2_EL1).mapsTo(MISCREG_DBGBVR2 /*,
+                                        MISCREG_DBGBXVR2 */);
+    InitReg(MISCREG_DBGBVR3_EL1).mapsTo(MISCREG_DBGBVR3 /*,
+                                        MISCREG_DBGBXVR3 */);
+    InitReg(MISCREG_DBGBVR4_EL1).mapsTo(MISCREG_DBGBVR4 /*,
+                                        MISCREG_DBGBXVR4 */);
+    InitReg(MISCREG_DBGBVR5_EL1).mapsTo(MISCREG_DBGBVR5 /*,
+                                        MISCREG_DBGBXVR5 */);
+    InitReg(MISCREG_DBGCLAIMSET_EL1).mapsTo(MISCREG_DBGCLAIMSET);
+    InitReg(MISCREG_DBGCLAIMCLR_EL1).mapsTo(MISCREG_DBGCLAIMCLR);
     // 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}},
+    InitReg(MISCREG_DBGPRCR_EL1).mapsTo(MISCREG_DBGPRCR);
+    InitReg(MISCREG_DBGVCR32_EL2).mapsTo(MISCREG_DBGVCR);
+    InitReg(MISCREG_DBGWCR0_EL1).mapsTo(MISCREG_DBGWCR0);
+    InitReg(MISCREG_DBGWCR1_EL1).mapsTo(MISCREG_DBGWCR1);
+    InitReg(MISCREG_DBGWCR2_EL1).mapsTo(MISCREG_DBGWCR2);
+    InitReg(MISCREG_DBGWCR3_EL1).mapsTo(MISCREG_DBGWCR3);
+    InitReg(MISCREG_DBGWVR0_EL1).mapsTo(MISCREG_DBGWVR0);
+    InitReg(MISCREG_DBGWVR1_EL1).mapsTo(MISCREG_DBGWVR1);
+    InitReg(MISCREG_DBGWVR2_EL1).mapsTo(MISCREG_DBGWVR2);
+    InitReg(MISCREG_DBGWVR3_EL1).mapsTo(MISCREG_DBGWVR3);
+    InitReg(MISCREG_ID_DFR0_EL1).mapsTo(MISCREG_ID_DFR0);
+    InitReg(MISCREG_MDCCSR_EL0).mapsTo(MISCREG_DBGDSCRint);
+    InitReg(MISCREG_MDRAR_EL1).mapsTo(MISCREG_DBGDRAR);
+    InitReg(MISCREG_MDSCR_EL1).mapsTo(MISCREG_DBGDSCRext);
+    InitReg(MISCREG_OSDLR_EL1).mapsTo(MISCREG_DBGOSDLR);
+    InitReg(MISCREG_OSDTRRX_EL1).mapsTo(MISCREG_DBGDTRRXext);
+    InitReg(MISCREG_OSDTRTX_EL1).mapsTo(MISCREG_DBGDTRTXext);
+    InitReg(MISCREG_OSECCR_EL1).mapsTo(MISCREG_DBGOSECCR);
+    InitReg(MISCREG_OSLAR_EL1).mapsTo(MISCREG_DBGOSLAR);
+    InitReg(MISCREG_OSLSR_EL1).mapsTo(MISCREG_DBGOSLSR);
+    InitReg(MISCREG_PMCCNTR_EL0).mapsTo(MISCREG_PMCCNTR);
+    InitReg(MISCREG_PMCEID0_EL0).mapsTo(MISCREG_PMCEID0);
+    InitReg(MISCREG_PMCEID1_EL0).mapsTo(MISCREG_PMCEID1);
+    InitReg(MISCREG_PMCNTENSET_EL0).mapsTo(MISCREG_PMCNTENSET);
+    InitReg(MISCREG_PMCNTENCLR_EL0).mapsTo(MISCREG_PMCNTENCLR);
+    InitReg(MISCREG_PMCR_EL0).mapsTo(MISCREG_PMCR);
+/*  InitReg(MISCREG_PMEVCNTR0_EL0).mapsTo(MISCREG_PMEVCNTR0);
+    InitReg(MISCREG_PMEVCNTR1_EL0).mapsTo(MISCREG_PMEVCNTR1);
+    InitReg(MISCREG_PMEVCNTR2_EL0).mapsTo(MISCREG_PMEVCNTR2);
+    InitReg(MISCREG_PMEVCNTR3_EL0).mapsTo(MISCREG_PMEVCNTR3);
+    InitReg(MISCREG_PMEVCNTR4_EL0).mapsTo(MISCREG_PMEVCNTR4);
+    InitReg(MISCREG_PMEVCNTR5_EL0).mapsTo(MISCREG_PMEVCNTR5);
+    InitReg(MISCREG_PMEVTYPER0_EL0).mapsTo(MISCREG_PMEVTYPER0);
+    InitReg(MISCREG_PMEVTYPER1_EL0).mapsTo(MISCREG_PMEVTYPER1);
+    InitReg(MISCREG_PMEVTYPER2_EL0).mapsTo(MISCREG_PMEVTYPER2);
+    InitReg(MISCREG_PMEVTYPER3_EL0).mapsTo(MISCREG_PMEVTYPER3);
+    InitReg(MISCREG_PMEVTYPER4_EL0).mapsTo(MISCREG_PMEVTYPER4);
+    InitReg(MISCREG_PMEVTYPER5_EL0).mapsTo(MISCREG_PMEVTYPER5); */
+    InitReg(MISCREG_PMINTENCLR_EL1).mapsTo(MISCREG_PMINTENCLR);
+    InitReg(MISCREG_PMINTENSET_EL1).mapsTo(MISCREG_PMINTENSET);
+//  InitReg(MISCREG_PMOVSCLR_EL0).mapsTo(MISCREG_PMOVSCLR);
+    InitReg(MISCREG_PMOVSSET_EL0).mapsTo(MISCREG_PMOVSSET);
+    InitReg(MISCREG_PMSELR_EL0).mapsTo(MISCREG_PMSELR);
+    InitReg(MISCREG_PMSWINC_EL0).mapsTo(MISCREG_PMSWINC);
+    InitReg(MISCREG_PMUSERENR_EL0).mapsTo(MISCREG_PMUSERENR);
+    InitReg(MISCREG_PMXEVCNTR_EL0).mapsTo(MISCREG_PMXEVCNTR);
+    InitReg(MISCREG_PMXEVTYPER_EL0).mapsTo(MISCREG_PMXEVTYPER);
 
     // 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
+    InitReg(MISCREG_SCR_EL3).mapsTo(MISCREG_SCR); // 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
-};
-
+    InitReg(MISCREG_SPSR_EL1).mapsTo(MISCREG_SPSR_SVC); // C5.2.17 SPSR_EL1
+    InitReg(MISCREG_SPSR_EL2).mapsTo(MISCREG_SPSR_HYP); // C5.2.18 SPSR_EL2
+    InitReg(MISCREG_SPSR_EL3).mapsTo(MISCREG_SPSR_MON); // C5.2.19 SPSR_EL3
+}
 
 ISA::ISA(Params *p)
     : SimObject(p),
@@ -211,7 +222,7 @@
       _decoderFlavour(p->decoderFlavour),
       _vecRegRenameMode(p->vecRegRenameMode),
       pmu(p->pmu),
-      lookUpMiscReg(NUM_MISCREGS, {0,0})
+      lookUpMiscReg(NUM_MISCREGS)
 {
     miscRegs[MISCREG_SCTLR_RST] = 0;
 
@@ -241,11 +252,7 @@
         physAddrRange64 = 32;  // dummy value
     }
 
-    /** Fill in the miscReg translation table */
-    for (auto sw : MiscRegSwitch) {
-        lookUpMiscReg[sw.index] = sw.entry;
-    }
-
+    initializeMiscRegMetadata();
     preUnflattenMiscReg();
 
     clear();
diff --git a/src/arch/arm/isa.hh b/src/arch/arm/isa.hh
index e96de79..2241be7 100644
--- a/src/arch/arm/isa.hh
+++ b/src/arch/arm/isa.hh
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012-2016 ARM Limited
+ * Copyright (c) 2010, 2012-2017 ARM Limited
  * All rights reserved
  *
  * The license below extends only to copyright in the software and shall
@@ -91,21 +91,33 @@
 
         /** Register translation entry used in lookUpMiscReg */
         struct MiscRegLUTEntry {
-            uint32_t lower;
-            uint32_t upper;
+            uint32_t lower;  // Lower half mapped to this register
+            uint32_t upper;  // Upper half mapped to this register
         };
 
-        struct MiscRegInitializerEntry {
-            uint32_t index;
-            struct MiscRegLUTEntry entry;
-        };
-
-        /** Register table noting all translations */
-        static const struct MiscRegInitializerEntry MiscRegSwitch[];
-
-        /** Translation table accessible via the value of the register */
+        /** Metadata table accessible via the value of the register */
         std::vector<struct MiscRegLUTEntry> lookUpMiscReg;
 
+        class MiscRegLUTEntryInitializer {
+            struct MiscRegLUTEntry &entry;
+            typedef const MiscRegLUTEntryInitializer& chain;
+          public:
+            chain mapsTo(uint32_t l, uint32_t u = 0) const {
+                entry.lower = l;
+                entry.upper = u;
+                return *this;
+            }
+            MiscRegLUTEntryInitializer(struct MiscRegLUTEntry &e)
+                : entry(e)
+              {}
+        };
+
+        const MiscRegLUTEntryInitializer InitReg(uint32_t reg) {
+            return MiscRegLUTEntryInitializer(lookUpMiscReg[reg]);
+        }
+
+        void initializeMiscRegMetadata();
+
         MiscReg miscRegs[NumMiscRegs];
         const IntRegIndex *intRegMap;