Re: [RFC PATCH v7 08/18] target/arm/cpu-idregs.h.inc: Generate enum values

> On 26 Jul 2026, at 8:59 PM, Eric Auger <[email protected]> wrote:
> 
> !-------------------------------------------------------------------|
>  CAUTION: External Email
> 
> |-------------------------------------------------------------------!
> 
> Modify the python script so that enum values are also
> extracted from Registers.json.
> 
> If enum values are found, the field and its enum values are
> defined within IDREG_FIELD_START/END. Each enum value is
> defined with IDREG_FIELD_ARCH_VAL() macro.
> 
> Signed-off-by: Eric Auger <[email protected]>
> ---
> target/arm/cpu-idregs.h.inc                   | 2290 ++++++++++++++---
> .../update-aarch64-cpu-sysreg-properties.py   |   77 +-
> 2 files changed, 1959 insertions(+), 408 deletions(-)
> 
> diff --git a/target/arm/cpu-idregs.h.inc b/target/arm/cpu-idregs.h.inc
> index a10d750123..1c8b26133b 100644
> --- a/target/arm/cpu-idregs.h.inc
> +++ b/target/arm/cpu-idregs.h.inc
> @@ -4,7 +4,11 @@
> 
> /* IDREG_START(REG) */
> /*     IDREG_FIELD(REG, FIELD, SHIFT, LENGTH) */
> +/*     or for fields with enum values */
> +/*     IDREG_FIELD_START(REG, FIELD, SHIFT, LENGTH) */
> +/*         IDREG_FIELD_ARCH_VAL(VALUE) */
> /* ... */
> +/*     IDREG_FIELD_END(REG, FIELD) */
> /* IDREG_END(REG) */
> 
> IDREG_START(AIDR_EL1)
> @@ -28,7 +32,16 @@ IDREG_START(CLIDR_EL1)
>     IDREG_FIELD(CLIDR_EL1, Ttype3, 37, 2)
>     IDREG_FIELD(CLIDR_EL1, Ttype2, 35, 2)
>     IDREG_FIELD(CLIDR_EL1, Ttype1, 33, 2)
> -    IDREG_FIELD(CLIDR_EL1, ICB, 30, 3)
> +    IDREG_FIELD_START(CLIDR_EL1, ICB, 30, 3)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +        IDREG_FIELD_ARCH_VAL(3)
> +        IDREG_FIELD_ARCH_VAL(4)
> +        IDREG_FIELD_ARCH_VAL(5)
> +        IDREG_FIELD_ARCH_VAL(6)
> +        IDREG_FIELD_ARCH_VAL(7)
> +    IDREG_FIELD_END(CLIDR_EL1, ICB)
>     IDREG_FIELD(CLIDR_EL1, LoUU, 27, 3)
>     IDREG_FIELD(CLIDR_EL1, LoC, 24, 3)
>     IDREG_FIELD(CLIDR_EL1, LoUIS, 21, 3)
> @@ -43,12 +56,23 @@ IDREG_END(CLIDR_EL1)
> 
> IDREG_START(CTR_EL0)
>     IDREG_FIELD(CTR_EL0, TminLine, 32, 6)
> -    IDREG_FIELD(CTR_EL0, DIC, 29, 1)
> -    IDREG_FIELD(CTR_EL0, IDC, 28, 1)
> +    IDREG_FIELD_START(CTR_EL0, DIC, 29, 1)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(CTR_EL0, DIC)
> +    IDREG_FIELD_START(CTR_EL0, IDC, 28, 1)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(CTR_EL0, IDC)
>     IDREG_FIELD(CTR_EL0, CWG, 24, 4)
>     IDREG_FIELD(CTR_EL0, ERG, 20, 4)
>     IDREG_FIELD(CTR_EL0, DminLine, 16, 4)
> -    IDREG_FIELD(CTR_EL0, L1Ip, 14, 2)
> +    IDREG_FIELD_START(CTR_EL0, L1Ip, 14, 2)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +        IDREG_FIELD_ARCH_VAL(3)
> +    IDREG_FIELD_END(CTR_EL0, L1Ip)
>     IDREG_FIELD(CTR_EL0, IminLine, 0, 4)
> IDREG_END(CTR_EL0)
> 
> @@ -69,549 +93,2007 @@ IDREG_START(ID_AA64AFR1_EL1)
> IDREG_END(ID_AA64AFR1_EL1)
> 
> IDREG_START(ID_AA64DFR0_EL1)
> -    IDREG_FIELD(ID_AA64DFR0_EL1, HPMN0, 60, 4)
> -    IDREG_FIELD(ID_AA64DFR0_EL1, ExtTrcBuff, 56, 4)
> -    IDREG_FIELD(ID_AA64DFR0_EL1, BRBE, 52, 4)
> -    IDREG_FIELD(ID_AA64DFR0_EL1, MTPMU, 48, 4)
> -    IDREG_FIELD(ID_AA64DFR0_EL1, TraceBuffer, 44, 4)
> -    IDREG_FIELD(ID_AA64DFR0_EL1, TraceFilt, 40, 4)
> -    IDREG_FIELD(ID_AA64DFR0_EL1, DoubleLock, 36, 4)
> -    IDREG_FIELD(ID_AA64DFR0_EL1, PMSVer, 32, 4)
> -    IDREG_FIELD(ID_AA64DFR0_EL1, CTX_CMPs, 28, 4)
> +    IDREG_FIELD_START(ID_AA64DFR0_EL1, HPMN0, 60, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64DFR0_EL1, HPMN0)
> +    IDREG_FIELD_START(ID_AA64DFR0_EL1, ExtTrcBuff, 56, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64DFR0_EL1, ExtTrcBuff)
> +    IDREG_FIELD_START(ID_AA64DFR0_EL1, BRBE, 52, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_AA64DFR0_EL1, BRBE)
> +    IDREG_FIELD_START(ID_AA64DFR0_EL1, MTPMU, 48, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(15)
> +    IDREG_FIELD_END(ID_AA64DFR0_EL1, MTPMU)
> +    IDREG_FIELD_START(ID_AA64DFR0_EL1, TraceBuffer, 44, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_AA64DFR0_EL1, TraceBuffer)
> +    IDREG_FIELD_START(ID_AA64DFR0_EL1, TraceFilt, 40, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64DFR0_EL1, TraceFilt)
> +    IDREG_FIELD_START(ID_AA64DFR0_EL1, DoubleLock, 36, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(15)
> +    IDREG_FIELD_END(ID_AA64DFR0_EL1, DoubleLock)
> +    IDREG_FIELD_START(ID_AA64DFR0_EL1, PMSVer, 32, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +        IDREG_FIELD_ARCH_VAL(3)
> +        IDREG_FIELD_ARCH_VAL(4)
> +        IDREG_FIELD_ARCH_VAL(5)
> +        IDREG_FIELD_ARCH_VAL(6)
> +    IDREG_FIELD_END(ID_AA64DFR0_EL1, PMSVer)
> +    IDREG_FIELD_START(ID_AA64DFR0_EL1, CTX_CMPs, 28, 4)
> +        IDREG_FIELD_ARCH_VAL(15)
> +    IDREG_FIELD_END(ID_AA64DFR0_EL1, CTX_CMPs)
>     IDREG_FIELD(ID_AA64DFR0_EL1, WRPs, 20, 4)
> -    IDREG_FIELD(ID_AA64DFR0_EL1, PMSS, 16, 4)
> -    IDREG_FIELD(ID_AA64DFR0_EL1, BRPs, 12, 4)
> -    IDREG_FIELD(ID_AA64DFR0_EL1, PMUVer, 8, 4)
> -    IDREG_FIELD(ID_AA64DFR0_EL1, TraceVer, 4, 4)
> -    IDREG_FIELD(ID_AA64DFR0_EL1, DebugVer, 0, 4)
> +    IDREG_FIELD_START(ID_AA64DFR0_EL1, PMSS, 16, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64DFR0_EL1, PMSS)
> +    IDREG_FIELD_START(ID_AA64DFR0_EL1, BRPs, 12, 4)
> +        IDREG_FIELD_ARCH_VAL(15)
> +    IDREG_FIELD_END(ID_AA64DFR0_EL1, BRPs)
> +    IDREG_FIELD_START(ID_AA64DFR0_EL1, PMUVer, 8, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(4)
> +        IDREG_FIELD_ARCH_VAL(5)
> +        IDREG_FIELD_ARCH_VAL(6)
> +        IDREG_FIELD_ARCH_VAL(7)
> +        IDREG_FIELD_ARCH_VAL(8)
> +        IDREG_FIELD_ARCH_VAL(9)
> +        IDREG_FIELD_ARCH_VAL(15)
> +    IDREG_FIELD_END(ID_AA64DFR0_EL1, PMUVer)
> +    IDREG_FIELD_START(ID_AA64DFR0_EL1, TraceVer, 4, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64DFR0_EL1, TraceVer)
> +    IDREG_FIELD_START(ID_AA64DFR0_EL1, DebugVer, 0, 4)
> +        IDREG_FIELD_ARCH_VAL(6)
> +        IDREG_FIELD_ARCH_VAL(7)
> +        IDREG_FIELD_ARCH_VAL(8)
> +        IDREG_FIELD_ARCH_VAL(9)
> +        IDREG_FIELD_ARCH_VAL(10)
> +        IDREG_FIELD_ARCH_VAL(11)
> +    IDREG_FIELD_END(ID_AA64DFR0_EL1, DebugVer)
> IDREG_END(ID_AA64DFR0_EL1)
> 
> IDREG_START(ID_AA64DFR1_EL1)
>     IDREG_FIELD(ID_AA64DFR1_EL1, ABL_CMPs, 56, 8)
> -    IDREG_FIELD(ID_AA64DFR1_EL1, DPFZS, 52, 4)
> -    IDREG_FIELD(ID_AA64DFR1_EL1, EBEP, 48, 4)
> -    IDREG_FIELD(ID_AA64DFR1_EL1, ITE, 44, 4)
> -    IDREG_FIELD(ID_AA64DFR1_EL1, ABLE, 40, 4)
> -    IDREG_FIELD(ID_AA64DFR1_EL1, PMICNTR, 36, 4)
> -    IDREG_FIELD(ID_AA64DFR1_EL1, SPMU, 32, 4)
> -    IDREG_FIELD(ID_AA64DFR1_EL1, CTX_CMPs, 24, 8)
> -    IDREG_FIELD(ID_AA64DFR1_EL1, WRPs, 16, 8)
> -    IDREG_FIELD(ID_AA64DFR1_EL1, BRPs, 8, 8)
> +    IDREG_FIELD_START(ID_AA64DFR1_EL1, DPFZS, 52, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64DFR1_EL1, DPFZS)
> +    IDREG_FIELD_START(ID_AA64DFR1_EL1, EBEP, 48, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64DFR1_EL1, EBEP)
> +    IDREG_FIELD_START(ID_AA64DFR1_EL1, ITE, 44, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64DFR1_EL1, ITE)
> +    IDREG_FIELD_START(ID_AA64DFR1_EL1, ABLE, 40, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64DFR1_EL1, ABLE)
> +    IDREG_FIELD_START(ID_AA64DFR1_EL1, PMICNTR, 36, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64DFR1_EL1, PMICNTR)
> +    IDREG_FIELD_START(ID_AA64DFR1_EL1, SPMU, 32, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_AA64DFR1_EL1, SPMU)
> +    IDREG_FIELD_START(ID_AA64DFR1_EL1, CTX_CMPs, 24, 8)
> +        IDREG_FIELD_ARCH_VAL(0)
> +    IDREG_FIELD_END(ID_AA64DFR1_EL1, CTX_CMPs)
> +    IDREG_FIELD_START(ID_AA64DFR1_EL1, WRPs, 16, 8)
> +        IDREG_FIELD_ARCH_VAL(0)
> +    IDREG_FIELD_END(ID_AA64DFR1_EL1, WRPs)
> +    IDREG_FIELD_START(ID_AA64DFR1_EL1, BRPs, 8, 8)
> +        IDREG_FIELD_ARCH_VAL(0)
> +    IDREG_FIELD_END(ID_AA64DFR1_EL1, BRPs)
>     IDREG_FIELD(ID_AA64DFR1_EL1, SYSPMUID, 0, 8)
> IDREG_END(ID_AA64DFR1_EL1)
> 
> IDREG_START(ID_AA64DFR2_EL1)
> -    IDREG_FIELD(ID_AA64DFR2_EL1, TRBE_EXC, 24, 4)
> -    IDREG_FIELD(ID_AA64DFR2_EL1, SPE_nVM, 20, 4)
> -    IDREG_FIELD(ID_AA64DFR2_EL1, SPE_EXC, 16, 4)
> -    IDREG_FIELD(ID_AA64DFR2_EL1, BWE, 4, 4)
> -    IDREG_FIELD(ID_AA64DFR2_EL1, STEP, 0, 4)
> +    IDREG_FIELD_START(ID_AA64DFR2_EL1, TRBE_EXC, 24, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64DFR2_EL1, TRBE_EXC)
> +    IDREG_FIELD_START(ID_AA64DFR2_EL1, SPE_nVM, 20, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64DFR2_EL1, SPE_nVM)
> +    IDREG_FIELD_START(ID_AA64DFR2_EL1, SPE_EXC, 16, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64DFR2_EL1, SPE_EXC)
> +    IDREG_FIELD_START(ID_AA64DFR2_EL1, BWE, 4, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_AA64DFR2_EL1, BWE)
> +    IDREG_FIELD_START(ID_AA64DFR2_EL1, STEP, 0, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64DFR2_EL1, STEP)
> IDREG_END(ID_AA64DFR2_EL1)
> 
> IDREG_START(ID_AA64FPFR0_EL1)
> -    IDREG_FIELD(ID_AA64FPFR0_EL1, F8CVT, 31, 1)
> -    IDREG_FIELD(ID_AA64FPFR0_EL1, F8FMA, 30, 1)
> -    IDREG_FIELD(ID_AA64FPFR0_EL1, F8DP4, 29, 1)
> -    IDREG_FIELD(ID_AA64FPFR0_EL1, F8DP2, 28, 1)
> -    IDREG_FIELD(ID_AA64FPFR0_EL1, F8MM8, 27, 1)
> -    IDREG_FIELD(ID_AA64FPFR0_EL1, F8MM4, 26, 1)
> -    IDREG_FIELD(ID_AA64FPFR0_EL1, F16MM2, 15, 1)
> -    IDREG_FIELD(ID_AA64FPFR0_EL1, F8E4M3, 1, 1)
> -    IDREG_FIELD(ID_AA64FPFR0_EL1, F8E5M2, 0, 1)
> +    IDREG_FIELD_START(ID_AA64FPFR0_EL1, F8CVT, 31, 1)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64FPFR0_EL1, F8CVT)
> +    IDREG_FIELD_START(ID_AA64FPFR0_EL1, F8FMA, 30, 1)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64FPFR0_EL1, F8FMA)
> +    IDREG_FIELD_START(ID_AA64FPFR0_EL1, F8DP4, 29, 1)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64FPFR0_EL1, F8DP4)
> +    IDREG_FIELD_START(ID_AA64FPFR0_EL1, F8DP2, 28, 1)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64FPFR0_EL1, F8DP2)
> +    IDREG_FIELD_START(ID_AA64FPFR0_EL1, F8MM8, 27, 1)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64FPFR0_EL1, F8MM8)
> +    IDREG_FIELD_START(ID_AA64FPFR0_EL1, F8MM4, 26, 1)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64FPFR0_EL1, F8MM4)
> +    IDREG_FIELD_START(ID_AA64FPFR0_EL1, F16MM2, 15, 1)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64FPFR0_EL1, F16MM2)
> +    IDREG_FIELD_START(ID_AA64FPFR0_EL1, F8E4M3, 1, 1)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64FPFR0_EL1, F8E4M3)
> +    IDREG_FIELD_START(ID_AA64FPFR0_EL1, F8E5M2, 0, 1)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64FPFR0_EL1, F8E5M2)
> IDREG_END(ID_AA64FPFR0_EL1)
> 
> IDREG_START(ID_AA64ISAR0_EL1)
> -    IDREG_FIELD(ID_AA64ISAR0_EL1, RNDR, 60, 4)
> -    IDREG_FIELD(ID_AA64ISAR0_EL1, TLB, 56, 4)
> -    IDREG_FIELD(ID_AA64ISAR0_EL1, TS, 52, 4)
> -    IDREG_FIELD(ID_AA64ISAR0_EL1, FHM, 48, 4)
> -    IDREG_FIELD(ID_AA64ISAR0_EL1, DP, 44, 4)
> -    IDREG_FIELD(ID_AA64ISAR0_EL1, SM4, 40, 4)
> -    IDREG_FIELD(ID_AA64ISAR0_EL1, SM3, 36, 4)
> -    IDREG_FIELD(ID_AA64ISAR0_EL1, SHA3, 32, 4)
> -    IDREG_FIELD(ID_AA64ISAR0_EL1, RDM, 28, 4)
> -    IDREG_FIELD(ID_AA64ISAR0_EL1, Atomic, 20, 4)
> -    IDREG_FIELD(ID_AA64ISAR0_EL1, CRC32, 16, 4)
> -    IDREG_FIELD(ID_AA64ISAR0_EL1, SHA2, 12, 4)
> -    IDREG_FIELD(ID_AA64ISAR0_EL1, SHA1, 8, 4)
> -    IDREG_FIELD(ID_AA64ISAR0_EL1, AES, 4, 4)
> +    IDREG_FIELD_START(ID_AA64ISAR0_EL1, RNDR, 60, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64ISAR0_EL1, RNDR)
> +    IDREG_FIELD_START(ID_AA64ISAR0_EL1, TLB, 56, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_AA64ISAR0_EL1, TLB)
> +    IDREG_FIELD_START(ID_AA64ISAR0_EL1, TS, 52, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_AA64ISAR0_EL1, TS)
> +    IDREG_FIELD_START(ID_AA64ISAR0_EL1, FHM, 48, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +        IDREG_FIELD_ARCH_VAL(3)
> +    IDREG_FIELD_END(ID_AA64ISAR0_EL1, FHM)
> +    IDREG_FIELD_START(ID_AA64ISAR0_EL1, DP, 44, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64ISAR0_EL1, DP)
> +    IDREG_FIELD_START(ID_AA64ISAR0_EL1, SM4, 40, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64ISAR0_EL1, SM4)
> +    IDREG_FIELD_START(ID_AA64ISAR0_EL1, SM3, 36, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64ISAR0_EL1, SM3)
> +    IDREG_FIELD_START(ID_AA64ISAR0_EL1, SHA3, 32, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64ISAR0_EL1, SHA3)
> +    IDREG_FIELD_START(ID_AA64ISAR0_EL1, RDM, 28, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64ISAR0_EL1, RDM)
> +    IDREG_FIELD_START(ID_AA64ISAR0_EL1, Atomic, 20, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(2)
> +        IDREG_FIELD_ARCH_VAL(3)
> +    IDREG_FIELD_END(ID_AA64ISAR0_EL1, Atomic)
> +    IDREG_FIELD_START(ID_AA64ISAR0_EL1, CRC32, 16, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64ISAR0_EL1, CRC32)
> +    IDREG_FIELD_START(ID_AA64ISAR0_EL1, SHA2, 12, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_AA64ISAR0_EL1, SHA2)
> +    IDREG_FIELD_START(ID_AA64ISAR0_EL1, SHA1, 8, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64ISAR0_EL1, SHA1)
> +    IDREG_FIELD_START(ID_AA64ISAR0_EL1, AES, 4, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_AA64ISAR0_EL1, AES)
> IDREG_END(ID_AA64ISAR0_EL1)
> 
> IDREG_START(ID_AA64ISAR1_EL1)
> -    IDREG_FIELD(ID_AA64ISAR1_EL1, LS64, 60, 4)
> -    IDREG_FIELD(ID_AA64ISAR1_EL1, XS, 56, 4)
> -    IDREG_FIELD(ID_AA64ISAR1_EL1, I8MM, 52, 4)
> -    IDREG_FIELD(ID_AA64ISAR1_EL1, DGH, 48, 4)
> -    IDREG_FIELD(ID_AA64ISAR1_EL1, BF16, 44, 4)
> -    IDREG_FIELD(ID_AA64ISAR1_EL1, SPECRES, 40, 4)
> -    IDREG_FIELD(ID_AA64ISAR1_EL1, SB, 36, 4)
> -    IDREG_FIELD(ID_AA64ISAR1_EL1, FRINTTS, 32, 4)
> -    IDREG_FIELD(ID_AA64ISAR1_EL1, GPI, 28, 4)
> -    IDREG_FIELD(ID_AA64ISAR1_EL1, GPA, 24, 4)
> -    IDREG_FIELD(ID_AA64ISAR1_EL1, LRCPC, 20, 4)
> -    IDREG_FIELD(ID_AA64ISAR1_EL1, FCMA, 16, 4)
> -    IDREG_FIELD(ID_AA64ISAR1_EL1, JSCVT, 12, 4)
> -    IDREG_FIELD(ID_AA64ISAR1_EL1, API, 8, 4)
> -    IDREG_FIELD(ID_AA64ISAR1_EL1, APA, 4, 4)
> -    IDREG_FIELD(ID_AA64ISAR1_EL1, DPB, 0, 4)
> +    IDREG_FIELD_START(ID_AA64ISAR1_EL1, LS64, 60, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +        IDREG_FIELD_ARCH_VAL(3)
> +        IDREG_FIELD_ARCH_VAL(4)
> +    IDREG_FIELD_END(ID_AA64ISAR1_EL1, LS64)
> +    IDREG_FIELD_START(ID_AA64ISAR1_EL1, XS, 56, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64ISAR1_EL1, XS)
> +    IDREG_FIELD_START(ID_AA64ISAR1_EL1, I8MM, 52, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64ISAR1_EL1, I8MM)
> +    IDREG_FIELD_START(ID_AA64ISAR1_EL1, DGH, 48, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64ISAR1_EL1, DGH)
> +    IDREG_FIELD_START(ID_AA64ISAR1_EL1, BF16, 44, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_AA64ISAR1_EL1, BF16)
> +    IDREG_FIELD_START(ID_AA64ISAR1_EL1, SPECRES, 40, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_AA64ISAR1_EL1, SPECRES)
> +    IDREG_FIELD_START(ID_AA64ISAR1_EL1, SB, 36, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64ISAR1_EL1, SB)
> +    IDREG_FIELD_START(ID_AA64ISAR1_EL1, FRINTTS, 32, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64ISAR1_EL1, FRINTTS)
> +    IDREG_FIELD_START(ID_AA64ISAR1_EL1, GPI, 28, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64ISAR1_EL1, GPI)
> +    IDREG_FIELD_START(ID_AA64ISAR1_EL1, GPA, 24, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64ISAR1_EL1, GPA)
> +    IDREG_FIELD_START(ID_AA64ISAR1_EL1, LRCPC, 20, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +        IDREG_FIELD_ARCH_VAL(3)
> +    IDREG_FIELD_END(ID_AA64ISAR1_EL1, LRCPC)
> +    IDREG_FIELD_START(ID_AA64ISAR1_EL1, FCMA, 16, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64ISAR1_EL1, FCMA)
> +    IDREG_FIELD_START(ID_AA64ISAR1_EL1, JSCVT, 12, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64ISAR1_EL1, JSCVT)
> +    IDREG_FIELD_START(ID_AA64ISAR1_EL1, API, 8, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +        IDREG_FIELD_ARCH_VAL(3)
> +        IDREG_FIELD_ARCH_VAL(4)
> +        IDREG_FIELD_ARCH_VAL(5)
> +        IDREG_FIELD_ARCH_VAL(6)
> +    IDREG_FIELD_END(ID_AA64ISAR1_EL1, API)
> +    IDREG_FIELD_START(ID_AA64ISAR1_EL1, APA, 4, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +        IDREG_FIELD_ARCH_VAL(3)
> +        IDREG_FIELD_ARCH_VAL(4)
> +        IDREG_FIELD_ARCH_VAL(5)
> +        IDREG_FIELD_ARCH_VAL(6)
> +    IDREG_FIELD_END(ID_AA64ISAR1_EL1, APA)
> +    IDREG_FIELD_START(ID_AA64ISAR1_EL1, DPB, 0, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_AA64ISAR1_EL1, DPB)
> IDREG_END(ID_AA64ISAR1_EL1)
> 
> IDREG_START(ID_AA64ISAR2_EL1)
> -    IDREG_FIELD(ID_AA64ISAR2_EL1, ATS1A, 60, 4)
> -    IDREG_FIELD(ID_AA64ISAR2_EL1, LUT, 56, 4)
> -    IDREG_FIELD(ID_AA64ISAR2_EL1, CSSC, 52, 4)
> -    IDREG_FIELD(ID_AA64ISAR2_EL1, RPRFM, 48, 4)
> -    IDREG_FIELD(ID_AA64ISAR2_EL1, PCDPHINT, 44, 4)
> -    IDREG_FIELD(ID_AA64ISAR2_EL1, PRFMSLC, 40, 4)
> -    IDREG_FIELD(ID_AA64ISAR2_EL1, SYSINSTR_128, 36, 4)
> -    IDREG_FIELD(ID_AA64ISAR2_EL1, SYSREG_128, 32, 4)
> -    IDREG_FIELD(ID_AA64ISAR2_EL1, CLRBHB, 28, 4)
> -    IDREG_FIELD(ID_AA64ISAR2_EL1, PAC_frac, 24, 4)
> -    IDREG_FIELD(ID_AA64ISAR2_EL1, BC, 20, 4)
> -    IDREG_FIELD(ID_AA64ISAR2_EL1, MOPS, 16, 4)
> -    IDREG_FIELD(ID_AA64ISAR2_EL1, APA3, 12, 4)
> -    IDREG_FIELD(ID_AA64ISAR2_EL1, GPA3, 8, 4)
> -    IDREG_FIELD(ID_AA64ISAR2_EL1, RPRES, 4, 4)
> -    IDREG_FIELD(ID_AA64ISAR2_EL1, WFxT, 0, 4)
> +    IDREG_FIELD_START(ID_AA64ISAR2_EL1, ATS1A, 60, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64ISAR2_EL1, ATS1A)
> +    IDREG_FIELD_START(ID_AA64ISAR2_EL1, LUT, 56, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_AA64ISAR2_EL1, LUT)
> +    IDREG_FIELD_START(ID_AA64ISAR2_EL1, CSSC, 52, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_AA64ISAR2_EL1, CSSC)
> +    IDREG_FIELD_START(ID_AA64ISAR2_EL1, RPRFM, 48, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64ISAR2_EL1, RPRFM)
> +    IDREG_FIELD_START(ID_AA64ISAR2_EL1, PCDPHINT, 44, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64ISAR2_EL1, PCDPHINT)
> +    IDREG_FIELD_START(ID_AA64ISAR2_EL1, PRFMSLC, 40, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64ISAR2_EL1, PRFMSLC)
> +    IDREG_FIELD_START(ID_AA64ISAR2_EL1, SYSINSTR_128, 36, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64ISAR2_EL1, SYSINSTR_128)
> +    IDREG_FIELD_START(ID_AA64ISAR2_EL1, SYSREG_128, 32, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64ISAR2_EL1, SYSREG_128)
> +    IDREG_FIELD_START(ID_AA64ISAR2_EL1, CLRBHB, 28, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64ISAR2_EL1, CLRBHB)
> +    IDREG_FIELD_START(ID_AA64ISAR2_EL1, PAC_frac, 24, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64ISAR2_EL1, PAC_frac)
> +    IDREG_FIELD_START(ID_AA64ISAR2_EL1, BC, 20, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64ISAR2_EL1, BC)
> +    IDREG_FIELD_START(ID_AA64ISAR2_EL1, MOPS, 16, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_AA64ISAR2_EL1, MOPS)
> +    IDREG_FIELD_START(ID_AA64ISAR2_EL1, APA3, 12, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +        IDREG_FIELD_ARCH_VAL(3)
> +        IDREG_FIELD_ARCH_VAL(4)
> +        IDREG_FIELD_ARCH_VAL(5)
> +        IDREG_FIELD_ARCH_VAL(6)
> +    IDREG_FIELD_END(ID_AA64ISAR2_EL1, APA3)
> +    IDREG_FIELD_START(ID_AA64ISAR2_EL1, GPA3, 8, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64ISAR2_EL1, GPA3)
> +    IDREG_FIELD_START(ID_AA64ISAR2_EL1, RPRES, 4, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64ISAR2_EL1, RPRES)
> +    IDREG_FIELD_START(ID_AA64ISAR2_EL1, WFxT, 0, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_AA64ISAR2_EL1, WFxT)
> IDREG_END(ID_AA64ISAR2_EL1)
> 
> IDREG_START(ID_AA64ISAR3_EL1)
> -    IDREG_FIELD(ID_AA64ISAR3_EL1, LSCP, 44, 4)
> -    IDREG_FIELD(ID_AA64ISAR3_EL1, LSCSHINT, 40, 4)
> -    IDREG_FIELD(ID_AA64ISAR3_EL1, MTETC, 36, 4)
> -    IDREG_FIELD(ID_AA64ISAR3_EL1, PAC_frac2, 32, 4)
> -    IDREG_FIELD(ID_AA64ISAR3_EL1, FPRCVT, 28, 4)
> -    IDREG_FIELD(ID_AA64ISAR3_EL1, LSUI, 24, 4)
> -    IDREG_FIELD(ID_AA64ISAR3_EL1, OCCMO, 20, 4)
> -    IDREG_FIELD(ID_AA64ISAR3_EL1, LSFE, 16, 4)
> -    IDREG_FIELD(ID_AA64ISAR3_EL1, PACM, 12, 4)
> -    IDREG_FIELD(ID_AA64ISAR3_EL1, TLBIW, 8, 4)
> -    IDREG_FIELD(ID_AA64ISAR3_EL1, FAMINMAX, 4, 4)
> -    IDREG_FIELD(ID_AA64ISAR3_EL1, CPA, 0, 4)
> +    IDREG_FIELD_START(ID_AA64ISAR3_EL1, LSCP, 44, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64ISAR3_EL1, LSCP)
> +    IDREG_FIELD_START(ID_AA64ISAR3_EL1, LSCSHINT, 40, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64ISAR3_EL1, LSCSHINT)
> +    IDREG_FIELD_START(ID_AA64ISAR3_EL1, MTETC, 36, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64ISAR3_EL1, MTETC)
> +    IDREG_FIELD_START(ID_AA64ISAR3_EL1, PAC_frac2, 32, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64ISAR3_EL1, PAC_frac2)
> +    IDREG_FIELD_START(ID_AA64ISAR3_EL1, FPRCVT, 28, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64ISAR3_EL1, FPRCVT)
> +    IDREG_FIELD_START(ID_AA64ISAR3_EL1, LSUI, 24, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64ISAR3_EL1, LSUI)
> +    IDREG_FIELD_START(ID_AA64ISAR3_EL1, OCCMO, 20, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64ISAR3_EL1, OCCMO)
> +    IDREG_FIELD_START(ID_AA64ISAR3_EL1, LSFE, 16, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64ISAR3_EL1, LSFE)
> +    IDREG_FIELD_START(ID_AA64ISAR3_EL1, PACM, 12, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_AA64ISAR3_EL1, PACM)
> +    IDREG_FIELD_START(ID_AA64ISAR3_EL1, TLBIW, 8, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64ISAR3_EL1, TLBIW)
> +    IDREG_FIELD_START(ID_AA64ISAR3_EL1, FAMINMAX, 4, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64ISAR3_EL1, FAMINMAX)
> +    IDREG_FIELD_START(ID_AA64ISAR3_EL1, CPA, 0, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_AA64ISAR3_EL1, CPA)
> IDREG_END(ID_AA64ISAR3_EL1)
> 
> IDREG_START(ID_AA64MMFR0_EL1)
> -    IDREG_FIELD(ID_AA64MMFR0_EL1, ECV, 60, 4)
> -    IDREG_FIELD(ID_AA64MMFR0_EL1, FGT, 56, 4)
> -    IDREG_FIELD(ID_AA64MMFR0_EL1, ExS, 44, 4)
> -    IDREG_FIELD(ID_AA64MMFR0_EL1, TGran4_2, 40, 4)
> -    IDREG_FIELD(ID_AA64MMFR0_EL1, TGran64_2, 36, 4)
> -    IDREG_FIELD(ID_AA64MMFR0_EL1, TGran16_2, 32, 4)
> -    IDREG_FIELD(ID_AA64MMFR0_EL1, TGran4, 28, 4)
> -    IDREG_FIELD(ID_AA64MMFR0_EL1, TGran64, 24, 4)
> -    IDREG_FIELD(ID_AA64MMFR0_EL1, TGran16, 20, 4)
> -    IDREG_FIELD(ID_AA64MMFR0_EL1, BigEndEL0, 16, 4)
> -    IDREG_FIELD(ID_AA64MMFR0_EL1, SNSMem, 12, 4)
> -    IDREG_FIELD(ID_AA64MMFR0_EL1, BigEnd, 8, 4)
> -    IDREG_FIELD(ID_AA64MMFR0_EL1, ASIDBits, 4, 4)
> -    IDREG_FIELD(ID_AA64MMFR0_EL1, PARange, 0, 4)
> +    IDREG_FIELD_START(ID_AA64MMFR0_EL1, ECV, 60, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_AA64MMFR0_EL1, ECV)
> +    IDREG_FIELD_START(ID_AA64MMFR0_EL1, FGT, 56, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_AA64MMFR0_EL1, FGT)
> +    IDREG_FIELD_START(ID_AA64MMFR0_EL1, ExS, 44, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64MMFR0_EL1, ExS)
> +    IDREG_FIELD_START(ID_AA64MMFR0_EL1, TGran4_2, 40, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_AA64MMFR0_EL1, TGran4_2)
> +    IDREG_FIELD_START(ID_AA64MMFR0_EL1, TGran64_2, 36, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_AA64MMFR0_EL1, TGran64_2)
> +    IDREG_FIELD_START(ID_AA64MMFR0_EL1, TGran16_2, 32, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_AA64MMFR0_EL1, TGran16_2)
> +    IDREG_FIELD_START(ID_AA64MMFR0_EL1, TGran4, 28, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(15)
> +    IDREG_FIELD_END(ID_AA64MMFR0_EL1, TGran4)
> +    IDREG_FIELD_START(ID_AA64MMFR0_EL1, TGran64, 24, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(15)
> +    IDREG_FIELD_END(ID_AA64MMFR0_EL1, TGran64)
> +    IDREG_FIELD_START(ID_AA64MMFR0_EL1, TGran16, 20, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64MMFR0_EL1, TGran16)
> +    IDREG_FIELD_START(ID_AA64MMFR0_EL1, BigEndEL0, 16, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64MMFR0_EL1, BigEndEL0)
> +    IDREG_FIELD_START(ID_AA64MMFR0_EL1, SNSMem, 12, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64MMFR0_EL1, SNSMem)
> +    IDREG_FIELD_START(ID_AA64MMFR0_EL1, BigEnd, 8, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64MMFR0_EL1, BigEnd)
> +    IDREG_FIELD_START(ID_AA64MMFR0_EL1, ASIDBits, 4, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_AA64MMFR0_EL1, ASIDBits)
> +    IDREG_FIELD_START(ID_AA64MMFR0_EL1, PARange, 0, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +        IDREG_FIELD_ARCH_VAL(3)
> +        IDREG_FIELD_ARCH_VAL(4)
> +        IDREG_FIELD_ARCH_VAL(5)
> +    IDREG_FIELD_END(ID_AA64MMFR0_EL1, PARange)
> IDREG_END(ID_AA64MMFR0_EL1)
> 
> IDREG_START(ID_AA64MMFR1_EL1)
> -    IDREG_FIELD(ID_AA64MMFR1_EL1, ECBHB, 60, 4)
> -    IDREG_FIELD(ID_AA64MMFR1_EL1, CMOW, 56, 4)
> -    IDREG_FIELD(ID_AA64MMFR1_EL1, TIDCP1, 52, 4)
> -    IDREG_FIELD(ID_AA64MMFR1_EL1, nTLBPA, 48, 4)
> -    IDREG_FIELD(ID_AA64MMFR1_EL1, AFP, 44, 4)
> -    IDREG_FIELD(ID_AA64MMFR1_EL1, HCX, 40, 4)
> -    IDREG_FIELD(ID_AA64MMFR1_EL1, ETS, 36, 4)
> -    IDREG_FIELD(ID_AA64MMFR1_EL1, TWED, 32, 4)
> -    IDREG_FIELD(ID_AA64MMFR1_EL1, XNX, 28, 4)
> -    IDREG_FIELD(ID_AA64MMFR1_EL1, SpecSEI, 24, 4)
> -    IDREG_FIELD(ID_AA64MMFR1_EL1, PAN, 20, 4)
> -    IDREG_FIELD(ID_AA64MMFR1_EL1, LO, 16, 4)
> -    IDREG_FIELD(ID_AA64MMFR1_EL1, HPDS, 12, 4)
> -    IDREG_FIELD(ID_AA64MMFR1_EL1, VH, 8, 4)
> -    IDREG_FIELD(ID_AA64MMFR1_EL1, VMIDBits, 4, 4)
> -    IDREG_FIELD(ID_AA64MMFR1_EL1, HAFDBS, 0, 4)
> +    IDREG_FIELD_START(ID_AA64MMFR1_EL1, ECBHB, 60, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64MMFR1_EL1, ECBHB)
> +    IDREG_FIELD_START(ID_AA64MMFR1_EL1, CMOW, 56, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64MMFR1_EL1, CMOW)
> +    IDREG_FIELD_START(ID_AA64MMFR1_EL1, TIDCP1, 52, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64MMFR1_EL1, TIDCP1)
> +    IDREG_FIELD_START(ID_AA64MMFR1_EL1, nTLBPA, 48, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64MMFR1_EL1, nTLBPA)
> +    IDREG_FIELD_START(ID_AA64MMFR1_EL1, AFP, 44, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64MMFR1_EL1, AFP)
> +    IDREG_FIELD_START(ID_AA64MMFR1_EL1, HCX, 40, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64MMFR1_EL1, HCX)
> +    IDREG_FIELD_START(ID_AA64MMFR1_EL1, ETS, 36, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +        IDREG_FIELD_ARCH_VAL(3)
> +    IDREG_FIELD_END(ID_AA64MMFR1_EL1, ETS)
> +    IDREG_FIELD_START(ID_AA64MMFR1_EL1, TWED, 32, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64MMFR1_EL1, TWED)
> +    IDREG_FIELD_START(ID_AA64MMFR1_EL1, XNX, 28, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64MMFR1_EL1, XNX)
> +    IDREG_FIELD_START(ID_AA64MMFR1_EL1, SpecSEI, 24, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64MMFR1_EL1, SpecSEI)
> +    IDREG_FIELD_START(ID_AA64MMFR1_EL1, PAN, 20, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +        IDREG_FIELD_ARCH_VAL(3)
> +    IDREG_FIELD_END(ID_AA64MMFR1_EL1, PAN)
> +    IDREG_FIELD_START(ID_AA64MMFR1_EL1, LO, 16, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64MMFR1_EL1, LO)
> +    IDREG_FIELD_START(ID_AA64MMFR1_EL1, HPDS, 12, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_AA64MMFR1_EL1, HPDS)
> +    IDREG_FIELD_START(ID_AA64MMFR1_EL1, VH, 8, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64MMFR1_EL1, VH)
> +    IDREG_FIELD_START(ID_AA64MMFR1_EL1, VMIDBits, 4, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_AA64MMFR1_EL1, VMIDBits)
> +    IDREG_FIELD_START(ID_AA64MMFR1_EL1, HAFDBS, 0, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +        IDREG_FIELD_ARCH_VAL(3)
> +        IDREG_FIELD_ARCH_VAL(4)
> +    IDREG_FIELD_END(ID_AA64MMFR1_EL1, HAFDBS)
> IDREG_END(ID_AA64MMFR1_EL1)
> 
> IDREG_START(ID_AA64MMFR2_EL1)
> -    IDREG_FIELD(ID_AA64MMFR2_EL1, E0PD, 60, 4)
> -    IDREG_FIELD(ID_AA64MMFR2_EL1, EVT, 56, 4)
> -    IDREG_FIELD(ID_AA64MMFR2_EL1, BBM, 52, 4)
> -    IDREG_FIELD(ID_AA64MMFR2_EL1, TTL, 48, 4)
> -    IDREG_FIELD(ID_AA64MMFR2_EL1, FWB, 40, 4)
> -    IDREG_FIELD(ID_AA64MMFR2_EL1, IDS, 36, 4)
> -    IDREG_FIELD(ID_AA64MMFR2_EL1, AT, 32, 4)
> -    IDREG_FIELD(ID_AA64MMFR2_EL1, ST, 28, 4)
> -    IDREG_FIELD(ID_AA64MMFR2_EL1, NV, 24, 4)
> -    IDREG_FIELD(ID_AA64MMFR2_EL1, CCIDX, 20, 4)
> -    IDREG_FIELD(ID_AA64MMFR2_EL1, VARange, 16, 4)
> -    IDREG_FIELD(ID_AA64MMFR2_EL1, IESB, 12, 4)
> -    IDREG_FIELD(ID_AA64MMFR2_EL1, LSM, 8, 4)
> -    IDREG_FIELD(ID_AA64MMFR2_EL1, UAO, 4, 4)
> -    IDREG_FIELD(ID_AA64MMFR2_EL1, CnP, 0, 4)
> +    IDREG_FIELD_START(ID_AA64MMFR2_EL1, E0PD, 60, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64MMFR2_EL1, E0PD)
> +    IDREG_FIELD_START(ID_AA64MMFR2_EL1, EVT, 56, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_AA64MMFR2_EL1, EVT)
> +    IDREG_FIELD_START(ID_AA64MMFR2_EL1, BBM, 52, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +        IDREG_FIELD_ARCH_VAL(3)
> +    IDREG_FIELD_END(ID_AA64MMFR2_EL1, BBM)
> +    IDREG_FIELD_START(ID_AA64MMFR2_EL1, TTL, 48, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64MMFR2_EL1, TTL)
> +    IDREG_FIELD_START(ID_AA64MMFR2_EL1, FWB, 40, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64MMFR2_EL1, FWB)
> +    IDREG_FIELD_START(ID_AA64MMFR2_EL1, IDS, 36, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_AA64MMFR2_EL1, IDS)
> +    IDREG_FIELD_START(ID_AA64MMFR2_EL1, AT, 32, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64MMFR2_EL1, AT)
> +    IDREG_FIELD_START(ID_AA64MMFR2_EL1, ST, 28, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64MMFR2_EL1, ST)
> +    IDREG_FIELD_START(ID_AA64MMFR2_EL1, NV, 24, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_AA64MMFR2_EL1, NV)
> +    IDREG_FIELD_START(ID_AA64MMFR2_EL1, CCIDX, 20, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64MMFR2_EL1, CCIDX)
> +    IDREG_FIELD_START(ID_AA64MMFR2_EL1, VARange, 16, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64MMFR2_EL1, VARange)
> +    IDREG_FIELD_START(ID_AA64MMFR2_EL1, IESB, 12, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64MMFR2_EL1, IESB)
> +    IDREG_FIELD_START(ID_AA64MMFR2_EL1, LSM, 8, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64MMFR2_EL1, LSM)
> +    IDREG_FIELD_START(ID_AA64MMFR2_EL1, UAO, 4, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64MMFR2_EL1, UAO)
> +    IDREG_FIELD_START(ID_AA64MMFR2_EL1, CnP, 0, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64MMFR2_EL1, CnP)
> IDREG_END(ID_AA64MMFR2_EL1)
> 
> IDREG_START(ID_AA64MMFR3_EL1)
> -    IDREG_FIELD(ID_AA64MMFR3_EL1, Spec_FPACC, 60, 4)
> -    IDREG_FIELD(ID_AA64MMFR3_EL1, ADERR, 56, 4)
> -    IDREG_FIELD(ID_AA64MMFR3_EL1, SDERR, 52, 4)
> -    IDREG_FIELD(ID_AA64MMFR3_EL1, ANERR, 44, 4)
> -    IDREG_FIELD(ID_AA64MMFR3_EL1, SNERR, 40, 4)
> -    IDREG_FIELD(ID_AA64MMFR3_EL1, D128_2, 36, 4)
> -    IDREG_FIELD(ID_AA64MMFR3_EL1, D128, 32, 4)
> -    IDREG_FIELD(ID_AA64MMFR3_EL1, MEC, 28, 4)
> -    IDREG_FIELD(ID_AA64MMFR3_EL1, AIE, 24, 4)
> -    IDREG_FIELD(ID_AA64MMFR3_EL1, S2POE, 20, 4)
> -    IDREG_FIELD(ID_AA64MMFR3_EL1, S1POE, 16, 4)
> -    IDREG_FIELD(ID_AA64MMFR3_EL1, S2PIE, 12, 4)
> -    IDREG_FIELD(ID_AA64MMFR3_EL1, S1PIE, 8, 4)
> -    IDREG_FIELD(ID_AA64MMFR3_EL1, SCTLRX, 4, 4)
> -    IDREG_FIELD(ID_AA64MMFR3_EL1, TCRX, 0, 4)
> +    IDREG_FIELD_START(ID_AA64MMFR3_EL1, Spec_FPACC, 60, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64MMFR3_EL1, Spec_FPACC)
> +    IDREG_FIELD_START(ID_AA64MMFR3_EL1, ADERR, 56, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +        IDREG_FIELD_ARCH_VAL(3)
> +    IDREG_FIELD_END(ID_AA64MMFR3_EL1, ADERR)
> +    IDREG_FIELD_START(ID_AA64MMFR3_EL1, SDERR, 52, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +        IDREG_FIELD_ARCH_VAL(3)
> +    IDREG_FIELD_END(ID_AA64MMFR3_EL1, SDERR)
> +    IDREG_FIELD_START(ID_AA64MMFR3_EL1, ANERR, 44, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +        IDREG_FIELD_ARCH_VAL(3)
> +    IDREG_FIELD_END(ID_AA64MMFR3_EL1, ANERR)
> +    IDREG_FIELD_START(ID_AA64MMFR3_EL1, SNERR, 40, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +        IDREG_FIELD_ARCH_VAL(3)
> +    IDREG_FIELD_END(ID_AA64MMFR3_EL1, SNERR)
> +    IDREG_FIELD_START(ID_AA64MMFR3_EL1, D128_2, 36, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64MMFR3_EL1, D128_2)
> +    IDREG_FIELD_START(ID_AA64MMFR3_EL1, D128, 32, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64MMFR3_EL1, D128)
> +    IDREG_FIELD_START(ID_AA64MMFR3_EL1, MEC, 28, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64MMFR3_EL1, MEC)
> +    IDREG_FIELD_START(ID_AA64MMFR3_EL1, AIE, 24, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64MMFR3_EL1, AIE)
> +    IDREG_FIELD_START(ID_AA64MMFR3_EL1, S2POE, 20, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64MMFR3_EL1, S2POE)
> +    IDREG_FIELD_START(ID_AA64MMFR3_EL1, S1POE, 16, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_AA64MMFR3_EL1, S1POE)
> +    IDREG_FIELD_START(ID_AA64MMFR3_EL1, S2PIE, 12, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64MMFR3_EL1, S2PIE)
> +    IDREG_FIELD_START(ID_AA64MMFR3_EL1, S1PIE, 8, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64MMFR3_EL1, S1PIE)
> +    IDREG_FIELD_START(ID_AA64MMFR3_EL1, SCTLRX, 4, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64MMFR3_EL1, SCTLRX)
> +    IDREG_FIELD_START(ID_AA64MMFR3_EL1, TCRX, 0, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64MMFR3_EL1, TCRX)
> IDREG_END(ID_AA64MMFR3_EL1)
> 
> IDREG_START(ID_AA64MMFR4_EL1)
> -    IDREG_FIELD(ID_AA64MMFR4_EL1, MTEFGT, 60, 4)
> -    IDREG_FIELD(ID_AA64MMFR4_EL1, SCRX, 56, 4)
> -    IDREG_FIELD(ID_AA64MMFR4_EL1, TEV, 52, 4)
> -    IDREG_FIELD(ID_AA64MMFR4_EL1, TPS, 48, 4)
> -    IDREG_FIELD(ID_AA64MMFR4_EL1, SRMASK, 44, 4)
> -    IDREG_FIELD(ID_AA64MMFR4_EL1, TLBID, 40, 4)
> -    IDREG_FIELD(ID_AA64MMFR4_EL1, E3DSE, 36, 4)
> -    IDREG_FIELD(ID_AA64MMFR4_EL1, EAESR, 32, 4)
> -    IDREG_FIELD(ID_AA64MMFR4_EL1, RMEGDI, 28, 4)
> -    IDREG_FIELD(ID_AA64MMFR4_EL1, E2H0, 24, 4)
> -    IDREG_FIELD(ID_AA64MMFR4_EL1, NV_frac, 20, 4)
> -    IDREG_FIELD(ID_AA64MMFR4_EL1, FGWTE3, 16, 4)
> -    IDREG_FIELD(ID_AA64MMFR4_EL1, HACDBS, 12, 4)
> -    IDREG_FIELD(ID_AA64MMFR4_EL1, ASID2, 8, 4)
> -    IDREG_FIELD(ID_AA64MMFR4_EL1, EIESB, 4, 4)
> -    IDREG_FIELD(ID_AA64MMFR4_EL1, PoPS, 0, 4)
> +    IDREG_FIELD_START(ID_AA64MMFR4_EL1, MTEFGT, 60, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64MMFR4_EL1, MTEFGT)
> +    IDREG_FIELD_START(ID_AA64MMFR4_EL1, SCRX, 56, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64MMFR4_EL1, SCRX)
> +    IDREG_FIELD_START(ID_AA64MMFR4_EL1, TEV, 52, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64MMFR4_EL1, TEV)
> +    IDREG_FIELD_START(ID_AA64MMFR4_EL1, TPS, 48, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_AA64MMFR4_EL1, TPS)
> +    IDREG_FIELD_START(ID_AA64MMFR4_EL1, SRMASK, 44, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_AA64MMFR4_EL1, SRMASK)
> +    IDREG_FIELD_START(ID_AA64MMFR4_EL1, TLBID, 40, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64MMFR4_EL1, TLBID)
> +    IDREG_FIELD_START(ID_AA64MMFR4_EL1, E3DSE, 36, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64MMFR4_EL1, E3DSE)
> +    IDREG_FIELD_START(ID_AA64MMFR4_EL1, EAESR, 32, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64MMFR4_EL1, EAESR)
> +    IDREG_FIELD_START(ID_AA64MMFR4_EL1, RMEGDI, 28, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64MMFR4_EL1, RMEGDI)
> +    IDREG_FIELD_START(ID_AA64MMFR4_EL1, E2H0, 24, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(14)
> +        IDREG_FIELD_ARCH_VAL(15)
> +    IDREG_FIELD_END(ID_AA64MMFR4_EL1, E2H0)
> +    IDREG_FIELD_START(ID_AA64MMFR4_EL1, NV_frac, 20, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +        IDREG_FIELD_ARCH_VAL(3)
> +    IDREG_FIELD_END(ID_AA64MMFR4_EL1, NV_frac)
> +    IDREG_FIELD_START(ID_AA64MMFR4_EL1, FGWTE3, 16, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64MMFR4_EL1, FGWTE3)
> +    IDREG_FIELD_START(ID_AA64MMFR4_EL1, HACDBS, 12, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64MMFR4_EL1, HACDBS)
> +    IDREG_FIELD_START(ID_AA64MMFR4_EL1, ASID2, 8, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64MMFR4_EL1, ASID2)
> +    IDREG_FIELD_START(ID_AA64MMFR4_EL1, EIESB, 4, 4)
> +        IDREG_FIELD_ARCH_VAL(15)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +        IDREG_FIELD_ARCH_VAL(3)
> +    IDREG_FIELD_END(ID_AA64MMFR4_EL1, EIESB)
> +    IDREG_FIELD_START(ID_AA64MMFR4_EL1, PoPS, 0, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64MMFR4_EL1, PoPS)
> IDREG_END(ID_AA64MMFR4_EL1)
> 
> IDREG_START(ID_AA64PFR0_EL1)
> -    IDREG_FIELD(ID_AA64PFR0_EL1, CSV3, 60, 4)
> -    IDREG_FIELD(ID_AA64PFR0_EL1, CSV2, 56, 4)
> -    IDREG_FIELD(ID_AA64PFR0_EL1, RME, 52, 4)
> -    IDREG_FIELD(ID_AA64PFR0_EL1, DIT, 48, 4)
> -    IDREG_FIELD(ID_AA64PFR0_EL1, AMU, 44, 4)
> -    IDREG_FIELD(ID_AA64PFR0_EL1, MPAM, 40, 4)
> -    IDREG_FIELD(ID_AA64PFR0_EL1, SEL2, 36, 4)
> -    IDREG_FIELD(ID_AA64PFR0_EL1, SVE, 32, 4)
> -    IDREG_FIELD(ID_AA64PFR0_EL1, RAS, 28, 4)
> -    IDREG_FIELD(ID_AA64PFR0_EL1, GIC, 24, 4)
> -    IDREG_FIELD(ID_AA64PFR0_EL1, AdvSIMD, 20, 4)
> -    IDREG_FIELD(ID_AA64PFR0_EL1, FP, 16, 4)
> -    IDREG_FIELD(ID_AA64PFR0_EL1, EL3, 12, 4)
> -    IDREG_FIELD(ID_AA64PFR0_EL1, EL2, 8, 4)
> -    IDREG_FIELD(ID_AA64PFR0_EL1, EL1, 4, 4)
> -    IDREG_FIELD(ID_AA64PFR0_EL1, EL0, 0, 4)
> +    IDREG_FIELD_START(ID_AA64PFR0_EL1, CSV3, 60, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64PFR0_EL1, CSV3)
> +    IDREG_FIELD_START(ID_AA64PFR0_EL1, CSV2, 56, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +        IDREG_FIELD_ARCH_VAL(3)
> +    IDREG_FIELD_END(ID_AA64PFR0_EL1, CSV2)
> +    IDREG_FIELD_START(ID_AA64PFR0_EL1, RME, 52, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +        IDREG_FIELD_ARCH_VAL(3)
> +    IDREG_FIELD_END(ID_AA64PFR0_EL1, RME)
> +    IDREG_FIELD_START(ID_AA64PFR0_EL1, DIT, 48, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_AA64PFR0_EL1, DIT)
> +    IDREG_FIELD_START(ID_AA64PFR0_EL1, AMU, 44, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_AA64PFR0_EL1, AMU)
> +    IDREG_FIELD_START(ID_AA64PFR0_EL1, MPAM, 40, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64PFR0_EL1, MPAM)
> +    IDREG_FIELD_START(ID_AA64PFR0_EL1, SEL2, 36, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64PFR0_EL1, SEL2)
> +    IDREG_FIELD_START(ID_AA64PFR0_EL1, SVE, 32, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64PFR0_EL1, SVE)
> +    IDREG_FIELD_START(ID_AA64PFR0_EL1, RAS, 28, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +        IDREG_FIELD_ARCH_VAL(3)
> +    IDREG_FIELD_END(ID_AA64PFR0_EL1, RAS)
> +    IDREG_FIELD_START(ID_AA64PFR0_EL1, GIC, 24, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(3)
> +    IDREG_FIELD_END(ID_AA64PFR0_EL1, GIC)
> +    IDREG_FIELD_START(ID_AA64PFR0_EL1, AdvSIMD, 20, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(15)
> +    IDREG_FIELD_END(ID_AA64PFR0_EL1, AdvSIMD)
> +    IDREG_FIELD_START(ID_AA64PFR0_EL1, FP, 16, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(15)
> +    IDREG_FIELD_END(ID_AA64PFR0_EL1, FP)
> +    IDREG_FIELD_START(ID_AA64PFR0_EL1, EL3, 12, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_AA64PFR0_EL1, EL3)
> +    IDREG_FIELD_START(ID_AA64PFR0_EL1, EL2, 8, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_AA64PFR0_EL1, EL2)
> +    IDREG_FIELD_START(ID_AA64PFR0_EL1, EL1, 4, 4)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_AA64PFR0_EL1, EL1)
> +    IDREG_FIELD_START(ID_AA64PFR0_EL1, EL0, 0, 4)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_AA64PFR0_EL1, EL0)
> IDREG_END(ID_AA64PFR0_EL1)
> 
> IDREG_START(ID_AA64PFR1_EL1)
> -    IDREG_FIELD(ID_AA64PFR1_EL1, PFAR, 60, 4)
> -    IDREG_FIELD(ID_AA64PFR1_EL1, DF2, 56, 4)
> -    IDREG_FIELD(ID_AA64PFR1_EL1, MTEX, 52, 4)
> -    IDREG_FIELD(ID_AA64PFR1_EL1, THE, 48, 4)
> -    IDREG_FIELD(ID_AA64PFR1_EL1, GCS, 44, 4)
> -    IDREG_FIELD(ID_AA64PFR1_EL1, MTE_frac, 40, 4)
> -    IDREG_FIELD(ID_AA64PFR1_EL1, NMI, 36, 4)
> -    IDREG_FIELD(ID_AA64PFR1_EL1, CSV2_frac, 32, 4)
> -    IDREG_FIELD(ID_AA64PFR1_EL1, RNDR_trap, 28, 4)
> -    IDREG_FIELD(ID_AA64PFR1_EL1, SME, 24, 4)
> -    IDREG_FIELD(ID_AA64PFR1_EL1, MPAM_frac, 16, 4)
> -    IDREG_FIELD(ID_AA64PFR1_EL1, RAS_frac, 12, 4)
> -    IDREG_FIELD(ID_AA64PFR1_EL1, MTE, 8, 4)
> -    IDREG_FIELD(ID_AA64PFR1_EL1, SSBS, 4, 4)
> -    IDREG_FIELD(ID_AA64PFR1_EL1, BT, 0, 4)
> +    IDREG_FIELD_START(ID_AA64PFR1_EL1, PFAR, 60, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64PFR1_EL1, PFAR)
> +    IDREG_FIELD_START(ID_AA64PFR1_EL1, DF2, 56, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64PFR1_EL1, DF2)
> +    IDREG_FIELD_START(ID_AA64PFR1_EL1, MTEX, 52, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64PFR1_EL1, MTEX)
> +    IDREG_FIELD_START(ID_AA64PFR1_EL1, THE, 48, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64PFR1_EL1, THE)
> +    IDREG_FIELD_START(ID_AA64PFR1_EL1, GCS, 44, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64PFR1_EL1, GCS)
> +    IDREG_FIELD_START(ID_AA64PFR1_EL1, MTE_frac, 40, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(15)
> +    IDREG_FIELD_END(ID_AA64PFR1_EL1, MTE_frac)
> +    IDREG_FIELD_START(ID_AA64PFR1_EL1, NMI, 36, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64PFR1_EL1, NMI)
> +    IDREG_FIELD_START(ID_AA64PFR1_EL1, CSV2_frac, 32, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_AA64PFR1_EL1, CSV2_frac)
> +    IDREG_FIELD_START(ID_AA64PFR1_EL1, RNDR_trap, 28, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64PFR1_EL1, RNDR_trap)
> +    IDREG_FIELD_START(ID_AA64PFR1_EL1, SME, 24, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_AA64PFR1_EL1, SME)
> +    IDREG_FIELD_START(ID_AA64PFR1_EL1, MPAM_frac, 16, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64PFR1_EL1, MPAM_frac)
> +    IDREG_FIELD_START(ID_AA64PFR1_EL1, RAS_frac, 12, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64PFR1_EL1, RAS_frac)
> +    IDREG_FIELD_START(ID_AA64PFR1_EL1, MTE, 8, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +        IDREG_FIELD_ARCH_VAL(3)
> +    IDREG_FIELD_END(ID_AA64PFR1_EL1, MTE)
> +    IDREG_FIELD_START(ID_AA64PFR1_EL1, SSBS, 4, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_AA64PFR1_EL1, SSBS)
> +    IDREG_FIELD_START(ID_AA64PFR1_EL1, BT, 0, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_AA64PFR1_EL1, BT)
> IDREG_END(ID_AA64PFR1_EL1)
> 
> IDREG_START(ID_AA64PFR2_EL1)
> -    IDREG_FIELD(ID_AA64PFR2_EL1, VMTETCL, 44, 4)
> -    IDREG_FIELD(ID_AA64PFR2_EL1, VMTETC, 40, 4)
> -    IDREG_FIELD(ID_AA64PFR2_EL1, VMTE, 36, 4)
> -    IDREG_FIELD(ID_AA64PFR2_EL1, FPMR, 32, 4)
> -    IDREG_FIELD(ID_AA64PFR2_EL1, MPAM2, 28, 4)
> -    IDREG_FIELD(ID_AA64PFR2_EL1, FGDT, 24, 4)
> -    IDREG_FIELD(ID_AA64PFR2_EL1, MTEEIRG, 20, 4)
> -    IDREG_FIELD(ID_AA64PFR2_EL1, UINJ, 16, 4)
> -    IDREG_FIELD(ID_AA64PFR2_EL1, GCIE, 12, 4)
> -    IDREG_FIELD(ID_AA64PFR2_EL1, MTEFAR, 8, 4)
> -    IDREG_FIELD(ID_AA64PFR2_EL1, MTESTOREONLY, 4, 4)
> -    IDREG_FIELD(ID_AA64PFR2_EL1, MTEPERM, 0, 4)
> +    IDREG_FIELD_START(ID_AA64PFR2_EL1, VMTETCL, 44, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64PFR2_EL1, VMTETCL)
> +    IDREG_FIELD_START(ID_AA64PFR2_EL1, VMTETC, 40, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +        IDREG_FIELD_ARCH_VAL(3)
> +    IDREG_FIELD_END(ID_AA64PFR2_EL1, VMTETC)
> +    IDREG_FIELD_START(ID_AA64PFR2_EL1, VMTE, 36, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_AA64PFR2_EL1, VMTE)
> +    IDREG_FIELD_START(ID_AA64PFR2_EL1, FPMR, 32, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64PFR2_EL1, FPMR)
> +    IDREG_FIELD_START(ID_AA64PFR2_EL1, MPAM2, 28, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64PFR2_EL1, MPAM2)
> +    IDREG_FIELD_START(ID_AA64PFR2_EL1, FGDT, 24, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_AA64PFR2_EL1, FGDT)
> +    IDREG_FIELD_START(ID_AA64PFR2_EL1, MTEEIRG, 20, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64PFR2_EL1, MTEEIRG)
> +    IDREG_FIELD_START(ID_AA64PFR2_EL1, UINJ, 16, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64PFR2_EL1, UINJ)
> +    IDREG_FIELD_START(ID_AA64PFR2_EL1, GCIE, 12, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64PFR2_EL1, GCIE)
> +    IDREG_FIELD_START(ID_AA64PFR2_EL1, MTEFAR, 8, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64PFR2_EL1, MTEFAR)
> +    IDREG_FIELD_START(ID_AA64PFR2_EL1, MTESTOREONLY, 4, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64PFR2_EL1, MTESTOREONLY)
> +    IDREG_FIELD_START(ID_AA64PFR2_EL1, MTEPERM, 0, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64PFR2_EL1, MTEPERM)
> IDREG_END(ID_AA64PFR2_EL1)
> 
> IDREG_START(ID_AA64SMFR0_EL1)
> -    IDREG_FIELD(ID_AA64SMFR0_EL1, FA64, 63, 1)
> -    IDREG_FIELD(ID_AA64SMFR0_EL1, LUT6, 61, 1)
> -    IDREG_FIELD(ID_AA64SMFR0_EL1, LUTv2, 60, 1)
> -    IDREG_FIELD(ID_AA64SMFR0_EL1, SMEver, 56, 4)
> -    IDREG_FIELD(ID_AA64SMFR0_EL1, I16I64, 52, 4)
> -    IDREG_FIELD(ID_AA64SMFR0_EL1, F64F64, 48, 1)
> -    IDREG_FIELD(ID_AA64SMFR0_EL1, I16I32, 44, 4)
> -    IDREG_FIELD(ID_AA64SMFR0_EL1, B16B16, 43, 1)
> -    IDREG_FIELD(ID_AA64SMFR0_EL1, F16F16, 42, 1)
> -    IDREG_FIELD(ID_AA64SMFR0_EL1, F8F16, 41, 1)
> -    IDREG_FIELD(ID_AA64SMFR0_EL1, F8F32, 40, 1)
> -    IDREG_FIELD(ID_AA64SMFR0_EL1, I8I32, 36, 4)
> -    IDREG_FIELD(ID_AA64SMFR0_EL1, F16F32, 35, 1)
> -    IDREG_FIELD(ID_AA64SMFR0_EL1, B16F32, 34, 1)
> -    IDREG_FIELD(ID_AA64SMFR0_EL1, BI32I32, 33, 1)
> -    IDREG_FIELD(ID_AA64SMFR0_EL1, F32F32, 32, 1)
> -    IDREG_FIELD(ID_AA64SMFR0_EL1, SF8FMA, 30, 1)
> -    IDREG_FIELD(ID_AA64SMFR0_EL1, SF8DP4, 29, 1)
> -    IDREG_FIELD(ID_AA64SMFR0_EL1, SF8DP2, 28, 1)
> -    IDREG_FIELD(ID_AA64SMFR0_EL1, SBitPerm, 25, 1)
> -    IDREG_FIELD(ID_AA64SMFR0_EL1, AES, 24, 1)
> -    IDREG_FIELD(ID_AA64SMFR0_EL1, SFEXPA, 23, 1)
> -    IDREG_FIELD(ID_AA64SMFR0_EL1, STMOP, 16, 1)
> -    IDREG_FIELD(ID_AA64SMFR0_EL1, SMOP4, 0, 1)
> +    IDREG_FIELD_START(ID_AA64SMFR0_EL1, FA64, 63, 1)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64SMFR0_EL1, FA64)
> +    IDREG_FIELD_START(ID_AA64SMFR0_EL1, LUT6, 61, 1)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64SMFR0_EL1, LUT6)
> +    IDREG_FIELD_START(ID_AA64SMFR0_EL1, LUTv2, 60, 1)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64SMFR0_EL1, LUTv2)
> +    IDREG_FIELD_START(ID_AA64SMFR0_EL1, SMEver, 56, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +        IDREG_FIELD_ARCH_VAL(3)
> +        IDREG_FIELD_ARCH_VAL(4)
> +    IDREG_FIELD_END(ID_AA64SMFR0_EL1, SMEver)
> +    IDREG_FIELD_START(ID_AA64SMFR0_EL1, I16I64, 52, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(15)
> +    IDREG_FIELD_END(ID_AA64SMFR0_EL1, I16I64)
> +    IDREG_FIELD_START(ID_AA64SMFR0_EL1, F64F64, 48, 1)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64SMFR0_EL1, F64F64)
> +    IDREG_FIELD_START(ID_AA64SMFR0_EL1, I16I32, 44, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(5)
> +    IDREG_FIELD_END(ID_AA64SMFR0_EL1, I16I32)
> +    IDREG_FIELD_START(ID_AA64SMFR0_EL1, B16B16, 43, 1)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64SMFR0_EL1, B16B16)
> +    IDREG_FIELD_START(ID_AA64SMFR0_EL1, F16F16, 42, 1)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64SMFR0_EL1, F16F16)
> +    IDREG_FIELD_START(ID_AA64SMFR0_EL1, F8F16, 41, 1)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64SMFR0_EL1, F8F16)
> +    IDREG_FIELD_START(ID_AA64SMFR0_EL1, F8F32, 40, 1)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64SMFR0_EL1, F8F32)
> +    IDREG_FIELD_START(ID_AA64SMFR0_EL1, I8I32, 36, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(15)
> +    IDREG_FIELD_END(ID_AA64SMFR0_EL1, I8I32)
> +    IDREG_FIELD_START(ID_AA64SMFR0_EL1, F16F32, 35, 1)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64SMFR0_EL1, F16F32)
> +    IDREG_FIELD_START(ID_AA64SMFR0_EL1, B16F32, 34, 1)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64SMFR0_EL1, B16F32)
> +    IDREG_FIELD_START(ID_AA64SMFR0_EL1, BI32I32, 33, 1)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64SMFR0_EL1, BI32I32)
> +    IDREG_FIELD_START(ID_AA64SMFR0_EL1, F32F32, 32, 1)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64SMFR0_EL1, F32F32)
> +    IDREG_FIELD_START(ID_AA64SMFR0_EL1, SF8FMA, 30, 1)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64SMFR0_EL1, SF8FMA)
> +    IDREG_FIELD_START(ID_AA64SMFR0_EL1, SF8DP4, 29, 1)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64SMFR0_EL1, SF8DP4)
> +    IDREG_FIELD_START(ID_AA64SMFR0_EL1, SF8DP2, 28, 1)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64SMFR0_EL1, SF8DP2)
> +    IDREG_FIELD_START(ID_AA64SMFR0_EL1, SBitPerm, 25, 1)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64SMFR0_EL1, SBitPerm)
> +    IDREG_FIELD_START(ID_AA64SMFR0_EL1, AES, 24, 1)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64SMFR0_EL1, AES)
> +    IDREG_FIELD_START(ID_AA64SMFR0_EL1, SFEXPA, 23, 1)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64SMFR0_EL1, SFEXPA)
> +    IDREG_FIELD_START(ID_AA64SMFR0_EL1, STMOP, 16, 1)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64SMFR0_EL1, STMOP)
> +    IDREG_FIELD_START(ID_AA64SMFR0_EL1, SMOP4, 0, 1)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64SMFR0_EL1, SMOP4)
> IDREG_END(ID_AA64SMFR0_EL1)
> 
> IDREG_START(ID_AA64ZFR0_EL1)
> -    IDREG_FIELD(ID_AA64ZFR0_EL1, F64MM, 56, 4)
> -    IDREG_FIELD(ID_AA64ZFR0_EL1, F32MM, 52, 4)
> -    IDREG_FIELD(ID_AA64ZFR0_EL1, F16MM, 48, 4)
> -    IDREG_FIELD(ID_AA64ZFR0_EL1, I8MM, 44, 4)
> -    IDREG_FIELD(ID_AA64ZFR0_EL1, SM4, 40, 4)
> -    IDREG_FIELD(ID_AA64ZFR0_EL1, SHA3, 32, 4)
> -    IDREG_FIELD(ID_AA64ZFR0_EL1, B16B16, 24, 4)
> -    IDREG_FIELD(ID_AA64ZFR0_EL1, BF16, 20, 4)
> -    IDREG_FIELD(ID_AA64ZFR0_EL1, BitPerm, 16, 4)
> -    IDREG_FIELD(ID_AA64ZFR0_EL1, EltPerm, 12, 4)
> -    IDREG_FIELD(ID_AA64ZFR0_EL1, AES, 4, 4)
> -    IDREG_FIELD(ID_AA64ZFR0_EL1, SVEver, 0, 4)
> +    IDREG_FIELD_START(ID_AA64ZFR0_EL1, F64MM, 56, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64ZFR0_EL1, F64MM)
> +    IDREG_FIELD_START(ID_AA64ZFR0_EL1, F32MM, 52, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64ZFR0_EL1, F32MM)
> +    IDREG_FIELD_START(ID_AA64ZFR0_EL1, F16MM, 48, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64ZFR0_EL1, F16MM)
> +    IDREG_FIELD_START(ID_AA64ZFR0_EL1, I8MM, 44, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64ZFR0_EL1, I8MM)
> +    IDREG_FIELD_START(ID_AA64ZFR0_EL1, SM4, 40, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64ZFR0_EL1, SM4)
> +    IDREG_FIELD_START(ID_AA64ZFR0_EL1, SHA3, 32, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64ZFR0_EL1, SHA3)
> +    IDREG_FIELD_START(ID_AA64ZFR0_EL1, B16B16, 24, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +        IDREG_FIELD_ARCH_VAL(3)
> +    IDREG_FIELD_END(ID_AA64ZFR0_EL1, B16B16)
> +    IDREG_FIELD_START(ID_AA64ZFR0_EL1, BF16, 20, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_AA64ZFR0_EL1, BF16)
> +    IDREG_FIELD_START(ID_AA64ZFR0_EL1, BitPerm, 16, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64ZFR0_EL1, BitPerm)
> +    IDREG_FIELD_START(ID_AA64ZFR0_EL1, EltPerm, 12, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_AA64ZFR0_EL1, EltPerm)
> +    IDREG_FIELD_START(ID_AA64ZFR0_EL1, AES, 4, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +        IDREG_FIELD_ARCH_VAL(3)
> +    IDREG_FIELD_END(ID_AA64ZFR0_EL1, AES)
> +    IDREG_FIELD_START(ID_AA64ZFR0_EL1, SVEver, 0, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +        IDREG_FIELD_ARCH_VAL(3)
> +        IDREG_FIELD_ARCH_VAL(4)
> +    IDREG_FIELD_END(ID_AA64ZFR0_EL1, SVEver)
> IDREG_END(ID_AA64ZFR0_EL1)
> 
> IDREG_START(ID_AFR0_EL1)
> IDREG_END(ID_AFR0_EL1)
> 
> IDREG_START(ID_DFR0_EL1)
> -    IDREG_FIELD(ID_DFR0_EL1, TraceFilt, 28, 4)
> -    IDREG_FIELD(ID_DFR0_EL1, PerfMon, 24, 4)
> -    IDREG_FIELD(ID_DFR0_EL1, MProfDbg, 20, 4)
> -    IDREG_FIELD(ID_DFR0_EL1, MMapTrc, 16, 4)
> -    IDREG_FIELD(ID_DFR0_EL1, CopTrc, 12, 4)
> -    IDREG_FIELD(ID_DFR0_EL1, MMapDbg, 8, 4)
> +    IDREG_FIELD_START(ID_DFR0_EL1, TraceFilt, 28, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_DFR0_EL1, TraceFilt)
> +    IDREG_FIELD_START(ID_DFR0_EL1, PerfMon, 24, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +        IDREG_FIELD_ARCH_VAL(3)
> +        IDREG_FIELD_ARCH_VAL(4)
> +        IDREG_FIELD_ARCH_VAL(5)
> +        IDREG_FIELD_ARCH_VAL(6)
> +        IDREG_FIELD_ARCH_VAL(7)
> +        IDREG_FIELD_ARCH_VAL(8)
> +        IDREG_FIELD_ARCH_VAL(9)
> +        IDREG_FIELD_ARCH_VAL(15)
> +    IDREG_FIELD_END(ID_DFR0_EL1, PerfMon)
> +    IDREG_FIELD_START(ID_DFR0_EL1, MProfDbg, 20, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_DFR0_EL1, MProfDbg)
> +    IDREG_FIELD_START(ID_DFR0_EL1, MMapTrc, 16, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_DFR0_EL1, MMapTrc)
> +    IDREG_FIELD_START(ID_DFR0_EL1, CopTrc, 12, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_DFR0_EL1, CopTrc)
> +    IDREG_FIELD_START(ID_DFR0_EL1, MMapDbg, 8, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(4)
> +        IDREG_FIELD_ARCH_VAL(5)
> +    IDREG_FIELD_END(ID_DFR0_EL1, MMapDbg)
>     IDREG_FIELD(ID_DFR0_EL1, CopSDbg, 4, 4)
> -    IDREG_FIELD(ID_DFR0_EL1, CopDbg, 0, 4)
> +    IDREG_FIELD_START(ID_DFR0_EL1, CopDbg, 0, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(2)
> +        IDREG_FIELD_ARCH_VAL(3)
> +        IDREG_FIELD_ARCH_VAL(4)
> +        IDREG_FIELD_ARCH_VAL(5)
> +        IDREG_FIELD_ARCH_VAL(6)
> +        IDREG_FIELD_ARCH_VAL(7)
> +        IDREG_FIELD_ARCH_VAL(8)
> +        IDREG_FIELD_ARCH_VAL(9)
> +        IDREG_FIELD_ARCH_VAL(10)
> +        IDREG_FIELD_ARCH_VAL(11)
> +    IDREG_FIELD_END(ID_DFR0_EL1, CopDbg)
> IDREG_END(ID_DFR0_EL1)
> 
> IDREG_START(ID_DFR1_EL1)
> -    IDREG_FIELD(ID_DFR1_EL1, HPMN0, 4, 4)
> -    IDREG_FIELD(ID_DFR1_EL1, MTPMU, 0, 4)
> +    IDREG_FIELD_START(ID_DFR1_EL1, HPMN0, 4, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_DFR1_EL1, HPMN0)
> +    IDREG_FIELD_START(ID_DFR1_EL1, MTPMU, 0, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(15)
> +    IDREG_FIELD_END(ID_DFR1_EL1, MTPMU)
> IDREG_END(ID_DFR1_EL1)
> 
> IDREG_START(ID_ISAR0_EL1)
> -    IDREG_FIELD(ID_ISAR0_EL1, Divide, 24, 4)
> -    IDREG_FIELD(ID_ISAR0_EL1, Debug, 20, 4)
> -    IDREG_FIELD(ID_ISAR0_EL1, Coproc, 16, 4)
> -    IDREG_FIELD(ID_ISAR0_EL1, CmpBranch, 12, 4)
> -    IDREG_FIELD(ID_ISAR0_EL1, BitField, 8, 4)
> -    IDREG_FIELD(ID_ISAR0_EL1, BitCount, 4, 4)
> -    IDREG_FIELD(ID_ISAR0_EL1, Swap, 0, 4)
> +    IDREG_FIELD_START(ID_ISAR0_EL1, Divide, 24, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_ISAR0_EL1, Divide)
> +    IDREG_FIELD_START(ID_ISAR0_EL1, Debug, 20, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_ISAR0_EL1, Debug)
> +    IDREG_FIELD_START(ID_ISAR0_EL1, Coproc, 16, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +        IDREG_FIELD_ARCH_VAL(3)
> +        IDREG_FIELD_ARCH_VAL(4)
> +    IDREG_FIELD_END(ID_ISAR0_EL1, Coproc)
> +    IDREG_FIELD_START(ID_ISAR0_EL1, CmpBranch, 12, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_ISAR0_EL1, CmpBranch)
> +    IDREG_FIELD_START(ID_ISAR0_EL1, BitField, 8, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_ISAR0_EL1, BitField)
> +    IDREG_FIELD_START(ID_ISAR0_EL1, BitCount, 4, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_ISAR0_EL1, BitCount)
> +    IDREG_FIELD_START(ID_ISAR0_EL1, Swap, 0, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_ISAR0_EL1, Swap)
> IDREG_END(ID_ISAR0_EL1)
> 
> IDREG_START(ID_ISAR1_EL1)
> -    IDREG_FIELD(ID_ISAR1_EL1, Jazelle, 28, 4)
> -    IDREG_FIELD(ID_ISAR1_EL1, Interwork, 24, 4)
> -    IDREG_FIELD(ID_ISAR1_EL1, Immediate, 20, 4)
> -    IDREG_FIELD(ID_ISAR1_EL1, IfThen, 16, 4)
> -    IDREG_FIELD(ID_ISAR1_EL1, Extend, 12, 4)
> -    IDREG_FIELD(ID_ISAR1_EL1, Except_AR, 8, 4)
> -    IDREG_FIELD(ID_ISAR1_EL1, Except, 4, 4)
> -    IDREG_FIELD(ID_ISAR1_EL1, Endian, 0, 4)
> +    IDREG_FIELD_START(ID_ISAR1_EL1, Jazelle, 28, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_ISAR1_EL1, Jazelle)
> +    IDREG_FIELD_START(ID_ISAR1_EL1, Interwork, 24, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +        IDREG_FIELD_ARCH_VAL(3)
> +    IDREG_FIELD_END(ID_ISAR1_EL1, Interwork)
> +    IDREG_FIELD_START(ID_ISAR1_EL1, Immediate, 20, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_ISAR1_EL1, Immediate)
> +    IDREG_FIELD_START(ID_ISAR1_EL1, IfThen, 16, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_ISAR1_EL1, IfThen)
> +    IDREG_FIELD_START(ID_ISAR1_EL1, Extend, 12, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_ISAR1_EL1, Extend)
> +    IDREG_FIELD_START(ID_ISAR1_EL1, Except_AR, 8, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_ISAR1_EL1, Except_AR)
> +    IDREG_FIELD_START(ID_ISAR1_EL1, Except, 4, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_ISAR1_EL1, Except)
> +    IDREG_FIELD_START(ID_ISAR1_EL1, Endian, 0, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_ISAR1_EL1, Endian)
> IDREG_END(ID_ISAR1_EL1)
> 
> IDREG_START(ID_ISAR2_EL1)
> -    IDREG_FIELD(ID_ISAR2_EL1, Reversal, 28, 4)
> -    IDREG_FIELD(ID_ISAR2_EL1, PSR_AR, 24, 4)
> -    IDREG_FIELD(ID_ISAR2_EL1, MultU, 20, 4)
> -    IDREG_FIELD(ID_ISAR2_EL1, MultS, 16, 4)
> -    IDREG_FIELD(ID_ISAR2_EL1, Mult, 12, 4)
> -    IDREG_FIELD(ID_ISAR2_EL1, MultiAccessInt, 8, 4)
> -    IDREG_FIELD(ID_ISAR2_EL1, MemHint, 4, 4)
> -    IDREG_FIELD(ID_ISAR2_EL1, LoadStore, 0, 4)
> +    IDREG_FIELD_START(ID_ISAR2_EL1, Reversal, 28, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_ISAR2_EL1, Reversal)
> +    IDREG_FIELD_START(ID_ISAR2_EL1, PSR_AR, 24, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_ISAR2_EL1, PSR_AR)
> +    IDREG_FIELD_START(ID_ISAR2_EL1, MultU, 20, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_ISAR2_EL1, MultU)
> +    IDREG_FIELD_START(ID_ISAR2_EL1, MultS, 16, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +        IDREG_FIELD_ARCH_VAL(3)
> +    IDREG_FIELD_END(ID_ISAR2_EL1, MultS)
> +    IDREG_FIELD_START(ID_ISAR2_EL1, Mult, 12, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_ISAR2_EL1, Mult)
> +    IDREG_FIELD_START(ID_ISAR2_EL1, MultiAccessInt, 8, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_ISAR2_EL1, MultiAccessInt)
> +    IDREG_FIELD_START(ID_ISAR2_EL1, MemHint, 4, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +        IDREG_FIELD_ARCH_VAL(3)
> +        IDREG_FIELD_ARCH_VAL(4)
> +    IDREG_FIELD_END(ID_ISAR2_EL1, MemHint)
> +    IDREG_FIELD_START(ID_ISAR2_EL1, LoadStore, 0, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_ISAR2_EL1, LoadStore)
> IDREG_END(ID_ISAR2_EL1)
> 
> IDREG_START(ID_ISAR3_EL1)
> -    IDREG_FIELD(ID_ISAR3_EL1, T32EE, 28, 4)
> -    IDREG_FIELD(ID_ISAR3_EL1, TrueNOP, 24, 4)
> -    IDREG_FIELD(ID_ISAR3_EL1, T32Copy, 20, 4)
> -    IDREG_FIELD(ID_ISAR3_EL1, TabBranch, 16, 4)
> -    IDREG_FIELD(ID_ISAR3_EL1, SynchPrim, 12, 4)
> -    IDREG_FIELD(ID_ISAR3_EL1, SVC, 8, 4)
> -    IDREG_FIELD(ID_ISAR3_EL1, SIMD, 4, 4)
> -    IDREG_FIELD(ID_ISAR3_EL1, Saturate, 0, 4)
> +    IDREG_FIELD_START(ID_ISAR3_EL1, T32EE, 28, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_ISAR3_EL1, T32EE)
> +    IDREG_FIELD_START(ID_ISAR3_EL1, TrueNOP, 24, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_ISAR3_EL1, TrueNOP)
> +    IDREG_FIELD_START(ID_ISAR3_EL1, T32Copy, 20, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_ISAR3_EL1, T32Copy)
> +    IDREG_FIELD_START(ID_ISAR3_EL1, TabBranch, 16, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_ISAR3_EL1, TabBranch)
> +    IDREG_FIELD_START(ID_ISAR3_EL1, SynchPrim, 12, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_ISAR3_EL1, SynchPrim)
> +    IDREG_FIELD_START(ID_ISAR3_EL1, SVC, 8, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_ISAR3_EL1, SVC)
> +    IDREG_FIELD_START(ID_ISAR3_EL1, SIMD, 4, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(3)
> +    IDREG_FIELD_END(ID_ISAR3_EL1, SIMD)
> +    IDREG_FIELD_START(ID_ISAR3_EL1, Saturate, 0, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_ISAR3_EL1, Saturate)
> IDREG_END(ID_ISAR3_EL1)
> 
> IDREG_START(ID_ISAR4_EL1)
> -    IDREG_FIELD(ID_ISAR4_EL1, SWP_frac, 28, 4)
> -    IDREG_FIELD(ID_ISAR4_EL1, PSR_M, 24, 4)
> -    IDREG_FIELD(ID_ISAR4_EL1, SynchPrim_frac, 20, 4)
> -    IDREG_FIELD(ID_ISAR4_EL1, Barrier, 16, 4)
> -    IDREG_FIELD(ID_ISAR4_EL1, SMC, 12, 4)
> -    IDREG_FIELD(ID_ISAR4_EL1, Writeback, 8, 4)
> -    IDREG_FIELD(ID_ISAR4_EL1, WithShifts, 4, 4)
> -    IDREG_FIELD(ID_ISAR4_EL1, Unpriv, 0, 4)
> +    IDREG_FIELD_START(ID_ISAR4_EL1, SWP_frac, 28, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_ISAR4_EL1, SWP_frac)
> +    IDREG_FIELD_START(ID_ISAR4_EL1, PSR_M, 24, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_ISAR4_EL1, PSR_M)
> +    IDREG_FIELD_START(ID_ISAR4_EL1, SynchPrim_frac, 20, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(3)
> +    IDREG_FIELD_END(ID_ISAR4_EL1, SynchPrim_frac)
> +    IDREG_FIELD_START(ID_ISAR4_EL1, Barrier, 16, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_ISAR4_EL1, Barrier)
> +    IDREG_FIELD_START(ID_ISAR4_EL1, SMC, 12, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_ISAR4_EL1, SMC)
> +    IDREG_FIELD_START(ID_ISAR4_EL1, Writeback, 8, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_ISAR4_EL1, Writeback)
> +    IDREG_FIELD_START(ID_ISAR4_EL1, WithShifts, 4, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(3)
> +        IDREG_FIELD_ARCH_VAL(4)
> +    IDREG_FIELD_END(ID_ISAR4_EL1, WithShifts)
> +    IDREG_FIELD_START(ID_ISAR4_EL1, Unpriv, 0, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_ISAR4_EL1, Unpriv)
> IDREG_END(ID_ISAR4_EL1)
> 
> IDREG_START(ID_ISAR5_EL1)
> -    IDREG_FIELD(ID_ISAR5_EL1, VCMA, 28, 4)
> -    IDREG_FIELD(ID_ISAR5_EL1, RDM, 24, 4)
> -    IDREG_FIELD(ID_ISAR5_EL1, CRC32, 16, 4)
> -    IDREG_FIELD(ID_ISAR5_EL1, SHA2, 12, 4)
> -    IDREG_FIELD(ID_ISAR5_EL1, SHA1, 8, 4)
> -    IDREG_FIELD(ID_ISAR5_EL1, AES, 4, 4)
> -    IDREG_FIELD(ID_ISAR5_EL1, SEVL, 0, 4)
> +    IDREG_FIELD_START(ID_ISAR5_EL1, VCMA, 28, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_ISAR5_EL1, VCMA)
> +    IDREG_FIELD_START(ID_ISAR5_EL1, RDM, 24, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_ISAR5_EL1, RDM)
> +    IDREG_FIELD_START(ID_ISAR5_EL1, CRC32, 16, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_ISAR5_EL1, CRC32)
> +    IDREG_FIELD_START(ID_ISAR5_EL1, SHA2, 12, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_ISAR5_EL1, SHA2)
> +    IDREG_FIELD_START(ID_ISAR5_EL1, SHA1, 8, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_ISAR5_EL1, SHA1)
> +    IDREG_FIELD_START(ID_ISAR5_EL1, AES, 4, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_ISAR5_EL1, AES)
> +    IDREG_FIELD_START(ID_ISAR5_EL1, SEVL, 0, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_ISAR5_EL1, SEVL)
> IDREG_END(ID_ISAR5_EL1)
> 
> IDREG_START(ID_ISAR6_EL1)
> -    IDREG_FIELD(ID_ISAR6_EL1, CLRBHB, 28, 4)
> -    IDREG_FIELD(ID_ISAR6_EL1, I8MM, 24, 4)
> -    IDREG_FIELD(ID_ISAR6_EL1, BF16, 20, 4)
> -    IDREG_FIELD(ID_ISAR6_EL1, SPECRES, 16, 4)
> -    IDREG_FIELD(ID_ISAR6_EL1, SB, 12, 4)
> -    IDREG_FIELD(ID_ISAR6_EL1, FHM, 8, 4)
> -    IDREG_FIELD(ID_ISAR6_EL1, DP, 4, 4)
> -    IDREG_FIELD(ID_ISAR6_EL1, JSCVT, 0, 4)
> +    IDREG_FIELD_START(ID_ISAR6_EL1, CLRBHB, 28, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_ISAR6_EL1, CLRBHB)
> +    IDREG_FIELD_START(ID_ISAR6_EL1, I8MM, 24, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_ISAR6_EL1, I8MM)
> +    IDREG_FIELD_START(ID_ISAR6_EL1, BF16, 20, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_ISAR6_EL1, BF16)
> +    IDREG_FIELD_START(ID_ISAR6_EL1, SPECRES, 16, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_ISAR6_EL1, SPECRES)
> +    IDREG_FIELD_START(ID_ISAR6_EL1, SB, 12, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_ISAR6_EL1, SB)
> +    IDREG_FIELD_START(ID_ISAR6_EL1, FHM, 8, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_ISAR6_EL1, FHM)
> +    IDREG_FIELD_START(ID_ISAR6_EL1, DP, 4, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_ISAR6_EL1, DP)
> +    IDREG_FIELD_START(ID_ISAR6_EL1, JSCVT, 0, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_ISAR6_EL1, JSCVT)
> IDREG_END(ID_ISAR6_EL1)
> 
> IDREG_START(ID_MMFR0_EL1)
> -    IDREG_FIELD(ID_MMFR0_EL1, InnerShr, 28, 4)
> -    IDREG_FIELD(ID_MMFR0_EL1, FCSE, 24, 4)
> -    IDREG_FIELD(ID_MMFR0_EL1, AuxReg, 20, 4)
> -    IDREG_FIELD(ID_MMFR0_EL1, TCM, 16, 4)
> -    IDREG_FIELD(ID_MMFR0_EL1, ShareLvl, 12, 4)
> -    IDREG_FIELD(ID_MMFR0_EL1, OuterShr, 8, 4)
> -    IDREG_FIELD(ID_MMFR0_EL1, PMSA, 4, 4)
> -    IDREG_FIELD(ID_MMFR0_EL1, VMSA, 0, 4)
> +    IDREG_FIELD_START(ID_MMFR0_EL1, InnerShr, 28, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(15)
> +    IDREG_FIELD_END(ID_MMFR0_EL1, InnerShr)
> +    IDREG_FIELD_START(ID_MMFR0_EL1, FCSE, 24, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_MMFR0_EL1, FCSE)
> +    IDREG_FIELD_START(ID_MMFR0_EL1, AuxReg, 20, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_MMFR0_EL1, AuxReg)
> +    IDREG_FIELD_START(ID_MMFR0_EL1, TCM, 16, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +        IDREG_FIELD_ARCH_VAL(3)
> +    IDREG_FIELD_END(ID_MMFR0_EL1, TCM)
> +    IDREG_FIELD_START(ID_MMFR0_EL1, ShareLvl, 12, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_MMFR0_EL1, ShareLvl)
> +    IDREG_FIELD_START(ID_MMFR0_EL1, OuterShr, 8, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(15)
> +    IDREG_FIELD_END(ID_MMFR0_EL1, OuterShr)
> +    IDREG_FIELD_START(ID_MMFR0_EL1, PMSA, 4, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +        IDREG_FIELD_ARCH_VAL(3)
> +    IDREG_FIELD_END(ID_MMFR0_EL1, PMSA)
> +    IDREG_FIELD_START(ID_MMFR0_EL1, VMSA, 0, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +        IDREG_FIELD_ARCH_VAL(3)
> +        IDREG_FIELD_ARCH_VAL(4)
> +        IDREG_FIELD_ARCH_VAL(5)
> +    IDREG_FIELD_END(ID_MMFR0_EL1, VMSA)
> IDREG_END(ID_MMFR0_EL1)
> 
> IDREG_START(ID_MMFR1_EL1)
> -    IDREG_FIELD(ID_MMFR1_EL1, BPred, 28, 4)
> -    IDREG_FIELD(ID_MMFR1_EL1, L1TstCln, 24, 4)
> -    IDREG_FIELD(ID_MMFR1_EL1, L1Uni, 20, 4)
> -    IDREG_FIELD(ID_MMFR1_EL1, L1Hvd, 16, 4)
> -    IDREG_FIELD(ID_MMFR1_EL1, L1UniSW, 12, 4)
> -    IDREG_FIELD(ID_MMFR1_EL1, L1HvdSW, 8, 4)
> -    IDREG_FIELD(ID_MMFR1_EL1, L1UniVA, 4, 4)
> -    IDREG_FIELD(ID_MMFR1_EL1, L1HvdVA, 0, 4)
> +    IDREG_FIELD_START(ID_MMFR1_EL1, BPred, 28, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +        IDREG_FIELD_ARCH_VAL(3)
> +        IDREG_FIELD_ARCH_VAL(4)
> +    IDREG_FIELD_END(ID_MMFR1_EL1, BPred)
> +    IDREG_FIELD_START(ID_MMFR1_EL1, L1TstCln, 24, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_MMFR1_EL1, L1TstCln)
> +    IDREG_FIELD_START(ID_MMFR1_EL1, L1Uni, 20, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_MMFR1_EL1, L1Uni)
> +    IDREG_FIELD_START(ID_MMFR1_EL1, L1Hvd, 16, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +        IDREG_FIELD_ARCH_VAL(3)
> +    IDREG_FIELD_END(ID_MMFR1_EL1, L1Hvd)
> +    IDREG_FIELD_START(ID_MMFR1_EL1, L1UniSW, 12, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +        IDREG_FIELD_ARCH_VAL(3)
> +    IDREG_FIELD_END(ID_MMFR1_EL1, L1UniSW)
> +    IDREG_FIELD_START(ID_MMFR1_EL1, L1HvdSW, 8, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +        IDREG_FIELD_ARCH_VAL(3)
> +    IDREG_FIELD_END(ID_MMFR1_EL1, L1HvdSW)
> +    IDREG_FIELD_START(ID_MMFR1_EL1, L1UniVA, 4, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_MMFR1_EL1, L1UniVA)
> +    IDREG_FIELD_START(ID_MMFR1_EL1, L1HvdVA, 0, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_MMFR1_EL1, L1HvdVA)
> IDREG_END(ID_MMFR1_EL1)
> 
> IDREG_START(ID_MMFR2_EL1)
> -    IDREG_FIELD(ID_MMFR2_EL1, HWAccFlg, 28, 4)
> -    IDREG_FIELD(ID_MMFR2_EL1, WFIStall, 24, 4)
> -    IDREG_FIELD(ID_MMFR2_EL1, MemBarr, 20, 4)
> -    IDREG_FIELD(ID_MMFR2_EL1, UniTLB, 16, 4)
> +    IDREG_FIELD_START(ID_MMFR2_EL1, HWAccFlg, 28, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_MMFR2_EL1, HWAccFlg)
> +    IDREG_FIELD_START(ID_MMFR2_EL1, WFIStall, 24, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_MMFR2_EL1, WFIStall)
> +    IDREG_FIELD_START(ID_MMFR2_EL1, MemBarr, 20, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_MMFR2_EL1, MemBarr)
> +    IDREG_FIELD_START(ID_MMFR2_EL1, UniTLB, 16, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +        IDREG_FIELD_ARCH_VAL(3)
> +        IDREG_FIELD_ARCH_VAL(4)
> +        IDREG_FIELD_ARCH_VAL(5)
> +        IDREG_FIELD_ARCH_VAL(6)
> +    IDREG_FIELD_END(ID_MMFR2_EL1, UniTLB)
>     IDREG_FIELD(ID_MMFR2_EL1, HvdTLB, 12, 4)
> -    IDREG_FIELD(ID_MMFR2_EL1, L1HvdRng, 8, 4)
> -    IDREG_FIELD(ID_MMFR2_EL1, L1HvdBG, 4, 4)
> -    IDREG_FIELD(ID_MMFR2_EL1, L1HvdFG, 0, 4)
> +    IDREG_FIELD_START(ID_MMFR2_EL1, L1HvdRng, 8, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_MMFR2_EL1, L1HvdRng)
> +    IDREG_FIELD_START(ID_MMFR2_EL1, L1HvdBG, 4, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_MMFR2_EL1, L1HvdBG)
> +    IDREG_FIELD_START(ID_MMFR2_EL1, L1HvdFG, 0, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_MMFR2_EL1, L1HvdFG)
> IDREG_END(ID_MMFR2_EL1)
> 
> IDREG_START(ID_MMFR3_EL1)
> -    IDREG_FIELD(ID_MMFR3_EL1, Supersec, 28, 4)
> -    IDREG_FIELD(ID_MMFR3_EL1, CMemSz, 24, 4)
> -    IDREG_FIELD(ID_MMFR3_EL1, CohWalk, 20, 4)
> -    IDREG_FIELD(ID_MMFR3_EL1, PAN, 16, 4)
> -    IDREG_FIELD(ID_MMFR3_EL1, MaintBcst, 12, 4)
> -    IDREG_FIELD(ID_MMFR3_EL1, BPMaint, 8, 4)
> -    IDREG_FIELD(ID_MMFR3_EL1, CMaintSW, 4, 4)
> -    IDREG_FIELD(ID_MMFR3_EL1, CMaintVA, 0, 4)
> +    IDREG_FIELD_START(ID_MMFR3_EL1, Supersec, 28, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(15)
> +    IDREG_FIELD_END(ID_MMFR3_EL1, Supersec)
> +    IDREG_FIELD_START(ID_MMFR3_EL1, CMemSz, 24, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_MMFR3_EL1, CMemSz)
> +    IDREG_FIELD_START(ID_MMFR3_EL1, CohWalk, 20, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_MMFR3_EL1, CohWalk)
> +    IDREG_FIELD_START(ID_MMFR3_EL1, PAN, 16, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_MMFR3_EL1, PAN)
> +    IDREG_FIELD_START(ID_MMFR3_EL1, MaintBcst, 12, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_MMFR3_EL1, MaintBcst)
> +    IDREG_FIELD_START(ID_MMFR3_EL1, BPMaint, 8, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_MMFR3_EL1, BPMaint)
> +    IDREG_FIELD_START(ID_MMFR3_EL1, CMaintSW, 4, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_MMFR3_EL1, CMaintSW)
> +    IDREG_FIELD_START(ID_MMFR3_EL1, CMaintVA, 0, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_MMFR3_EL1, CMaintVA)
> IDREG_END(ID_MMFR3_EL1)
> 
> IDREG_START(ID_MMFR4_EL1)
> -    IDREG_FIELD(ID_MMFR4_EL1, EVT, 28, 4)
> -    IDREG_FIELD(ID_MMFR4_EL1, CCIDX, 24, 4)
> -    IDREG_FIELD(ID_MMFR4_EL1, LSM, 20, 4)
> -    IDREG_FIELD(ID_MMFR4_EL1, HPDS, 16, 4)
> -    IDREG_FIELD(ID_MMFR4_EL1, CnP, 12, 4)
> -    IDREG_FIELD(ID_MMFR4_EL1, XNX, 8, 4)
> -    IDREG_FIELD(ID_MMFR4_EL1, AC2, 4, 4)
> -    IDREG_FIELD(ID_MMFR4_EL1, SpecSEI, 0, 4)
> +    IDREG_FIELD_START(ID_MMFR4_EL1, EVT, 28, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_MMFR4_EL1, EVT)
> +    IDREG_FIELD_START(ID_MMFR4_EL1, CCIDX, 24, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_MMFR4_EL1, CCIDX)
> +    IDREG_FIELD_START(ID_MMFR4_EL1, LSM, 20, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_MMFR4_EL1, LSM)
> +    IDREG_FIELD_START(ID_MMFR4_EL1, HPDS, 16, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_MMFR4_EL1, HPDS)
> +    IDREG_FIELD_START(ID_MMFR4_EL1, CnP, 12, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_MMFR4_EL1, CnP)
> +    IDREG_FIELD_START(ID_MMFR4_EL1, XNX, 8, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_MMFR4_EL1, XNX)
> +    IDREG_FIELD_START(ID_MMFR4_EL1, AC2, 4, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_MMFR4_EL1, AC2)
> +    IDREG_FIELD_START(ID_MMFR4_EL1, SpecSEI, 0, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_MMFR4_EL1, SpecSEI)
> IDREG_END(ID_MMFR4_EL1)
> 
> IDREG_START(ID_MMFR5_EL1)
> -    IDREG_FIELD(ID_MMFR5_EL1, nTLBPA, 4, 4)
> -    IDREG_FIELD(ID_MMFR5_EL1, ETS, 0, 4)
> +    IDREG_FIELD_START(ID_MMFR5_EL1, nTLBPA, 4, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_MMFR5_EL1, nTLBPA)
> +    IDREG_FIELD_START(ID_MMFR5_EL1, ETS, 0, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +        IDREG_FIELD_ARCH_VAL(3)
> +    IDREG_FIELD_END(ID_MMFR5_EL1, ETS)
> IDREG_END(ID_MMFR5_EL1)
> 
> IDREG_START(ID_PFR0_EL1)
> -    IDREG_FIELD(ID_PFR0_EL1, RAS, 28, 4)
> -    IDREG_FIELD(ID_PFR0_EL1, DIT, 24, 4)
> -    IDREG_FIELD(ID_PFR0_EL1, AMU, 20, 4)
> -    IDREG_FIELD(ID_PFR0_EL1, CSV2, 16, 4)
> -    IDREG_FIELD(ID_PFR0_EL1, State3, 12, 4)
> -    IDREG_FIELD(ID_PFR0_EL1, State2, 8, 4)
> -    IDREG_FIELD(ID_PFR0_EL1, State1, 4, 4)
> -    IDREG_FIELD(ID_PFR0_EL1, State0, 0, 4)
> +    IDREG_FIELD_START(ID_PFR0_EL1, RAS, 28, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +        IDREG_FIELD_ARCH_VAL(3)
> +    IDREG_FIELD_END(ID_PFR0_EL1, RAS)
> +    IDREG_FIELD_START(ID_PFR0_EL1, DIT, 24, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_PFR0_EL1, DIT)
> +    IDREG_FIELD_START(ID_PFR0_EL1, AMU, 20, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_PFR0_EL1, AMU)
> +    IDREG_FIELD_START(ID_PFR0_EL1, CSV2, 16, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_PFR0_EL1, CSV2)
> +    IDREG_FIELD_START(ID_PFR0_EL1, State3, 12, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_PFR0_EL1, State3)
> +    IDREG_FIELD_START(ID_PFR0_EL1, State2, 8, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_PFR0_EL1, State2)
> +    IDREG_FIELD_START(ID_PFR0_EL1, State1, 4, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(3)
> +    IDREG_FIELD_END(ID_PFR0_EL1, State1)
> +    IDREG_FIELD_START(ID_PFR0_EL1, State0, 0, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_PFR0_EL1, State0)
> IDREG_END(ID_PFR0_EL1)
> 
> IDREG_START(ID_PFR1_EL1)
> -    IDREG_FIELD(ID_PFR1_EL1, GIC, 28, 4)
> -    IDREG_FIELD(ID_PFR1_EL1, Virt_frac, 24, 4)
> -    IDREG_FIELD(ID_PFR1_EL1, Sec_frac, 20, 4)
> -    IDREG_FIELD(ID_PFR1_EL1, GenTimer, 16, 4)
> -    IDREG_FIELD(ID_PFR1_EL1, Virtualization, 12, 4)
> -    IDREG_FIELD(ID_PFR1_EL1, MProgMod, 8, 4)
> -    IDREG_FIELD(ID_PFR1_EL1, Security, 4, 4)
> -    IDREG_FIELD(ID_PFR1_EL1, ProgMod, 0, 4)
> +    IDREG_FIELD_START(ID_PFR1_EL1, GIC, 28, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(3)
> +    IDREG_FIELD_END(ID_PFR1_EL1, GIC)
> +    IDREG_FIELD_START(ID_PFR1_EL1, Virt_frac, 24, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_PFR1_EL1, Virt_frac)
> +    IDREG_FIELD_START(ID_PFR1_EL1, Sec_frac, 20, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_PFR1_EL1, Sec_frac)
> +    IDREG_FIELD_START(ID_PFR1_EL1, GenTimer, 16, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_PFR1_EL1, GenTimer)
> +    IDREG_FIELD_START(ID_PFR1_EL1, Virtualization, 12, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_PFR1_EL1, Virtualization)
> +    IDREG_FIELD_START(ID_PFR1_EL1, MProgMod, 8, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_PFR1_EL1, MProgMod)
> +    IDREG_FIELD_START(ID_PFR1_EL1, Security, 4, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(ID_PFR1_EL1, Security)
> +    IDREG_FIELD_START(ID_PFR1_EL1, ProgMod, 0, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_PFR1_EL1, ProgMod)
> IDREG_END(ID_PFR1_EL1)
> 
> IDREG_START(ID_PFR2_EL1)
> -    IDREG_FIELD(ID_PFR2_EL1, RAS_frac, 8, 4)
> -    IDREG_FIELD(ID_PFR2_EL1, SSBS, 4, 4)
> -    IDREG_FIELD(ID_PFR2_EL1, CSV3, 0, 4)
> +    IDREG_FIELD_START(ID_PFR2_EL1, RAS_frac, 8, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_PFR2_EL1, RAS_frac)
> +    IDREG_FIELD_START(ID_PFR2_EL1, SSBS, 4, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_PFR2_EL1, SSBS)
> +    IDREG_FIELD_START(ID_PFR2_EL1, CSV3, 0, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(ID_PFR2_EL1, CSV3)
> IDREG_END(ID_PFR2_EL1)
> 
> IDREG_START(MIDR_EL1)
> -    IDREG_FIELD(MIDR_EL1, Implementer, 24, 8)
> +    IDREG_FIELD_START(MIDR_EL1, Implementer, 24, 8)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(65)
> +        IDREG_FIELD_ARCH_VAL(66)
> +        IDREG_FIELD_ARCH_VAL(67)
> +        IDREG_FIELD_ARCH_VAL(68)
> +        IDREG_FIELD_ARCH_VAL(70)
> +        IDREG_FIELD_ARCH_VAL(73)
> +        IDREG_FIELD_ARCH_VAL(77)
> +        IDREG_FIELD_ARCH_VAL(78)
> +        IDREG_FIELD_ARCH_VAL(80)
> +        IDREG_FIELD_ARCH_VAL(81)
> +        IDREG_FIELD_ARCH_VAL(86)
> +        IDREG_FIELD_ARCH_VAL(105)
> +        IDREG_FIELD_ARCH_VAL(192)
> +    IDREG_FIELD_END(MIDR_EL1, Implementer)
>     IDREG_FIELD(MIDR_EL1, Variant, 20, 4)
> -    IDREG_FIELD(MIDR_EL1, Architecture, 16, 4)
> +    IDREG_FIELD_START(MIDR_EL1, Architecture, 16, 4)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +        IDREG_FIELD_ARCH_VAL(3)
> +        IDREG_FIELD_ARCH_VAL(4)
> +        IDREG_FIELD_ARCH_VAL(5)
> +        IDREG_FIELD_ARCH_VAL(6)
> +        IDREG_FIELD_ARCH_VAL(7)
> +        IDREG_FIELD_ARCH_VAL(15)
> +    IDREG_FIELD_END(MIDR_EL1, Architecture)
>     IDREG_FIELD(MIDR_EL1, PartNum, 4, 12)
>     IDREG_FIELD(MIDR_EL1, Revision, 0, 4)
> IDREG_END(MIDR_EL1)
> 
> IDREG_START(MPIDR_EL1)
>     IDREG_FIELD(MPIDR_EL1, Aff3, 32, 8)
> -    IDREG_FIELD(MPIDR_EL1, U, 30, 1)
> -    IDREG_FIELD(MPIDR_EL1, MT, 24, 1)
> +    IDREG_FIELD_START(MPIDR_EL1, U, 30, 1)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(MPIDR_EL1, U)
> +    IDREG_FIELD_START(MPIDR_EL1, MT, 24, 1)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(MPIDR_EL1, MT)
>     IDREG_FIELD(MPIDR_EL1, Aff2, 16, 8)
>     IDREG_FIELD(MPIDR_EL1, Aff1, 8, 8)
>     IDREG_FIELD(MPIDR_EL1, Aff0, 0, 8)
> IDREG_END(MPIDR_EL1)
> 
> IDREG_START(MVFR0_EL1)
> -    IDREG_FIELD(MVFR0_EL1, FPRound, 28, 4)
> -    IDREG_FIELD(MVFR0_EL1, FPShVec, 24, 4)
> -    IDREG_FIELD(MVFR0_EL1, FPSqrt, 20, 4)
> -    IDREG_FIELD(MVFR0_EL1, FPDivide, 16, 4)
> -    IDREG_FIELD(MVFR0_EL1, FPTrap, 12, 4)
> -    IDREG_FIELD(MVFR0_EL1, FPDP, 8, 4)
> -    IDREG_FIELD(MVFR0_EL1, FPSP, 4, 4)
> -    IDREG_FIELD(MVFR0_EL1, SIMDReg, 0, 4)
> +    IDREG_FIELD_START(MVFR0_EL1, FPRound, 28, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(MVFR0_EL1, FPRound)
> +    IDREG_FIELD_START(MVFR0_EL1, FPShVec, 24, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(MVFR0_EL1, FPShVec)
> +    IDREG_FIELD_START(MVFR0_EL1, FPSqrt, 20, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(MVFR0_EL1, FPSqrt)
> +    IDREG_FIELD_START(MVFR0_EL1, FPDivide, 16, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(MVFR0_EL1, FPDivide)
> +    IDREG_FIELD_START(MVFR0_EL1, FPTrap, 12, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(MVFR0_EL1, FPTrap)
> +    IDREG_FIELD_START(MVFR0_EL1, FPDP, 8, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(MVFR0_EL1, FPDP)
> +    IDREG_FIELD_START(MVFR0_EL1, FPSP, 4, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(MVFR0_EL1, FPSP)
> +    IDREG_FIELD_START(MVFR0_EL1, SIMDReg, 0, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(MVFR0_EL1, SIMDReg)
> IDREG_END(MVFR0_EL1)
> 
> IDREG_START(MVFR1_EL1)
> -    IDREG_FIELD(MVFR1_EL1, SIMDFMAC, 28, 4)
> -    IDREG_FIELD(MVFR1_EL1, FPHP, 24, 4)
> -    IDREG_FIELD(MVFR1_EL1, SIMDHP, 20, 4)
> -    IDREG_FIELD(MVFR1_EL1, SIMDSP, 16, 4)
> -    IDREG_FIELD(MVFR1_EL1, SIMDInt, 12, 4)
> -    IDREG_FIELD(MVFR1_EL1, SIMDLS, 8, 4)
> -    IDREG_FIELD(MVFR1_EL1, FPDNaN, 4, 4)
> -    IDREG_FIELD(MVFR1_EL1, FPFtZ, 0, 4)
> +    IDREG_FIELD_START(MVFR1_EL1, SIMDFMAC, 28, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(MVFR1_EL1, SIMDFMAC)
> +    IDREG_FIELD_START(MVFR1_EL1, FPHP, 24, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +        IDREG_FIELD_ARCH_VAL(3)
> +    IDREG_FIELD_END(MVFR1_EL1, FPHP)
> +    IDREG_FIELD_START(MVFR1_EL1, SIMDHP, 20, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +    IDREG_FIELD_END(MVFR1_EL1, SIMDHP)
> +    IDREG_FIELD_START(MVFR1_EL1, SIMDSP, 16, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(MVFR1_EL1, SIMDSP)
> +    IDREG_FIELD_START(MVFR1_EL1, SIMDInt, 12, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(MVFR1_EL1, SIMDInt)
> +    IDREG_FIELD_START(MVFR1_EL1, SIMDLS, 8, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(MVFR1_EL1, SIMDLS)
> +    IDREG_FIELD_START(MVFR1_EL1, FPDNaN, 4, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(MVFR1_EL1, FPDNaN)
> +    IDREG_FIELD_START(MVFR1_EL1, FPFtZ, 0, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(MVFR1_EL1, FPFtZ)
> IDREG_END(MVFR1_EL1)
> 
> IDREG_START(MVFR2_EL1)
> -    IDREG_FIELD(MVFR2_EL1, FPMisc, 4, 4)
> -    IDREG_FIELD(MVFR2_EL1, SIMDMisc, 0, 4)
> +    IDREG_FIELD_START(MVFR2_EL1, FPMisc, 4, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +        IDREG_FIELD_ARCH_VAL(3)
> +        IDREG_FIELD_ARCH_VAL(4)
> +    IDREG_FIELD_END(MVFR2_EL1, FPMisc)
> +    IDREG_FIELD_START(MVFR2_EL1, SIMDMisc, 0, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +        IDREG_FIELD_ARCH_VAL(3)
> +    IDREG_FIELD_END(MVFR2_EL1, SIMDMisc)
> IDREG_END(MVFR2_EL1)
> 
> IDREG_START(REVIDR_EL1)
> IDREG_END(REVIDR_EL1)
> 
> IDREG_START(SMIDR_EL1)
> -    IDREG_FIELD(SMIDR_EL1, NSMC, 56, 4)
> -    IDREG_FIELD(SMIDR_EL1, HIP, 52, 4)
> +    IDREG_FIELD_START(SMIDR_EL1, NSMC, 56, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(15)
> +    IDREG_FIELD_END(SMIDR_EL1, NSMC)
> +    IDREG_FIELD_START(SMIDR_EL1, HIP, 52, 4)
> +        IDREG_FIELD_ARCH_VAL(0)
> +    IDREG_FIELD_END(SMIDR_EL1, HIP)
>     IDREG_FIELD(SMIDR_EL1, Affinity2, 32, 20)
> -    IDREG_FIELD(SMIDR_EL1, Implementer, 24, 8)
> +    IDREG_FIELD_START(SMIDR_EL1, Implementer, 24, 8)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(65)
> +        IDREG_FIELD_ARCH_VAL(66)
> +        IDREG_FIELD_ARCH_VAL(67)
> +        IDREG_FIELD_ARCH_VAL(68)
> +        IDREG_FIELD_ARCH_VAL(70)
> +        IDREG_FIELD_ARCH_VAL(73)
> +        IDREG_FIELD_ARCH_VAL(77)
> +        IDREG_FIELD_ARCH_VAL(78)
> +        IDREG_FIELD_ARCH_VAL(80)
> +        IDREG_FIELD_ARCH_VAL(81)
> +        IDREG_FIELD_ARCH_VAL(86)
> +        IDREG_FIELD_ARCH_VAL(105)
> +        IDREG_FIELD_ARCH_VAL(192)
> +    IDREG_FIELD_END(SMIDR_EL1, Implementer)
>     IDREG_FIELD(SMIDR_EL1, Revision, 16, 8)
> -    IDREG_FIELD(SMIDR_EL1, SMPS, 15, 1)
> -    IDREG_FIELD(SMIDR_EL1, SH, 13, 2)
> +    IDREG_FIELD_START(SMIDR_EL1, SMPS, 15, 1)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +    IDREG_FIELD_END(SMIDR_EL1, SMPS)
> +    IDREG_FIELD_START(SMIDR_EL1, SH, 13, 2)
> +        IDREG_FIELD_ARCH_VAL(0)
> +        IDREG_FIELD_ARCH_VAL(1)
> +        IDREG_FIELD_ARCH_VAL(2)
> +        IDREG_FIELD_ARCH_VAL(3)
> +    IDREG_FIELD_END(SMIDR_EL1, SH)
>     IDREG_FIELD(SMIDR_EL1, Affinity, 0, 12)
> IDREG_END(SMIDR_EL1)
> 
> diff --git a/scripts/update-aarch64-cpu-sysreg-properties.py b/scripts/update-aarch64-cpu-sysreg-properties.py
> index 6f5edb88d2..e1d6c4afef 100644
> --- a/scripts/update-aarch64-cpu-sysreg-properties.py
> +++ b/scripts/update-aarch64-cpu-sysreg-properties.py
> @@ -9,7 +9,12 @@
> #
> # IDREG_START(REG)
> #    IDREG_FIELD(REG, FIELD, SHIFT, LENGTH)
> -# ...
> +#    or for fields with enum values
> +#    IDREG_FIELD_START(REG, FIELD, SHIFT, LENGTH)
> +#        IDREG_FIELD_ARCH_VAL(VALUE)
> +#        ../..
> +#    IDREG_FIELD_END(REG, FIELD)
> +#    ../..
Nit: trailing whitespace
> # IDREG_END(REG)
> #
> # Copyright (C) 2026 Red Hat, Inc.
> @@ -98,6 +103,51 @@ def collect_fields(item, bit_offset=0):
>     return fields
> 
> 
> +def extract_field_enums(field):
> +    enums = []
> +    if not isinstance(field, dict):
> +        return enums
> +
> +    value_obj = field.get("value")
> +    if not isinstance(value_obj, dict):
> +        return enums
> +
> +    constraints = value_obj.get("constraints")
> +    if not isinstance(constraints, dict):
> +        return enums
> +
> +    val_entries = constraints.get("values", [])
> +    if not isinstance(val_entries, list):
> +        return enums
> +
> +    for val_entry in val_entries:
> +        if not isinstance(val_entry, dict):
> +            continue
> +            
Nit: trailing whitespace
> +        if val_entry.get("_type") == "Values.Value":
> +            raw_val = val_entry.get("value")
> +            if raw_val is None:
> +                continue
> +                
Nit: trailing whitespace
> +            # some of the values have ' like "'0100'"
> +            raw_val_str = str(raw_val).strip().replace("'", "")
> +            
Nit: trailing whitespace ...
> +            try:
> +                # convert into bin 
> +                int_val = int(raw_val_str, 2)
> +            except ValueError:
> +                try:
> +                    # Fallback to dec if not bin
> +                    int_val = int(raw_val_str, 0)
> +                except ValueError:
> +                    continue
> +            
> +            enums.append({
> +                'value': int_val
> +            })
> +            
> +    return enums
> +
> def generate_sysreg_properties_from_registers_json(id_reg_names, raw_json_path):
>     with open(raw_json_path, 'r') as f:
>         register_data = json.load(f)
> @@ -128,16 +178,31 @@ def generate_sysreg_properties_from_registers_json(id_reg_names, raw_json_path):
>                     # Only keep the fields with the highest MSB
>                     # needed fir CCSIDR_EL1
>                     if name not in unique_fields or msb > unique_fields[name]['msb']:
> -                        unique_fields[name] = {'lsb': lsb, 'msb': msb, 'width': width}
> +                        # extract enum values if any
> +                        enums = extract_field_enums(val)
> +                        unique_fields[name] = {'lsb': lsb, 'msb': msb, 'width': width, 'enums': enums}
> 
>         # Sort decreasing lsbs
>         sorted_fields = sorted(unique_fields.items(),
>                                key=lambda x: x[1]['lsb'], reverse=True)
> 
>         for name, bits in sorted_fields:
> -            line = (f"    IDREG_FIELD({reg_name}, "
> -                    f"{name}, {bits['lsb']}, {bits['width']})\n")
> +            enums_list = bits.get('enums', [])
> +
> +            if enums_list:
> +               line = (f"    IDREG_FIELD_START({reg_name}, "
> +                       f"{name}, {bits['lsb']}, {bits['width']})\n")
> +            else:
> +               line = (f"    IDREG_FIELD({reg_name}, "
> +                       f"{name}, {bits['lsb']}, {bits['width']})\n")
>             final_output += line
> +            # add the enum value definition if any
> +            for enum_item in enums_list:
> +                final_output += (f"        IDREG_FIELD_ARCH_VAL({enum_item['value']})\n")
> +            if enums_list:
> +               line = (f"    IDREG_FIELD_END({reg_name}, {name})\n")
> +               final_output += line
> +     
>         final_output += f"IDREG_END({reg_name})\n"
>         final_output += "\n"
> 
> @@ -147,7 +212,11 @@ def generate_sysreg_properties_from_registers_json(id_reg_names, raw_json_path):
>         f.write("/* SPDX-License-Identifier: GPL-2.0-or-later */\n\n")
>         f.write("/* IDREG_START(REG) */\n")
>         f.write("/*     IDREG_FIELD(REG, FIELD, SHIFT, LENGTH) */\n")
> +        f.write("/*     or for fields with enum values */\n")
> +        f.write("/*     IDREG_FIELD_START(REG, FIELD, SHIFT, LENGTH) */\n")
> +        f.write("/*         IDREG_FIELD_ARCH_VAL(VALUE) */\n")
>         f.write("/* ... */\n")
> +        f.write("/*     IDREG_FIELD_END(REG, FIELD) */\n")
>         f.write("/* IDREG_END(REG) */\n\n")
>         f.write(final_output)
> 
> -- 
> 2.53.0
> 

Also I do not see any ValueRange handling..., Am I missing something here?

Warm Regards,
Khushit