On 7/16/26 11:38 PM, Khushit Shah wrote:
> Signed-off-by: Khushit Shah <[email protected]>
> ---
> target/arm/cpu-idregs.h.inc | 165 +++++++++++++++++-------------------
> 1 file changed, 76 insertions(+), 89 deletions(-)
>
> diff --git a/target/arm/cpu-idregs.h.inc b/target/arm/cpu-idregs.h.inc
> index 5fdc84237c..1851b37937 100644
> --- a/target/arm/cpu-idregs.h.inc
> +++ b/target/arm/cpu-idregs.h.inc
> @@ -12,23 +12,24 @@
> /* IDREG_END(REG) */
>
> IDREG_START(AIDR_EL1)
> + IDREG_FIELD(AIDR_EL1, VAL, 0, 64)
> IDREG_END(AIDR_EL1)
>
> IDREG_START(CCSIDR2_EL1)
> - IDREG_FIELD(CCSIDR2_EL1, RES0, 24, 40)
> + IDREG_FIELD(CCSIDR2_EL1, RES0_24, 24, 40)
> IDREG_FIELD(CCSIDR2_EL1, NumSets, 0, 24)
> IDREG_END(CCSIDR2_EL1)
>
> IDREG_START(CCSIDR_EL1)
> - IDREG_FIELD(CCSIDR_EL1, RES0, 56, 8)
> + IDREG_FIELD(CCSIDR_EL1, RES0_56, 56, 8)
> IDREG_FIELD(CCSIDR_EL1, NumSets, 32, 24)
> - IDREG_FIELD(CCSIDR_EL1, RES0, 24, 8)
> + IDREG_FIELD(CCSIDR_EL1, RES0_24, 24, 8)
> IDREG_FIELD(CCSIDR_EL1, Associativity, 3, 21)
> IDREG_FIELD(CCSIDR_EL1, LineSize, 0, 3)
> IDREG_END(CCSIDR_EL1)
>
> IDREG_START(CLIDR_EL1)
> - IDREG_FIELD(CLIDR_EL1, RES0, 47, 17)
> + IDREG_FIELD(CLIDR_EL1, RES0_47, 47, 17)
> IDREG_FIELD(CLIDR_EL1, Ttype7, 45, 2)
> IDREG_FIELD(CLIDR_EL1, Ttype6, 43, 2)
> IDREG_FIELD(CLIDR_EL1, Ttype5, 41, 2)
> @@ -59,10 +60,10 @@ IDREG_START(CLIDR_EL1)
> IDREG_END(CLIDR_EL1)
>
> IDREG_START(CTR_EL0)
> - IDREG_FIELD(CTR_EL0, RES0, 38, 26)
> + IDREG_FIELD(CTR_EL0, RES0_38, 38, 26)
> IDREG_FIELD(CTR_EL0, TminLine, 32, 6)
> - IDREG_FIELD(CTR_EL0, RES1, 31, 1)
> - IDREG_FIELD(CTR_EL0, RES0, 30, 1)
> + IDREG_FIELD(CTR_EL0, RES1_31, 31, 1)
> + IDREG_FIELD(CTR_EL0, RES0_30, 30, 1)
> IDREG_FIELD_START(CTR_EL0, DIC, 29, 1)
> IDREG_FIELD_ARCH_VAL(0)
> IDREG_FIELD_ARCH_VAL(1)
> @@ -80,28 +81,28 @@ IDREG_START(CTR_EL0)
> IDREG_FIELD_ARCH_VAL(2)
> IDREG_FIELD_ARCH_VAL(3)
> IDREG_FIELD_END(CTR_EL0, L1Ip)
> - IDREG_FIELD(CTR_EL0, RES0, 4, 10)
> + IDREG_FIELD(CTR_EL0, RES0_4, 4, 10)
> IDREG_FIELD(CTR_EL0, IminLine, 0, 4)
> IDREG_END(CTR_EL0)
>
> IDREG_START(DCZID_EL0)
> - IDREG_FIELD(DCZID_EL0, RES0, 9, 55)
> + IDREG_FIELD(DCZID_EL0, RES0_9, 9, 55)
> IDREG_FIELD(DCZID_EL0, TBS, 5, 4)
> IDREG_FIELD(DCZID_EL0, DZP, 4, 1)
> IDREG_FIELD(DCZID_EL0, BS, 0, 4)
> IDREG_END(DCZID_EL0)
>
> IDREG_START(GMID_EL1)
> - IDREG_FIELD(GMID_EL1, RES0, 4, 60)
> + IDREG_FIELD(GMID_EL1, RES0_4, 4, 60)
> IDREG_FIELD(GMID_EL1, BS, 0, 4)
> IDREG_END(GMID_EL1)
>
> IDREG_START(ID_AA64AFR0_EL1)
> - IDREG_FIELD(ID_AA64AFR0_EL1, RES0, 32, 32)
> + IDREG_FIELD(ID_AA64AFR0_EL1, RES0_32, 32, 32)
> IDREG_END(ID_AA64AFR0_EL1)
>
> IDREG_START(ID_AA64AFR1_EL1)
> - IDREG_FIELD(ID_AA64AFR1_EL1, RES0, 0, 64)
> + IDREG_FIELD(ID_AA64AFR1_EL1, RES0_0, 0, 64)
> IDREG_END(ID_AA64AFR1_EL1)
>
> IDREG_START(ID_AA64DFR0_EL1)
> @@ -145,18 +146,14 @@ IDREG_START(ID_AA64DFR0_EL1)
> 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, RES0, 24, 4)
> + IDREG_FIELD(ID_AA64DFR0_EL1, CTX_CMPs, 28, 4)
so it seems you remove all the ARCH values found in ValueRange (by the
way there were incomplete)
Eric
> + IDREG_FIELD(ID_AA64DFR0_EL1, RES0_24, 24, 4)
> IDREG_FIELD(ID_AA64DFR0_EL1, WRPs, 20, 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(ID_AA64DFR0_EL1, BRPs, 12, 4)
> IDREG_FIELD_START(ID_AA64DFR0_EL1, PMUVer, 8, 4)
> IDREG_FIELD_ARCH_VAL(0)
> IDREG_FIELD_ARCH_VAL(1)
> @@ -209,20 +206,14 @@ IDREG_START(ID_AA64DFR1_EL1)
> 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, CTX_CMPs, 24, 8)
> + IDREG_FIELD(ID_AA64DFR1_EL1, WRPs, 16, 8)
> + IDREG_FIELD(ID_AA64DFR1_EL1, BRPs, 8, 8)
> IDREG_FIELD(ID_AA64DFR1_EL1, SYSPMUID, 0, 8)
> IDREG_END(ID_AA64DFR1_EL1)
>
> IDREG_START(ID_AA64DFR2_EL1)
> - IDREG_FIELD(ID_AA64DFR2_EL1, RES0, 28, 36)
> + IDREG_FIELD(ID_AA64DFR2_EL1, RES0_28, 28, 36)
> IDREG_FIELD_START(ID_AA64DFR2_EL1, TRBE_EXC, 24, 4)
> IDREG_FIELD_ARCH_VAL(0)
> IDREG_FIELD_ARCH_VAL(1)
> @@ -235,7 +226,7 @@ IDREG_START(ID_AA64DFR2_EL1)
> IDREG_FIELD_ARCH_VAL(0)
> IDREG_FIELD_ARCH_VAL(1)
> IDREG_FIELD_END(ID_AA64DFR2_EL1, SPE_EXC)
> - IDREG_FIELD(ID_AA64DFR2_EL1, RES0, 8, 8)
> + IDREG_FIELD(ID_AA64DFR2_EL1, RES0_8, 8, 8)
> IDREG_FIELD_START(ID_AA64DFR2_EL1, BWE, 4, 4)
> IDREG_FIELD_ARCH_VAL(0)
> IDREG_FIELD_ARCH_VAL(1)
> @@ -248,7 +239,7 @@ IDREG_START(ID_AA64DFR2_EL1)
> IDREG_END(ID_AA64DFR2_EL1)
>
> IDREG_START(ID_AA64FPFR0_EL1)
> - IDREG_FIELD(ID_AA64FPFR0_EL1, RES0, 32, 32)
> + IDREG_FIELD(ID_AA64FPFR0_EL1, RES0_32, 32, 32)
> IDREG_FIELD_START(ID_AA64FPFR0_EL1, F8CVT, 31, 1)
> IDREG_FIELD_ARCH_VAL(0)
> IDREG_FIELD_ARCH_VAL(1)
> @@ -273,13 +264,13 @@ IDREG_START(ID_AA64FPFR0_EL1)
> IDREG_FIELD_ARCH_VAL(0)
> IDREG_FIELD_ARCH_VAL(1)
> IDREG_FIELD_END(ID_AA64FPFR0_EL1, F8MM4)
> - IDREG_FIELD(ID_AA64FPFR0_EL1, RES0, 16, 10)
> + IDREG_FIELD(ID_AA64FPFR0_EL1, RES0_16, 16, 10)
> 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(ID_AA64FPFR0_EL1, RES0, 8, 7)
> - IDREG_FIELD(ID_AA64FPFR0_EL1, RAZ, 2, 6)
> + IDREG_FIELD(ID_AA64FPFR0_EL1, RES0_8, 8, 7)
> + IDREG_FIELD(ID_AA64FPFR0_EL1, RAZ_2, 2, 6)
> IDREG_FIELD_START(ID_AA64FPFR0_EL1, F8E4M3, 1, 1)
> IDREG_FIELD_ARCH_VAL(0)
> IDREG_FIELD_ARCH_VAL(1)
> @@ -331,7 +322,7 @@ IDREG_START(ID_AA64ISAR0_EL1)
> IDREG_FIELD_ARCH_VAL(0)
> IDREG_FIELD_ARCH_VAL(1)
> IDREG_FIELD_END(ID_AA64ISAR0_EL1, RDM)
> - IDREG_FIELD(ID_AA64ISAR0_EL1, RES0, 24, 4)
> + IDREG_FIELD(ID_AA64ISAR0_EL1, RES0_24, 24, 4)
> IDREG_FIELD_START(ID_AA64ISAR0_EL1, Atomic, 20, 4)
> IDREG_FIELD_ARCH_VAL(0)
> IDREG_FIELD_ARCH_VAL(2)
> @@ -355,7 +346,7 @@ IDREG_START(ID_AA64ISAR0_EL1)
> IDREG_FIELD_ARCH_VAL(1)
> IDREG_FIELD_ARCH_VAL(2)
> IDREG_FIELD_END(ID_AA64ISAR0_EL1, AES)
> - IDREG_FIELD(ID_AA64ISAR0_EL1, RES0, 0, 4)
> + IDREG_FIELD(ID_AA64ISAR0_EL1, RES0_0, 0, 4)
> IDREG_END(ID_AA64ISAR0_EL1)
>
> IDREG_START(ID_AA64ISAR1_EL1)
> @@ -519,7 +510,7 @@ IDREG_START(ID_AA64ISAR2_EL1)
> IDREG_END(ID_AA64ISAR2_EL1)
>
> IDREG_START(ID_AA64ISAR3_EL1)
> - IDREG_FIELD(ID_AA64ISAR3_EL1, RES0, 48, 16)
> + IDREG_FIELD(ID_AA64ISAR3_EL1, RES0_48, 48, 16)
> IDREG_FIELD_START(ID_AA64ISAR3_EL1, LSCP, 44, 4)
> IDREG_FIELD_ARCH_VAL(0)
> IDREG_FIELD_ARCH_VAL(1)
> @@ -583,7 +574,7 @@ IDREG_START(ID_AA64MMFR0_EL1)
> IDREG_FIELD_ARCH_VAL(1)
> IDREG_FIELD_ARCH_VAL(2)
> IDREG_FIELD_END(ID_AA64MMFR0_EL1, FGT)
> - IDREG_FIELD(ID_AA64MMFR0_EL1, RES0, 48, 8)
> + IDREG_FIELD(ID_AA64MMFR0_EL1, RES0_48, 48, 8)
> IDREG_FIELD_START(ID_AA64MMFR0_EL1, ExS, 44, 4)
> IDREG_FIELD_ARCH_VAL(0)
> IDREG_FIELD_ARCH_VAL(1)
> @@ -736,7 +727,7 @@ IDREG_START(ID_AA64MMFR2_EL1)
> IDREG_FIELD_ARCH_VAL(0)
> IDREG_FIELD_ARCH_VAL(1)
> IDREG_FIELD_END(ID_AA64MMFR2_EL1, TTL)
> - IDREG_FIELD(ID_AA64MMFR2_EL1, RES0, 44, 4)
> + IDREG_FIELD(ID_AA64MMFR2_EL1, RES0_44, 44, 4)
> IDREG_FIELD_START(ID_AA64MMFR2_EL1, FWB, 40, 4)
> IDREG_FIELD_ARCH_VAL(0)
> IDREG_FIELD_ARCH_VAL(1)
> @@ -802,7 +793,7 @@ IDREG_START(ID_AA64MMFR3_EL1)
> IDREG_FIELD_ARCH_VAL(2)
> IDREG_FIELD_ARCH_VAL(3)
> IDREG_FIELD_END(ID_AA64MMFR3_EL1, SDERR)
> - IDREG_FIELD(ID_AA64MMFR3_EL1, RES0, 48, 4)
> + IDREG_FIELD(ID_AA64MMFR3_EL1, RES0_48, 48, 4)
> IDREG_FIELD_START(ID_AA64MMFR3_EL1, ANERR, 44, 4)
> IDREG_FIELD_ARCH_VAL(0)
> IDREG_FIELD_ARCH_VAL(1)
> @@ -1056,7 +1047,7 @@ IDREG_START(ID_AA64PFR1_EL1)
> IDREG_FIELD_ARCH_VAL(1)
> IDREG_FIELD_ARCH_VAL(2)
> IDREG_FIELD_END(ID_AA64PFR1_EL1, SME)
> - IDREG_FIELD(ID_AA64PFR1_EL1, RES0, 20, 4)
> + IDREG_FIELD(ID_AA64PFR1_EL1, RES0_20, 20, 4)
> IDREG_FIELD_START(ID_AA64PFR1_EL1, MPAM_frac, 16, 4)
> IDREG_FIELD_ARCH_VAL(0)
> IDREG_FIELD_ARCH_VAL(1)
> @@ -1084,7 +1075,7 @@ IDREG_START(ID_AA64PFR1_EL1)
> IDREG_END(ID_AA64PFR1_EL1)
>
> IDREG_START(ID_AA64PFR2_EL1)
> - IDREG_FIELD(ID_AA64PFR2_EL1, RES0, 48, 16)
> + IDREG_FIELD(ID_AA64PFR2_EL1, RES0_48, 48, 16)
> IDREG_FIELD_START(ID_AA64PFR2_EL1, VMTETCL, 44, 4)
> IDREG_FIELD_ARCH_VAL(0)
> IDREG_FIELD_ARCH_VAL(1)
> @@ -1144,7 +1135,7 @@ IDREG_START(ID_AA64SMFR0_EL1)
> IDREG_FIELD_ARCH_VAL(0)
> IDREG_FIELD_ARCH_VAL(1)
> IDREG_FIELD_END(ID_AA64SMFR0_EL1, FA64)
> - IDREG_FIELD(ID_AA64SMFR0_EL1, RES0, 62, 1)
> + IDREG_FIELD(ID_AA64SMFR0_EL1, RES0_62, 62, 1)
> IDREG_FIELD_START(ID_AA64SMFR0_EL1, LUT6, 61, 1)
> IDREG_FIELD_ARCH_VAL(0)
> IDREG_FIELD_ARCH_VAL(1)
> @@ -1164,7 +1155,7 @@ IDREG_START(ID_AA64SMFR0_EL1)
> IDREG_FIELD_ARCH_VAL(0)
> IDREG_FIELD_ARCH_VAL(15)
> IDREG_FIELD_END(ID_AA64SMFR0_EL1, I16I64)
> - IDREG_FIELD(ID_AA64SMFR0_EL1, RES0, 49, 3)
> + IDREG_FIELD(ID_AA64SMFR0_EL1, RES0_49, 49, 3)
> IDREG_FIELD_START(ID_AA64SMFR0_EL1, F64F64, 48, 1)
> IDREG_FIELD_ARCH_VAL(0)
> IDREG_FIELD_ARCH_VAL(1)
> @@ -1209,7 +1200,7 @@ IDREG_START(ID_AA64SMFR0_EL1)
> IDREG_FIELD_ARCH_VAL(0)
> IDREG_FIELD_ARCH_VAL(1)
> IDREG_FIELD_END(ID_AA64SMFR0_EL1, F32F32)
> - IDREG_FIELD(ID_AA64SMFR0_EL1, RES0, 31, 1)
> + IDREG_FIELD(ID_AA64SMFR0_EL1, RES0_31, 31, 1)
> IDREG_FIELD_START(ID_AA64SMFR0_EL1, SF8FMA, 30, 1)
> IDREG_FIELD_ARCH_VAL(0)
> IDREG_FIELD_ARCH_VAL(1)
> @@ -1222,7 +1213,7 @@ IDREG_START(ID_AA64SMFR0_EL1)
> IDREG_FIELD_ARCH_VAL(0)
> IDREG_FIELD_ARCH_VAL(1)
> IDREG_FIELD_END(ID_AA64SMFR0_EL1, SF8DP2)
> - IDREG_FIELD(ID_AA64SMFR0_EL1, RES0, 26, 2)
> + IDREG_FIELD(ID_AA64SMFR0_EL1, RES0_26, 26, 2)
> IDREG_FIELD_START(ID_AA64SMFR0_EL1, SBitPerm, 25, 1)
> IDREG_FIELD_ARCH_VAL(0)
> IDREG_FIELD_ARCH_VAL(1)
> @@ -1235,12 +1226,12 @@ IDREG_START(ID_AA64SMFR0_EL1)
> IDREG_FIELD_ARCH_VAL(0)
> IDREG_FIELD_ARCH_VAL(1)
> IDREG_FIELD_END(ID_AA64SMFR0_EL1, SFEXPA)
> - IDREG_FIELD(ID_AA64SMFR0_EL1, RES0, 17, 6)
> + IDREG_FIELD(ID_AA64SMFR0_EL1, RES0_17, 17, 6)
> 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(ID_AA64SMFR0_EL1, RES0, 1, 15)
> + IDREG_FIELD(ID_AA64SMFR0_EL1, RES0_1, 1, 15)
> IDREG_FIELD_START(ID_AA64SMFR0_EL1, SMOP4, 0, 1)
> IDREG_FIELD_ARCH_VAL(0)
> IDREG_FIELD_ARCH_VAL(1)
> @@ -1248,7 +1239,7 @@ IDREG_START(ID_AA64SMFR0_EL1)
> IDREG_END(ID_AA64SMFR0_EL1)
>
> IDREG_START(ID_AA64ZFR0_EL1)
> - IDREG_FIELD(ID_AA64ZFR0_EL1, RES0, 60, 4)
> + IDREG_FIELD(ID_AA64ZFR0_EL1, RES0_60, 60, 4)
> IDREG_FIELD_START(ID_AA64ZFR0_EL1, F64MM, 56, 4)
> IDREG_FIELD_ARCH_VAL(0)
> IDREG_FIELD_ARCH_VAL(1)
> @@ -1269,12 +1260,12 @@ IDREG_START(ID_AA64ZFR0_EL1)
> IDREG_FIELD_ARCH_VAL(0)
> IDREG_FIELD_ARCH_VAL(1)
> IDREG_FIELD_END(ID_AA64ZFR0_EL1, SM4)
> - IDREG_FIELD(ID_AA64ZFR0_EL1, RES0, 36, 4)
> + IDREG_FIELD(ID_AA64ZFR0_EL1, RES0_36, 36, 4)
> 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(ID_AA64ZFR0_EL1, RES0, 28, 4)
> + IDREG_FIELD(ID_AA64ZFR0_EL1, RES0_28, 28, 4)
> IDREG_FIELD_START(ID_AA64ZFR0_EL1, B16B16, 24, 4)
> IDREG_FIELD_ARCH_VAL(0)
> IDREG_FIELD_ARCH_VAL(1)
> @@ -1294,7 +1285,7 @@ IDREG_START(ID_AA64ZFR0_EL1)
> IDREG_FIELD_ARCH_VAL(0)
> IDREG_FIELD_ARCH_VAL(1)
> IDREG_FIELD_END(ID_AA64ZFR0_EL1, EltPerm)
> - IDREG_FIELD(ID_AA64ZFR0_EL1, RES0, 8, 4)
> + IDREG_FIELD(ID_AA64ZFR0_EL1, RES0_8, 8, 4)
> IDREG_FIELD_START(ID_AA64ZFR0_EL1, AES, 4, 4)
> IDREG_FIELD_ARCH_VAL(0)
> IDREG_FIELD_ARCH_VAL(1)
> @@ -1311,11 +1302,11 @@ IDREG_START(ID_AA64ZFR0_EL1)
> IDREG_END(ID_AA64ZFR0_EL1)
>
> IDREG_START(ID_AFR0_EL1)
> - IDREG_FIELD(ID_AFR0_EL1, RES0, 0, 64)
> + IDREG_FIELD(ID_AFR0_EL1, RES0_0, 0, 64)
> IDREG_END(ID_AFR0_EL1)
>
> IDREG_START(ID_DFR0_EL1)
> - IDREG_FIELD(ID_DFR0_EL1, RES0, 32, 32)
> + IDREG_FIELD(ID_DFR0_EL1, RES0_32, 32, 32)
> IDREG_FIELD_START(ID_DFR0_EL1, TraceFilt, 28, 4)
> IDREG_FIELD_ARCH_VAL(0)
> IDREG_FIELD_ARCH_VAL(1)
> @@ -1367,7 +1358,7 @@ IDREG_START(ID_DFR0_EL1)
> IDREG_END(ID_DFR0_EL1)
>
> IDREG_START(ID_DFR1_EL1)
> - IDREG_FIELD(ID_DFR1_EL1, RES0, 8, 56)
> + IDREG_FIELD(ID_DFR1_EL1, RES0_8, 8, 56)
> IDREG_FIELD_START(ID_DFR1_EL1, HPMN0, 4, 4)
> IDREG_FIELD_ARCH_VAL(0)
> IDREG_FIELD_ARCH_VAL(1)
> @@ -1380,7 +1371,7 @@ IDREG_START(ID_DFR1_EL1)
> IDREG_END(ID_DFR1_EL1)
>
> IDREG_START(ID_ISAR0_EL1)
> - IDREG_FIELD(ID_ISAR0_EL1, RES0, 28, 36)
> + IDREG_FIELD(ID_ISAR0_EL1, RES0_28, 28, 36)
> IDREG_FIELD_START(ID_ISAR0_EL1, Divide, 24, 4)
> IDREG_FIELD_ARCH_VAL(0)
> IDREG_FIELD_ARCH_VAL(1)
> @@ -1416,7 +1407,7 @@ IDREG_START(ID_ISAR0_EL1)
> IDREG_END(ID_ISAR0_EL1)
>
> IDREG_START(ID_ISAR1_EL1)
> - IDREG_FIELD(ID_ISAR1_EL1, RES0, 32, 32)
> + IDREG_FIELD(ID_ISAR1_EL1, RES0_32, 32, 32)
> IDREG_FIELD_START(ID_ISAR1_EL1, Jazelle, 28, 4)
> IDREG_FIELD_ARCH_VAL(0)
> IDREG_FIELD_ARCH_VAL(1)
> @@ -1455,7 +1446,7 @@ IDREG_START(ID_ISAR1_EL1)
> IDREG_END(ID_ISAR1_EL1)
>
> IDREG_START(ID_ISAR2_EL1)
> - IDREG_FIELD(ID_ISAR2_EL1, RES0, 32, 32)
> + IDREG_FIELD(ID_ISAR2_EL1, RES0_32, 32, 32)
> IDREG_FIELD_START(ID_ISAR2_EL1, Reversal, 28, 4)
> IDREG_FIELD_ARCH_VAL(0)
> IDREG_FIELD_ARCH_VAL(1)
> @@ -1501,7 +1492,7 @@ IDREG_START(ID_ISAR2_EL1)
> IDREG_END(ID_ISAR2_EL1)
>
> IDREG_START(ID_ISAR3_EL1)
> - IDREG_FIELD(ID_ISAR3_EL1, RES0, 32, 32)
> + IDREG_FIELD(ID_ISAR3_EL1, RES0_32, 32, 32)
> IDREG_FIELD_START(ID_ISAR3_EL1, T32EE, 28, 4)
> IDREG_FIELD_ARCH_VAL(0)
> IDREG_FIELD_ARCH_VAL(1)
> @@ -1539,7 +1530,7 @@ IDREG_START(ID_ISAR3_EL1)
> IDREG_END(ID_ISAR3_EL1)
>
> IDREG_START(ID_ISAR4_EL1)
> - IDREG_FIELD(ID_ISAR4_EL1, RES0, 32, 32)
> + IDREG_FIELD(ID_ISAR4_EL1, RES0_32, 32, 32)
> IDREG_FIELD_START(ID_ISAR4_EL1, SWP_frac, 28, 4)
> IDREG_FIELD_ARCH_VAL(0)
> IDREG_FIELD_ARCH_VAL(1)
> @@ -1564,12 +1555,12 @@ IDREG_START(ID_ISAR4_EL1)
> IDREG_FIELD_ARCH_VAL(0)
> IDREG_FIELD_ARCH_VAL(1)
> IDREG_FIELD_END(ID_ISAR4_EL1, Writeback)
> - IDREG_FIELD_START(ID_ISAR4_EL1, WI, 4, 4)
> + IDREG_FIELD_START(ID_ISAR4_EL1, WI_4, 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, WI)
> + IDREG_FIELD_END(ID_ISAR4_EL1, WI_4)
> IDREG_FIELD_START(ID_ISAR4_EL1, Unpriv, 0, 4)
> IDREG_FIELD_ARCH_VAL(0)
> IDREG_FIELD_ARCH_VAL(1)
> @@ -1578,7 +1569,7 @@ IDREG_START(ID_ISAR4_EL1)
> IDREG_END(ID_ISAR4_EL1)
>
> IDREG_START(ID_ISAR5_EL1)
> - IDREG_FIELD(ID_ISAR5_EL1, RES0, 32, 32)
> + IDREG_FIELD(ID_ISAR5_EL1, RES0_32, 32, 32)
> IDREG_FIELD_START(ID_ISAR5_EL1, VCMA, 28, 4)
> IDREG_FIELD_ARCH_VAL(0)
> IDREG_FIELD_ARCH_VAL(1)
> @@ -1587,7 +1578,7 @@ IDREG_START(ID_ISAR5_EL1)
> IDREG_FIELD_ARCH_VAL(0)
> IDREG_FIELD_ARCH_VAL(1)
> IDREG_FIELD_END(ID_ISAR5_EL1, RDM)
> - IDREG_FIELD(ID_ISAR5_EL1, RES0, 20, 4)
> + IDREG_FIELD(ID_ISAR5_EL1, RES0_20, 20, 4)
> IDREG_FIELD_START(ID_ISAR5_EL1, CRC32, 16, 4)
> IDREG_FIELD_ARCH_VAL(0)
> IDREG_FIELD_ARCH_VAL(1)
> @@ -1612,7 +1603,7 @@ IDREG_START(ID_ISAR5_EL1)
> IDREG_END(ID_ISAR5_EL1)
>
> IDREG_START(ID_ISAR6_EL1)
> - IDREG_FIELD(ID_ISAR6_EL1, RES0, 32, 32)
> + IDREG_FIELD(ID_ISAR6_EL1, RES0_32, 32, 32)
> IDREG_FIELD_START(ID_ISAR6_EL1, CLRBHB, 28, 4)
> IDREG_FIELD_ARCH_VAL(0)
> IDREG_FIELD_ARCH_VAL(1)
> @@ -1649,7 +1640,7 @@ IDREG_START(ID_ISAR6_EL1)
> IDREG_END(ID_ISAR6_EL1)
>
> IDREG_START(ID_MMFR0_EL1)
> - IDREG_FIELD(ID_MMFR0_EL1, RES0, 32, 32)
> + IDREG_FIELD(ID_MMFR0_EL1, RES0_32, 32, 32)
> IDREG_FIELD_START(ID_MMFR0_EL1, InnerShr, 28, 4)
> IDREG_FIELD_ARCH_VAL(0)
> IDREG_FIELD_ARCH_VAL(1)
> @@ -1696,7 +1687,7 @@ IDREG_START(ID_MMFR0_EL1)
> IDREG_END(ID_MMFR0_EL1)
>
> IDREG_START(ID_MMFR1_EL1)
> - IDREG_FIELD(ID_MMFR1_EL1, RES0, 32, 32)
> + IDREG_FIELD(ID_MMFR1_EL1, RES0_32, 32, 32)
> IDREG_FIELD_START(ID_MMFR1_EL1, BPred, 28, 4)
> IDREG_FIELD_ARCH_VAL(0)
> IDREG_FIELD_ARCH_VAL(1)
> @@ -1745,7 +1736,7 @@ IDREG_START(ID_MMFR1_EL1)
> IDREG_END(ID_MMFR1_EL1)
>
> IDREG_START(ID_MMFR2_EL1)
> - IDREG_FIELD(ID_MMFR2_EL1, RES0, 32, 32)
> + IDREG_FIELD(ID_MMFR2_EL1, RES0_32, 32, 32)
> IDREG_FIELD_START(ID_MMFR2_EL1, HWAccFlg, 28, 4)
> IDREG_FIELD_ARCH_VAL(0)
> IDREG_FIELD_ARCH_VAL(1)
> @@ -1784,7 +1775,7 @@ IDREG_START(ID_MMFR2_EL1)
> IDREG_END(ID_MMFR2_EL1)
>
> IDREG_START(ID_MMFR3_EL1)
> - IDREG_FIELD(ID_MMFR3_EL1, RES0, 32, 32)
> + IDREG_FIELD(ID_MMFR3_EL1, RES0_32, 32, 32)
> IDREG_FIELD_START(ID_MMFR3_EL1, Supersec, 28, 4)
> IDREG_FIELD_ARCH_VAL(0)
> IDREG_FIELD_ARCH_VAL(15)
> @@ -1824,7 +1815,7 @@ IDREG_START(ID_MMFR3_EL1)
> IDREG_END(ID_MMFR3_EL1)
>
> IDREG_START(ID_MMFR4_EL1)
> - IDREG_FIELD(ID_MMFR4_EL1, RES0, 32, 32)
> + IDREG_FIELD(ID_MMFR4_EL1, RES0_32, 32, 32)
> IDREG_FIELD_START(ID_MMFR4_EL1, EVT, 28, 4)
> IDREG_FIELD_ARCH_VAL(0)
> IDREG_FIELD_ARCH_VAL(1)
> @@ -1862,7 +1853,7 @@ IDREG_START(ID_MMFR4_EL1)
> IDREG_END(ID_MMFR4_EL1)
>
> IDREG_START(ID_MMFR5_EL1)
> - IDREG_FIELD(ID_MMFR5_EL1, RES0, 8, 56)
> + IDREG_FIELD(ID_MMFR5_EL1, RES0_8, 8, 56)
> IDREG_FIELD_START(ID_MMFR5_EL1, nTLBPA, 4, 4)
> IDREG_FIELD_ARCH_VAL(0)
> IDREG_FIELD_ARCH_VAL(1)
> @@ -1876,7 +1867,7 @@ IDREG_START(ID_MMFR5_EL1)
> IDREG_END(ID_MMFR5_EL1)
>
> IDREG_START(ID_PFR0_EL1)
> - IDREG_FIELD(ID_PFR0_EL1, RES0, 32, 32)
> + IDREG_FIELD(ID_PFR0_EL1, RES0_32, 32, 32)
> IDREG_FIELD_START(ID_PFR0_EL1, RAS, 28, 4)
> IDREG_FIELD_ARCH_VAL(0)
> IDREG_FIELD_ARCH_VAL(1)
> @@ -1918,7 +1909,7 @@ IDREG_START(ID_PFR0_EL1)
> IDREG_END(ID_PFR0_EL1)
>
> IDREG_START(ID_PFR1_EL1)
> - IDREG_FIELD(ID_PFR1_EL1, RES0, 32, 32)
> + IDREG_FIELD(ID_PFR1_EL1, RES0_32, 32, 32)
> IDREG_FIELD_START(ID_PFR1_EL1, GIC, 28, 4)
> IDREG_FIELD_ARCH_VAL(0)
> IDREG_FIELD_ARCH_VAL(1)
> @@ -1958,7 +1949,7 @@ IDREG_START(ID_PFR1_EL1)
> IDREG_END(ID_PFR1_EL1)
>
> IDREG_START(ID_PFR2_EL1)
> - IDREG_FIELD(ID_PFR2_EL1, RES0, 12, 52)
> + IDREG_FIELD(ID_PFR2_EL1, RES0_12, 12, 52)
> IDREG_FIELD_START(ID_PFR2_EL1, RAS_frac, 8, 4)
> IDREG_FIELD_ARCH_VAL(0)
> IDREG_FIELD_ARCH_VAL(1)
> @@ -2006,14 +1997,14 @@ IDREG_START(MIDR_EL1)
> IDREG_END(MIDR_EL1)
>
> IDREG_START(MPIDR_EL1)
> - IDREG_FIELD(MPIDR_EL1, RES0, 40, 24)
> + IDREG_FIELD(MPIDR_EL1, RES0_40, 40, 24)
> IDREG_FIELD(MPIDR_EL1, Aff3, 32, 8)
> - IDREG_FIELD(MPIDR_EL1, RES1, 31, 1)
> + IDREG_FIELD(MPIDR_EL1, RES1_31, 31, 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(MPIDR_EL1, RES0, 25, 5)
> + IDREG_FIELD(MPIDR_EL1, RES0_25, 25, 5)
> IDREG_FIELD_START(MPIDR_EL1, MT, 24, 1)
> IDREG_FIELD_ARCH_VAL(0)
> IDREG_FIELD_ARCH_VAL(1)
> @@ -2024,7 +2015,7 @@ IDREG_START(MPIDR_EL1)
> IDREG_END(MPIDR_EL1)
>
> IDREG_START(MVFR0_EL1)
> - IDREG_FIELD(MVFR0_EL1, RES0, 32, 32)
> + IDREG_FIELD(MVFR0_EL1, RES0_32, 32, 32)
> IDREG_FIELD_START(MVFR0_EL1, FPRound, 28, 4)
> IDREG_FIELD_ARCH_VAL(0)
> IDREG_FIELD_ARCH_VAL(1)
> @@ -2063,7 +2054,7 @@ IDREG_START(MVFR0_EL1)
> IDREG_END(MVFR0_EL1)
>
> IDREG_START(MVFR1_EL1)
> - IDREG_FIELD(MVFR1_EL1, RES0, 32, 32)
> + IDREG_FIELD(MVFR1_EL1, RES0_32, 32, 32)
> IDREG_FIELD_START(MVFR1_EL1, SIMDFMAC, 28, 4)
> IDREG_FIELD_ARCH_VAL(0)
> IDREG_FIELD_ARCH_VAL(1)
> @@ -2102,7 +2093,7 @@ IDREG_START(MVFR1_EL1)
> IDREG_END(MVFR1_EL1)
>
> IDREG_START(MVFR2_EL1)
> - IDREG_FIELD(MVFR2_EL1, RES0, 8, 56)
> + IDREG_FIELD(MVFR2_EL1, RES0_8, 8, 56)
> IDREG_FIELD_START(MVFR2_EL1, FPMisc, 4, 4)
> IDREG_FIELD_ARCH_VAL(0)
> IDREG_FIELD_ARCH_VAL(1)
> @@ -2119,17 +2110,13 @@ IDREG_START(MVFR2_EL1)
> IDREG_END(MVFR2_EL1)
>
> IDREG_START(REVIDR_EL1)
> + IDREG_FIELD(REVIDR_EL1, VAL, 0, 64)
> IDREG_END(REVIDR_EL1)
>
> IDREG_START(SMIDR_EL1)
> - IDREG_FIELD(SMIDR_EL1, RES0, 60, 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, RES0_60, 60, 4)
> + IDREG_FIELD(SMIDR_EL1, NSMC, 56, 4)
> + IDREG_FIELD(SMIDR_EL1, HIP, 52, 4)
so this looks wrong to me. I fixed that in v7
> IDREG_FIELD(SMIDR_EL1, Affinity2, 32, 20)
> IDREG_FIELD_START(SMIDR_EL1, Implementer, 24, 8)
> IDREG_FIELD_ARCH_VAL(0)
> @@ -2158,7 +2145,7 @@ IDREG_START(SMIDR_EL1)
> IDREG_FIELD_ARCH_VAL(2)
> IDREG_FIELD_ARCH_VAL(3)
> IDREG_FIELD_END(SMIDR_EL1, SH)
> - IDREG_FIELD(SMIDR_EL1, RES0, 12, 1)
> + IDREG_FIELD(SMIDR_EL1, RES0_12, 12, 1)
> IDREG_FIELD(SMIDR_EL1, Affinity, 0, 12)
> IDREG_END(SMIDR_EL1)
>
