From 14962256b310efddf677ff4f5c9fa41047f48c39 Mon Sep 17 00:00:00 2001 From: Alex Coplan Date: Thu, 11 Jun 2020 12:34:37 +0100 Subject: [PATCH] [PATCH]: aarch64: Refactor representation of system registers Prior to this patch, the information describing the AArch64 system registers was separate from the information describing which system registers are available depending on the CPU feature set. Indeed, the latter was implemented as a separate function from the main table with the system register information. This patch remedies this situation and puts the feature information into the system register table itself. This has several advantages: * Having all the information described in one place is easier to maintain. * The logic to check whether a system register is supported now becomes trivial (and much more efficient). Since this patch ended up touching every line of the system register table, I took the opportunity to make the formatting more consistent and remove some redundant comments. Note that there is still more refactoring that could be done along the same lines here (e.g. with the TLB instructions) but this seemed like a reasonable first pass. Testing: * Regression tested an x64 -> aarch64-none-elf cross binutils. * Built aarch64-none-elf cross toolchain, checked newlib startup code still works. * Bootstrapped binutils on aarch64-linux-gnu, regression tested. * Built aarch64 kernel using new binutils with allyesconfig. OK for master? If so, I'll need a maintainer to commit on my behalf since I don't have write access. Thanks, Alex --- include/ChangeLog: 2020-06-11 Alex Coplan * opcode/aarch64.h (aarch64_sys_reg): Add required features to struct describing system registers. opcodes/ChangeLog: 2020-06-11 Alex Coplan * aarch64-opc.c (SYSREG): New macro for describing system registers. (SR_CORE): Likewise. (SR_FEAT): Likewise. (SR_RNG): Likewise. (SR_V8_1): Likewise. (SR_V8_2): Likewise. (SR_V8_3): Likewise. (SR_V8_4): Likewise. (SR_PAN): Likewise. (SR_RAS): Likewise. (SR_SSBS): Likewise. (SR_SVE): Likewise. (SR_ID_PFR2): Likewise. (SR_PROFILE): Likewise. (SR_MEMTAG): Likewise. (SR_SCXTNUM): Likewise. (aarch64_sys_regs): Refactor to store feature information in the table. (aarch64_sys_reg_supported_p): Collapse logic for system registers that now describe their own features. (aarch64_pstatefield_supported_p): Likewise. --- include/ChangeLog | 5 + include/opcode/aarch64.h | 4 + opcodes/ChangeLog | 23 + opcodes/aarch64-opc.c | 1071 ++++++++++++++++---------------------- 4 files changed, 480 insertions(+), 623 deletions(-) diff --git a/include/ChangeLog b/include/ChangeLog index 3c2765274d4..06426ce9b94 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,8 @@ +2020-06-11 Alex Coplan + + * opcode/aarch64.h (aarch64_sys_reg): Add required features to struct + describing system registers. + 2020-06-11 Alan Modra * elf/mips.h (Elf32_RegInfo): Use fixed width integer types. diff --git a/include/opcode/aarch64.h b/include/opcode/aarch64.h index 817ca1e674e..9a7448def7f 100644 --- a/include/opcode/aarch64.h +++ b/include/opcode/aarch64.h @@ -965,6 +965,10 @@ typedef struct const char * name; aarch64_insn value; uint32_t flags; + + /* A set of features, all of which are required for this system register to be + available. */ + aarch64_feature_set features; } aarch64_sys_reg; extern const aarch64_sys_reg aarch64_sys_regs []; diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 601aaf5e872..c4c0ab516c3 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,26 @@ +2020-06-11 Alex Coplan + + * aarch64-opc.c (SYSREG): New macro for describing system registers. + (SR_CORE): Likewise. + (SR_FEAT): Likewise. + (SR_RNG): Likewise. + (SR_V8_1): Likewise. + (SR_V8_2): Likewise. + (SR_V8_3): Likewise. + (SR_V8_4): Likewise. + (SR_PAN): Likewise. + (SR_RAS): Likewise. + (SR_SSBS): Likewise. + (SR_SVE): Likewise. + (SR_ID_PFR2): Likewise. + (SR_PROFILE): Likewise. + (SR_MEMTAG): Likewise. + (SR_SCXTNUM): Likewise. + (aarch64_sys_regs): Refactor to store feature information in the table. + (aarch64_sys_reg_supported_p): Collapse logic for system registers + that now describe their own features. + (aarch64_pstatefield_supported_p): Likewise. + 2020-06-09 H.J. Lu * i386-dis.c (prefix_table): Fix a typo in comments. diff --git a/opcodes/aarch64-opc.c b/opcodes/aarch64-opc.c index faa0503dcf0..148ffb7bde6 100644 --- a/opcodes/aarch64-opc.c +++ b/opcodes/aarch64-opc.c @@ -3802,417 +3802,446 @@ aarch64_print_operand (char *buf, size_t size, bfd_vma pc, #define C14 14 #define C15 15 +#define SYSREG(name, encoding, flags, features) \ + { name, encoding, flags, features } + +#define SR_CORE(n,e,f) SYSREG (n,e,f,0) + +#define SR_FEAT(n,e,f,feat) \ + SYSREG ((n), (e), (f) | F_ARCHEXT, AARCH64_FEATURE_##feat) + +#define SR_RNG(n,e,f) \ + SYSREG ((n), (e), (f) | F_ARCHEXT, AARCH64_FEATURE_RNG | AARCH64_FEATURE_V8_5) + +#define SR_V8_1(n,e,f) SR_FEAT (n,e,f,V8_1) +#define SR_V8_2(n,e,f) SR_FEAT (n,e,f,V8_2) +#define SR_V8_3(n,e,f) SR_FEAT (n,e,f,V8_3) +#define SR_V8_4(n,e,f) SR_FEAT (n,e,f,V8_4) +#define SR_V8_4(n,e,f) SR_FEAT (n,e,f,V8_4) +#define SR_PAN(n,e,f) SR_FEAT (n,e,f,PAN) +#define SR_RAS(n,e,f) SR_FEAT (n,e,f,RAS) +#define SR_SSBS(n,e,f) SR_FEAT (n,e,f,SSBS) +#define SR_SVE(n,e,f) SR_FEAT (n,e,f,SVE) +#define SR_ID_PFR2(n,e,f) SR_FEAT (n,e,f,ID_PFR2) +#define SR_PROFILE(n,e,f) SR_FEAT (n,e,f,PROFILE) +#define SR_MEMTAG(n,e,f) SR_FEAT (n,e,f,MEMTAG) +#define SR_SCXTNUM(n,e,f) SR_FEAT (n,e,f,SCXTNUM) + /* TODO there is one more issues need to be resolved - 1. handle cpu-implementation-defined system registers. */ + 1. handle cpu-implementation-defined system registers. + + Note that the F_REG_{READ,WRITE} flags mean read-only and write-only + respectively. If neither of these are set then the register is read-write. */ const aarch64_sys_reg aarch64_sys_regs [] = { - { "spsr_el1", CPEN_(0,C0,0), 0 }, /* = spsr_svc */ - { "spsr_el12", CPEN_ (5, C0, 0), F_ARCHEXT }, - { "elr_el1", CPEN_(0,C0,1), 0 }, - { "elr_el12", CPEN_ (5, C0, 1), F_ARCHEXT }, - { "sp_el0", CPEN_(0,C1,0), 0 }, - { "spsel", CPEN_(0,C2,0), 0 }, - { "daif", CPEN_(3,C2,1), 0 }, - { "currentel", CPEN_(0,C2,2), F_REG_READ }, /* RO */ - { "pan", CPEN_(0,C2,3), F_ARCHEXT }, - { "uao", CPEN_ (0, C2, 4), F_ARCHEXT }, - { "nzcv", CPEN_(3,C2,0), 0 }, - { "ssbs", CPEN_(3,C2,6), F_ARCHEXT }, - { "fpcr", CPEN_(3,C4,0), 0 }, - { "fpsr", CPEN_(3,C4,1), 0 }, - { "dspsr_el0", CPEN_(3,C5,0), 0 }, - { "dlr_el0", CPEN_(3,C5,1), 0 }, - { "spsr_el2", CPEN_(4,C0,0), 0 }, /* = spsr_hyp */ - { "elr_el2", CPEN_(4,C0,1), 0 }, - { "sp_el1", CPEN_(4,C1,0), 0 }, - { "spsr_irq", CPEN_(4,C3,0), 0 }, - { "spsr_abt", CPEN_(4,C3,1), 0 }, - { "spsr_und", CPEN_(4,C3,2), 0 }, - { "spsr_fiq", CPEN_(4,C3,3), 0 }, - { "spsr_el3", CPEN_(6,C0,0), 0 }, - { "elr_el3", CPEN_(6,C0,1), 0 }, - { "sp_el2", CPEN_(6,C1,0), 0 }, - { "spsr_svc", CPEN_(0,C0,0), F_DEPRECATED }, /* = spsr_el1 */ - { "spsr_hyp", CPEN_(4,C0,0), F_DEPRECATED }, /* = spsr_el2 */ - { "midr_el1", CPENC(3,0,C0,C0,0), F_REG_READ }, /* RO */ - { "ctr_el0", CPENC(3,3,C0,C0,1), F_REG_READ }, /* RO */ - { "mpidr_el1", CPENC(3,0,C0,C0,5), F_REG_READ }, /* RO */ - { "revidr_el1", CPENC(3,0,C0,C0,6), F_REG_READ }, /* RO */ - { "aidr_el1", CPENC(3,1,C0,C0,7), F_REG_READ }, /* RO */ - { "dczid_el0", CPENC(3,3,C0,C0,7), F_REG_READ }, /* RO */ - { "id_dfr0_el1", CPENC(3,0,C0,C1,2), F_REG_READ }, /* RO */ - { "id_pfr0_el1", CPENC(3,0,C0,C1,0), F_REG_READ }, /* RO */ - { "id_pfr1_el1", CPENC(3,0,C0,C1,1), F_REG_READ }, /* RO */ - { "id_pfr2_el1", CPENC(3,0,C0,C3,4), F_ARCHEXT | F_REG_READ}, /* RO */ - { "id_afr0_el1", CPENC(3,0,C0,C1,3), F_REG_READ }, /* RO */ - { "id_mmfr0_el1", CPENC(3,0,C0,C1,4), F_REG_READ }, /* RO */ - { "id_mmfr1_el1", CPENC(3,0,C0,C1,5), F_REG_READ }, /* RO */ - { "id_mmfr2_el1", CPENC(3,0,C0,C1,6), F_REG_READ }, /* RO */ - { "id_mmfr3_el1", CPENC(3,0,C0,C1,7), F_REG_READ }, /* RO */ - { "id_mmfr4_el1", CPENC(3,0,C0,C2,6), F_REG_READ }, /* RO */ - { "id_isar0_el1", CPENC(3,0,C0,C2,0), F_REG_READ }, /* RO */ - { "id_isar1_el1", CPENC(3,0,C0,C2,1), F_REG_READ }, /* RO */ - { "id_isar2_el1", CPENC(3,0,C0,C2,2), F_REG_READ }, /* RO */ - { "id_isar3_el1", CPENC(3,0,C0,C2,3), F_REG_READ }, /* RO */ - { "id_isar4_el1", CPENC(3,0,C0,C2,4), F_REG_READ }, /* RO */ - { "id_isar5_el1", CPENC(3,0,C0,C2,5), F_REG_READ }, /* RO */ - { "mvfr0_el1", CPENC(3,0,C0,C3,0), F_REG_READ }, /* RO */ - { "mvfr1_el1", CPENC(3,0,C0,C3,1), F_REG_READ }, /* RO */ - { "mvfr2_el1", CPENC(3,0,C0,C3,2), F_REG_READ }, /* RO */ - { "ccsidr_el1", CPENC(3,1,C0,C0,0), F_REG_READ }, /* RO */ - { "id_aa64pfr0_el1", CPENC(3,0,C0,C4,0), F_REG_READ }, /* RO */ - { "id_aa64pfr1_el1", CPENC(3,0,C0,C4,1), F_REG_READ }, /* RO */ - { "id_aa64dfr0_el1", CPENC(3,0,C0,C5,0), F_REG_READ }, /* RO */ - { "id_aa64dfr1_el1", CPENC(3,0,C0,C5,1), F_REG_READ }, /* RO */ - { "id_aa64isar0_el1", CPENC(3,0,C0,C6,0), F_REG_READ }, /* RO */ - { "id_aa64isar1_el1", CPENC(3,0,C0,C6,1), F_REG_READ }, /* RO */ - { "id_aa64mmfr0_el1", CPENC(3,0,C0,C7,0), F_REG_READ }, /* RO */ - { "id_aa64mmfr1_el1", CPENC(3,0,C0,C7,1), F_REG_READ }, /* RO */ - { "id_aa64mmfr2_el1", CPENC (3, 0, C0, C7, 2), F_ARCHEXT | F_REG_READ }, /* RO */ - { "id_aa64afr0_el1", CPENC(3,0,C0,C5,4), F_REG_READ }, /* RO */ - { "id_aa64afr1_el1", CPENC(3,0,C0,C5,5), F_REG_READ }, /* RO */ - { "id_aa64zfr0_el1", CPENC (3, 0, C0, C4, 4), F_ARCHEXT | F_REG_READ }, /* RO */ - { "clidr_el1", CPENC(3,1,C0,C0,1), F_REG_READ }, /* RO */ - { "csselr_el1", CPENC(3,2,C0,C0,0), 0 }, - { "vpidr_el2", CPENC(3,4,C0,C0,0), 0 }, - { "vmpidr_el2", CPENC(3,4,C0,C0,5), 0 }, - { "sctlr_el1", CPENC(3,0,C1,C0,0), 0 }, - { "sctlr_el2", CPENC(3,4,C1,C0,0), 0 }, - { "sctlr_el3", CPENC(3,6,C1,C0,0), 0 }, - { "sctlr_el12", CPENC (3, 5, C1, C0, 0), F_ARCHEXT }, - { "actlr_el1", CPENC(3,0,C1,C0,1), 0 }, - { "actlr_el2", CPENC(3,4,C1,C0,1), 0 }, - { "actlr_el3", CPENC(3,6,C1,C0,1), 0 }, - { "cpacr_el1", CPENC(3,0,C1,C0,2), 0 }, - { "cpacr_el12", CPENC (3, 5, C1, C0, 2), F_ARCHEXT }, - { "cptr_el2", CPENC(3,4,C1,C1,2), 0 }, - { "cptr_el3", CPENC(3,6,C1,C1,2), 0 }, - { "scr_el3", CPENC(3,6,C1,C1,0), 0 }, - { "hcr_el2", CPENC(3,4,C1,C1,0), 0 }, - { "mdcr_el2", CPENC(3,4,C1,C1,1), 0 }, - { "mdcr_el3", CPENC(3,6,C1,C3,1), 0 }, - { "hstr_el2", CPENC(3,4,C1,C1,3), 0 }, - { "hacr_el2", CPENC(3,4,C1,C1,7), 0 }, - { "zcr_el1", CPENC (3, 0, C1, C2, 0), F_ARCHEXT }, - { "zcr_el12", CPENC (3, 5, C1, C2, 0), F_ARCHEXT }, - { "zcr_el2", CPENC (3, 4, C1, C2, 0), F_ARCHEXT }, - { "zcr_el3", CPENC (3, 6, C1, C2, 0), F_ARCHEXT }, - { "zidr_el1", CPENC (3, 0, C0, C0, 7), F_ARCHEXT }, - { "ttbr0_el1", CPENC(3,0,C2,C0,0), 0 }, - { "ttbr1_el1", CPENC(3,0,C2,C0,1), 0 }, - { "ttbr0_el2", CPENC(3,4,C2,C0,0), 0 }, - { "ttbr1_el2", CPENC (3, 4, C2, C0, 1), F_ARCHEXT }, - { "ttbr0_el3", CPENC(3,6,C2,C0,0), 0 }, - { "ttbr0_el12", CPENC (3, 5, C2, C0, 0), F_ARCHEXT }, - { "ttbr1_el12", CPENC (3, 5, C2, C0, 1), F_ARCHEXT }, - { "vttbr_el2", CPENC(3,4,C2,C1,0), 0 }, - { "tcr_el1", CPENC(3,0,C2,C0,2), 0 }, - { "tcr_el2", CPENC(3,4,C2,C0,2), 0 }, - { "tcr_el3", CPENC(3,6,C2,C0,2), 0 }, - { "tcr_el12", CPENC (3, 5, C2, C0, 2), F_ARCHEXT }, - { "vtcr_el2", CPENC(3,4,C2,C1,2), 0 }, - { "apiakeylo_el1", CPENC (3, 0, C2, C1, 0), F_ARCHEXT }, - { "apiakeyhi_el1", CPENC (3, 0, C2, C1, 1), F_ARCHEXT }, - { "apibkeylo_el1", CPENC (3, 0, C2, C1, 2), F_ARCHEXT }, - { "apibkeyhi_el1", CPENC (3, 0, C2, C1, 3), F_ARCHEXT }, - { "apdakeylo_el1", CPENC (3, 0, C2, C2, 0), F_ARCHEXT }, - { "apdakeyhi_el1", CPENC (3, 0, C2, C2, 1), F_ARCHEXT }, - { "apdbkeylo_el1", CPENC (3, 0, C2, C2, 2), F_ARCHEXT }, - { "apdbkeyhi_el1", CPENC (3, 0, C2, C2, 3), F_ARCHEXT }, - { "apgakeylo_el1", CPENC (3, 0, C2, C3, 0), F_ARCHEXT }, - { "apgakeyhi_el1", CPENC (3, 0, C2, C3, 1), F_ARCHEXT }, - { "afsr0_el1", CPENC(3,0,C5,C1,0), 0 }, - { "afsr1_el1", CPENC(3,0,C5,C1,1), 0 }, - { "afsr0_el2", CPENC(3,4,C5,C1,0), 0 }, - { "afsr1_el2", CPENC(3,4,C5,C1,1), 0 }, - { "afsr0_el3", CPENC(3,6,C5,C1,0), 0 }, - { "afsr0_el12", CPENC (3, 5, C5, C1, 0), F_ARCHEXT }, - { "afsr1_el3", CPENC(3,6,C5,C1,1), 0 }, - { "afsr1_el12", CPENC (3, 5, C5, C1, 1), F_ARCHEXT }, - { "esr_el1", CPENC(3,0,C5,C2,0), 0 }, - { "esr_el2", CPENC(3,4,C5,C2,0), 0 }, - { "esr_el3", CPENC(3,6,C5,C2,0), 0 }, - { "esr_el12", CPENC (3, 5, C5, C2, 0), F_ARCHEXT }, - { "vsesr_el2", CPENC (3, 4, C5, C2, 3), F_ARCHEXT }, - { "fpexc32_el2", CPENC(3,4,C5,C3,0), 0 }, - { "erridr_el1", CPENC (3, 0, C5, C3, 0), F_ARCHEXT | F_REG_READ }, /* RO */ - { "errselr_el1", CPENC (3, 0, C5, C3, 1), F_ARCHEXT }, - { "erxfr_el1", CPENC (3, 0, C5, C4, 0), F_ARCHEXT | F_REG_READ }, /* RO */ - { "erxctlr_el1", CPENC (3, 0, C5, C4, 1), F_ARCHEXT }, - { "erxstatus_el1", CPENC (3, 0, C5, C4, 2), F_ARCHEXT }, - { "erxaddr_el1", CPENC (3, 0, C5, C4, 3), F_ARCHEXT }, - { "erxmisc0_el1", CPENC (3, 0, C5, C5, 0), F_ARCHEXT }, - { "erxmisc1_el1", CPENC (3, 0, C5, C5, 1), F_ARCHEXT }, - { "far_el1", CPENC(3,0,C6,C0,0), 0 }, - { "far_el2", CPENC(3,4,C6,C0,0), 0 }, - { "far_el3", CPENC(3,6,C6,C0,0), 0 }, - { "far_el12", CPENC (3, 5, C6, C0, 0), F_ARCHEXT }, - { "hpfar_el2", CPENC(3,4,C6,C0,4), 0 }, - { "par_el1", CPENC(3,0,C7,C4,0), 0 }, - { "mair_el1", CPENC(3,0,C10,C2,0), 0 }, - { "mair_el2", CPENC(3,4,C10,C2,0), 0 }, - { "mair_el3", CPENC(3,6,C10,C2,0), 0 }, - { "mair_el12", CPENC (3, 5, C10, C2, 0), F_ARCHEXT }, - { "amair_el1", CPENC(3,0,C10,C3,0), 0 }, - { "amair_el2", CPENC(3,4,C10,C3,0), 0 }, - { "amair_el3", CPENC(3,6,C10,C3,0), 0 }, - { "amair_el12", CPENC (3, 5, C10, C3, 0), F_ARCHEXT }, - { "vbar_el1", CPENC(3,0,C12,C0,0), 0 }, - { "vbar_el2", CPENC(3,4,C12,C0,0), 0 }, - { "vbar_el3", CPENC(3,6,C12,C0,0), 0 }, - { "vbar_el12", CPENC (3, 5, C12, C0, 0), F_ARCHEXT }, - { "rvbar_el1", CPENC(3,0,C12,C0,1), F_REG_READ }, /* RO */ - { "rvbar_el2", CPENC(3,4,C12,C0,1), F_REG_READ }, /* RO */ - { "rvbar_el3", CPENC(3,6,C12,C0,1), F_REG_READ }, /* RO */ - { "rmr_el1", CPENC(3,0,C12,C0,2), 0 }, - { "rmr_el2", CPENC(3,4,C12,C0,2), 0 }, - { "rmr_el3", CPENC(3,6,C12,C0,2), 0 }, - { "isr_el1", CPENC(3,0,C12,C1,0), F_REG_READ }, /* RO */ - { "disr_el1", CPENC (3, 0, C12, C1, 1), F_ARCHEXT }, - { "vdisr_el2", CPENC (3, 4, C12, C1, 1), F_ARCHEXT }, - { "contextidr_el1", CPENC(3,0,C13,C0,1), 0 }, - { "contextidr_el2", CPENC (3, 4, C13, C0, 1), F_ARCHEXT }, - { "contextidr_el12", CPENC (3, 5, C13, C0, 1), F_ARCHEXT }, - { "rndr", CPENC(3,3,C2,C4,0), F_ARCHEXT | F_REG_READ }, /* RO */ - { "rndrrs", CPENC(3,3,C2,C4,1), F_ARCHEXT | F_REG_READ }, /* RO */ - { "tco", CPENC(3,3,C4,C2,7), F_ARCHEXT }, - { "tfsre0_el1", CPENC(3,0,C5,C6,1), F_ARCHEXT }, - { "tfsr_el1", CPENC(3,0,C5,C6,0), F_ARCHEXT }, - { "tfsr_el2", CPENC(3,4,C5,C6,0), F_ARCHEXT }, - { "tfsr_el3", CPENC(3,6,C5,C6,0), F_ARCHEXT }, - { "tfsr_el12", CPENC(3,5,C5,C6,0), F_ARCHEXT }, - { "rgsr_el1", CPENC(3,0,C1,C0,5), F_ARCHEXT }, - { "gcr_el1", CPENC(3,0,C1,C0,6), F_ARCHEXT }, - { "gmid_el1", CPENC(3,1,C0,C0,4), F_ARCHEXT | F_REG_READ }, /* RO */ - { "tpidr_el0", CPENC(3,3,C13,C0,2), 0 }, - { "tpidrro_el0", CPENC(3,3,C13,C0,3), 0 }, /* RW */ - { "tpidr_el1", CPENC(3,0,C13,C0,4), 0 }, - { "tpidr_el2", CPENC(3,4,C13,C0,2), 0 }, - { "tpidr_el3", CPENC(3,6,C13,C0,2), 0 }, - { "scxtnum_el0", CPENC(3,3,C13,C0,7), F_ARCHEXT }, - { "scxtnum_el1", CPENC(3,0,C13,C0,7), F_ARCHEXT }, - { "scxtnum_el2", CPENC(3,4,C13,C0,7), F_ARCHEXT }, - { "scxtnum_el12", CPENC(3,5,C13,C0,7), F_ARCHEXT }, - { "scxtnum_el3", CPENC(3,6,C13,C0,7), F_ARCHEXT }, - { "teecr32_el1", CPENC(2,2,C0, C0,0), 0 }, /* See section 3.9.7.1 */ - { "cntfrq_el0", CPENC(3,3,C14,C0,0), 0 }, /* RW */ - { "cntpct_el0", CPENC(3,3,C14,C0,1), F_REG_READ }, /* RO */ - { "cntvct_el0", CPENC(3,3,C14,C0,2), F_REG_READ }, /* RO */ - { "cntvoff_el2", CPENC(3,4,C14,C0,3), 0 }, - { "cntkctl_el1", CPENC(3,0,C14,C1,0), 0 }, - { "cntkctl_el12", CPENC (3, 5, C14, C1, 0), F_ARCHEXT }, - { "cnthctl_el2", CPENC(3,4,C14,C1,0), 0 }, - { "cntp_tval_el0", CPENC(3,3,C14,C2,0), 0 }, - { "cntp_tval_el02", CPENC (3, 5, C14, C2, 0), F_ARCHEXT }, - { "cntp_ctl_el0", CPENC(3,3,C14,C2,1), 0 }, - { "cntp_ctl_el02", CPENC (3, 5, C14, C2, 1), F_ARCHEXT }, - { "cntp_cval_el0", CPENC(3,3,C14,C2,2), 0 }, - { "cntp_cval_el02", CPENC (3, 5, C14, C2, 2), F_ARCHEXT }, - { "cntv_tval_el0", CPENC(3,3,C14,C3,0), 0 }, - { "cntv_tval_el02", CPENC (3, 5, C14, C3, 0), F_ARCHEXT }, - { "cntv_ctl_el0", CPENC(3,3,C14,C3,1), 0 }, - { "cntv_ctl_el02", CPENC (3, 5, C14, C3, 1), F_ARCHEXT }, - { "cntv_cval_el0", CPENC(3,3,C14,C3,2), 0 }, - { "cntv_cval_el02", CPENC (3, 5, C14, C3, 2), F_ARCHEXT }, - { "cnthp_tval_el2", CPENC(3,4,C14,C2,0), 0 }, - { "cnthp_ctl_el2", CPENC(3,4,C14,C2,1), 0 }, - { "cnthp_cval_el2", CPENC(3,4,C14,C2,2), 0 }, - { "cntps_tval_el1", CPENC(3,7,C14,C2,0), 0 }, - { "cntps_ctl_el1", CPENC(3,7,C14,C2,1), 0 }, - { "cntps_cval_el1", CPENC(3,7,C14,C2,2), 0 }, - { "cnthv_tval_el2", CPENC (3, 4, C14, C3, 0), F_ARCHEXT }, - { "cnthv_ctl_el2", CPENC (3, 4, C14, C3, 1), F_ARCHEXT }, - { "cnthv_cval_el2", CPENC (3, 4, C14, C3, 2), F_ARCHEXT }, - { "dacr32_el2", CPENC(3,4,C3,C0,0), 0 }, - { "ifsr32_el2", CPENC(3,4,C5,C0,1), 0 }, - { "teehbr32_el1", CPENC(2,2,C1,C0,0), 0 }, - { "sder32_el3", CPENC(3,6,C1,C1,1), 0 }, - { "mdscr_el1", CPENC(2,0,C0, C2, 2), 0 }, - { "mdccsr_el0", CPENC(2,3,C0, C1, 0), F_REG_READ }, /* r */ - { "mdccint_el1", CPENC(2,0,C0, C2, 0), 0 }, - { "dbgdtr_el0", CPENC(2,3,C0, C4, 0), 0 }, - { "dbgdtrrx_el0", CPENC(2,3,C0, C5, 0), F_REG_READ }, /* r */ - { "dbgdtrtx_el0", CPENC(2,3,C0, C5, 0), F_REG_WRITE }, /* w */ - { "osdtrrx_el1", CPENC(2,0,C0, C0, 2), 0 }, - { "osdtrtx_el1", CPENC(2,0,C0, C3, 2), 0 }, - { "oseccr_el1", CPENC(2,0,C0, C6, 2), 0 }, - { "dbgvcr32_el2", CPENC(2,4,C0, C7, 0), 0 }, - { "dbgbvr0_el1", CPENC(2,0,C0, C0, 4), 0 }, - { "dbgbvr1_el1", CPENC(2,0,C0, C1, 4), 0 }, - { "dbgbvr2_el1", CPENC(2,0,C0, C2, 4), 0 }, - { "dbgbvr3_el1", CPENC(2,0,C0, C3, 4), 0 }, - { "dbgbvr4_el1", CPENC(2,0,C0, C4, 4), 0 }, - { "dbgbvr5_el1", CPENC(2,0,C0, C5, 4), 0 }, - { "dbgbvr6_el1", CPENC(2,0,C0, C6, 4), 0 }, - { "dbgbvr7_el1", CPENC(2,0,C0, C7, 4), 0 }, - { "dbgbvr8_el1", CPENC(2,0,C0, C8, 4), 0 }, - { "dbgbvr9_el1", CPENC(2,0,C0, C9, 4), 0 }, - { "dbgbvr10_el1", CPENC(2,0,C0, C10,4), 0 }, - { "dbgbvr11_el1", CPENC(2,0,C0, C11,4), 0 }, - { "dbgbvr12_el1", CPENC(2,0,C0, C12,4), 0 }, - { "dbgbvr13_el1", CPENC(2,0,C0, C13,4), 0 }, - { "dbgbvr14_el1", CPENC(2,0,C0, C14,4), 0 }, - { "dbgbvr15_el1", CPENC(2,0,C0, C15,4), 0 }, - { "dbgbcr0_el1", CPENC(2,0,C0, C0, 5), 0 }, - { "dbgbcr1_el1", CPENC(2,0,C0, C1, 5), 0 }, - { "dbgbcr2_el1", CPENC(2,0,C0, C2, 5), 0 }, - { "dbgbcr3_el1", CPENC(2,0,C0, C3, 5), 0 }, - { "dbgbcr4_el1", CPENC(2,0,C0, C4, 5), 0 }, - { "dbgbcr5_el1", CPENC(2,0,C0, C5, 5), 0 }, - { "dbgbcr6_el1", CPENC(2,0,C0, C6, 5), 0 }, - { "dbgbcr7_el1", CPENC(2,0,C0, C7, 5), 0 }, - { "dbgbcr8_el1", CPENC(2,0,C0, C8, 5), 0 }, - { "dbgbcr9_el1", CPENC(2,0,C0, C9, 5), 0 }, - { "dbgbcr10_el1", CPENC(2,0,C0, C10,5), 0 }, - { "dbgbcr11_el1", CPENC(2,0,C0, C11,5), 0 }, - { "dbgbcr12_el1", CPENC(2,0,C0, C12,5), 0 }, - { "dbgbcr13_el1", CPENC(2,0,C0, C13,5), 0 }, - { "dbgbcr14_el1", CPENC(2,0,C0, C14,5), 0 }, - { "dbgbcr15_el1", CPENC(2,0,C0, C15,5), 0 }, - { "dbgwvr0_el1", CPENC(2,0,C0, C0, 6), 0 }, - { "dbgwvr1_el1", CPENC(2,0,C0, C1, 6), 0 }, - { "dbgwvr2_el1", CPENC(2,0,C0, C2, 6), 0 }, - { "dbgwvr3_el1", CPENC(2,0,C0, C3, 6), 0 }, - { "dbgwvr4_el1", CPENC(2,0,C0, C4, 6), 0 }, - { "dbgwvr5_el1", CPENC(2,0,C0, C5, 6), 0 }, - { "dbgwvr6_el1", CPENC(2,0,C0, C6, 6), 0 }, - { "dbgwvr7_el1", CPENC(2,0,C0, C7, 6), 0 }, - { "dbgwvr8_el1", CPENC(2,0,C0, C8, 6), 0 }, - { "dbgwvr9_el1", CPENC(2,0,C0, C9, 6), 0 }, - { "dbgwvr10_el1", CPENC(2,0,C0, C10,6), 0 }, - { "dbgwvr11_el1", CPENC(2,0,C0, C11,6), 0 }, - { "dbgwvr12_el1", CPENC(2,0,C0, C12,6), 0 }, - { "dbgwvr13_el1", CPENC(2,0,C0, C13,6), 0 }, - { "dbgwvr14_el1", CPENC(2,0,C0, C14,6), 0 }, - { "dbgwvr15_el1", CPENC(2,0,C0, C15,6), 0 }, - { "dbgwcr0_el1", CPENC(2,0,C0, C0, 7), 0 }, - { "dbgwcr1_el1", CPENC(2,0,C0, C1, 7), 0 }, - { "dbgwcr2_el1", CPENC(2,0,C0, C2, 7), 0 }, - { "dbgwcr3_el1", CPENC(2,0,C0, C3, 7), 0 }, - { "dbgwcr4_el1", CPENC(2,0,C0, C4, 7), 0 }, - { "dbgwcr5_el1", CPENC(2,0,C0, C5, 7), 0 }, - { "dbgwcr6_el1", CPENC(2,0,C0, C6, 7), 0 }, - { "dbgwcr7_el1", CPENC(2,0,C0, C7, 7), 0 }, - { "dbgwcr8_el1", CPENC(2,0,C0, C8, 7), 0 }, - { "dbgwcr9_el1", CPENC(2,0,C0, C9, 7), 0 }, - { "dbgwcr10_el1", CPENC(2,0,C0, C10,7), 0 }, - { "dbgwcr11_el1", CPENC(2,0,C0, C11,7), 0 }, - { "dbgwcr12_el1", CPENC(2,0,C0, C12,7), 0 }, - { "dbgwcr13_el1", CPENC(2,0,C0, C13,7), 0 }, - { "dbgwcr14_el1", CPENC(2,0,C0, C14,7), 0 }, - { "dbgwcr15_el1", CPENC(2,0,C0, C15,7), 0 }, - { "mdrar_el1", CPENC(2,0,C1, C0, 0), F_REG_READ }, /* r */ - { "oslar_el1", CPENC(2,0,C1, C0, 4), F_REG_WRITE }, /* w */ - { "oslsr_el1", CPENC(2,0,C1, C1, 4), F_REG_READ }, /* r */ - { "osdlr_el1", CPENC(2,0,C1, C3, 4), 0 }, - { "dbgprcr_el1", CPENC(2,0,C1, C4, 4), 0 }, - { "dbgclaimset_el1", CPENC(2,0,C7, C8, 6), 0 }, - { "dbgclaimclr_el1", CPENC(2,0,C7, C9, 6), 0 }, - { "dbgauthstatus_el1", CPENC(2,0,C7, C14,6), F_REG_READ }, /* r */ - { "pmblimitr_el1", CPENC (3, 0, C9, C10, 0), F_ARCHEXT }, /* rw */ - { "pmbptr_el1", CPENC (3, 0, C9, C10, 1), F_ARCHEXT }, /* rw */ - { "pmbsr_el1", CPENC (3, 0, C9, C10, 3), F_ARCHEXT }, /* rw */ - { "pmbidr_el1", CPENC (3, 0, C9, C10, 7), F_ARCHEXT | F_REG_READ }, /* ro */ - { "pmscr_el1", CPENC (3, 0, C9, C9, 0), F_ARCHEXT }, /* rw */ - { "pmsicr_el1", CPENC (3, 0, C9, C9, 2), F_ARCHEXT }, /* rw */ - { "pmsirr_el1", CPENC (3, 0, C9, C9, 3), F_ARCHEXT }, /* rw */ - { "pmsfcr_el1", CPENC (3, 0, C9, C9, 4), F_ARCHEXT }, /* rw */ - { "pmsevfr_el1", CPENC (3, 0, C9, C9, 5), F_ARCHEXT }, /* rw */ - { "pmslatfr_el1", CPENC (3, 0, C9, C9, 6), F_ARCHEXT }, /* rw */ - { "pmsidr_el1", CPENC (3, 0, C9, C9, 7), F_ARCHEXT }, /* rw */ - { "pmscr_el2", CPENC (3, 4, C9, C9, 0), F_ARCHEXT }, /* rw */ - { "pmscr_el12", CPENC (3, 5, C9, C9, 0), F_ARCHEXT }, /* rw */ - { "pmcr_el0", CPENC(3,3,C9,C12, 0), 0 }, - { "pmcntenset_el0", CPENC(3,3,C9,C12, 1), 0 }, - { "pmcntenclr_el0", CPENC(3,3,C9,C12, 2), 0 }, - { "pmovsclr_el0", CPENC(3,3,C9,C12, 3), 0 }, - { "pmswinc_el0", CPENC(3,3,C9,C12, 4), F_REG_WRITE }, /* w */ - { "pmselr_el0", CPENC(3,3,C9,C12, 5), 0 }, - { "pmceid0_el0", CPENC(3,3,C9,C12, 6), F_REG_READ }, /* r */ - { "pmceid1_el0", CPENC(3,3,C9,C12, 7), F_REG_READ }, /* r */ - { "pmccntr_el0", CPENC(3,3,C9,C13, 0), 0 }, - { "pmxevtyper_el0", CPENC(3,3,C9,C13, 1), 0 }, - { "pmxevcntr_el0", CPENC(3,3,C9,C13, 2), 0 }, - { "pmuserenr_el0", CPENC(3,3,C9,C14, 0), 0 }, - { "pmintenset_el1", CPENC(3,0,C9,C14, 1), 0 }, - { "pmintenclr_el1", CPENC(3,0,C9,C14, 2), 0 }, - { "pmovsset_el0", CPENC(3,3,C9,C14, 3), 0 }, - { "pmevcntr0_el0", CPENC(3,3,C14,C8, 0), 0 }, - { "pmevcntr1_el0", CPENC(3,3,C14,C8, 1), 0 }, - { "pmevcntr2_el0", CPENC(3,3,C14,C8, 2), 0 }, - { "pmevcntr3_el0", CPENC(3,3,C14,C8, 3), 0 }, - { "pmevcntr4_el0", CPENC(3,3,C14,C8, 4), 0 }, - { "pmevcntr5_el0", CPENC(3,3,C14,C8, 5), 0 }, - { "pmevcntr6_el0", CPENC(3,3,C14,C8, 6), 0 }, - { "pmevcntr7_el0", CPENC(3,3,C14,C8, 7), 0 }, - { "pmevcntr8_el0", CPENC(3,3,C14,C9, 0), 0 }, - { "pmevcntr9_el0", CPENC(3,3,C14,C9, 1), 0 }, - { "pmevcntr10_el0", CPENC(3,3,C14,C9, 2), 0 }, - { "pmevcntr11_el0", CPENC(3,3,C14,C9, 3), 0 }, - { "pmevcntr12_el0", CPENC(3,3,C14,C9, 4), 0 }, - { "pmevcntr13_el0", CPENC(3,3,C14,C9, 5), 0 }, - { "pmevcntr14_el0", CPENC(3,3,C14,C9, 6), 0 }, - { "pmevcntr15_el0", CPENC(3,3,C14,C9, 7), 0 }, - { "pmevcntr16_el0", CPENC(3,3,C14,C10,0), 0 }, - { "pmevcntr17_el0", CPENC(3,3,C14,C10,1), 0 }, - { "pmevcntr18_el0", CPENC(3,3,C14,C10,2), 0 }, - { "pmevcntr19_el0", CPENC(3,3,C14,C10,3), 0 }, - { "pmevcntr20_el0", CPENC(3,3,C14,C10,4), 0 }, - { "pmevcntr21_el0", CPENC(3,3,C14,C10,5), 0 }, - { "pmevcntr22_el0", CPENC(3,3,C14,C10,6), 0 }, - { "pmevcntr23_el0", CPENC(3,3,C14,C10,7), 0 }, - { "pmevcntr24_el0", CPENC(3,3,C14,C11,0), 0 }, - { "pmevcntr25_el0", CPENC(3,3,C14,C11,1), 0 }, - { "pmevcntr26_el0", CPENC(3,3,C14,C11,2), 0 }, - { "pmevcntr27_el0", CPENC(3,3,C14,C11,3), 0 }, - { "pmevcntr28_el0", CPENC(3,3,C14,C11,4), 0 }, - { "pmevcntr29_el0", CPENC(3,3,C14,C11,5), 0 }, - { "pmevcntr30_el0", CPENC(3,3,C14,C11,6), 0 }, - { "pmevtyper0_el0", CPENC(3,3,C14,C12,0), 0 }, - { "pmevtyper1_el0", CPENC(3,3,C14,C12,1), 0 }, - { "pmevtyper2_el0", CPENC(3,3,C14,C12,2), 0 }, - { "pmevtyper3_el0", CPENC(3,3,C14,C12,3), 0 }, - { "pmevtyper4_el0", CPENC(3,3,C14,C12,4), 0 }, - { "pmevtyper5_el0", CPENC(3,3,C14,C12,5), 0 }, - { "pmevtyper6_el0", CPENC(3,3,C14,C12,6), 0 }, - { "pmevtyper7_el0", CPENC(3,3,C14,C12,7), 0 }, - { "pmevtyper8_el0", CPENC(3,3,C14,C13,0), 0 }, - { "pmevtyper9_el0", CPENC(3,3,C14,C13,1), 0 }, - { "pmevtyper10_el0", CPENC(3,3,C14,C13,2), 0 }, - { "pmevtyper11_el0", CPENC(3,3,C14,C13,3), 0 }, - { "pmevtyper12_el0", CPENC(3,3,C14,C13,4), 0 }, - { "pmevtyper13_el0", CPENC(3,3,C14,C13,5), 0 }, - { "pmevtyper14_el0", CPENC(3,3,C14,C13,6), 0 }, - { "pmevtyper15_el0", CPENC(3,3,C14,C13,7), 0 }, - { "pmevtyper16_el0", CPENC(3,3,C14,C14,0), 0 }, - { "pmevtyper17_el0", CPENC(3,3,C14,C14,1), 0 }, - { "pmevtyper18_el0", CPENC(3,3,C14,C14,2), 0 }, - { "pmevtyper19_el0", CPENC(3,3,C14,C14,3), 0 }, - { "pmevtyper20_el0", CPENC(3,3,C14,C14,4), 0 }, - { "pmevtyper21_el0", CPENC(3,3,C14,C14,5), 0 }, - { "pmevtyper22_el0", CPENC(3,3,C14,C14,6), 0 }, - { "pmevtyper23_el0", CPENC(3,3,C14,C14,7), 0 }, - { "pmevtyper24_el0", CPENC(3,3,C14,C15,0), 0 }, - { "pmevtyper25_el0", CPENC(3,3,C14,C15,1), 0 }, - { "pmevtyper26_el0", CPENC(3,3,C14,C15,2), 0 }, - { "pmevtyper27_el0", CPENC(3,3,C14,C15,3), 0 }, - { "pmevtyper28_el0", CPENC(3,3,C14,C15,4), 0 }, - { "pmevtyper29_el0", CPENC(3,3,C14,C15,5), 0 }, - { "pmevtyper30_el0", CPENC(3,3,C14,C15,6), 0 }, - { "pmccfiltr_el0", CPENC(3,3,C14,C15,7), 0 }, - - { "dit", CPEN_ (3, C2, 5), F_ARCHEXT }, - { "vstcr_el2", CPENC(3, 4, C2, C6, 2), F_ARCHEXT }, - { "vsttbr_el2", CPENC(3, 4, C2, C6, 0), F_ARCHEXT }, - { "cnthvs_tval_el2", CPENC(3, 4, C14, C4, 0), F_ARCHEXT }, - { "cnthvs_cval_el2", CPENC(3, 4, C14, C4, 2), F_ARCHEXT }, - { "cnthvs_ctl_el2", CPENC(3, 4, C14, C4, 1), F_ARCHEXT }, - { "cnthps_tval_el2", CPENC(3, 4, C14, C5, 0), F_ARCHEXT }, - { "cnthps_cval_el2", CPENC(3, 4, C14, C5, 2), F_ARCHEXT }, - { "cnthps_ctl_el2", CPENC(3, 4, C14, C5, 1), F_ARCHEXT }, - { "sder32_el2", CPENC(3, 4, C1, C3, 1), F_ARCHEXT }, - { "vncr_el2", CPENC(3, 4, C2, C2, 0), F_ARCHEXT }, - { 0, CPENC(0,0,0,0,0), 0 }, + SR_CORE ("spsr_el1", CPEN_ (0,C0,0), 0), /* = spsr_svc. */ + SR_V8_1 ("spsr_el12", CPEN_ (5,C0,0), 0), + SR_CORE ("elr_el1", CPEN_ (0,C0,1), 0), + SR_V8_1 ("elr_el12", CPEN_ (5,C0,1), 0), + SR_CORE ("sp_el0", CPEN_ (0,C1,0), 0), + SR_CORE ("spsel", CPEN_ (0,C2,0), 0), + SR_CORE ("daif", CPEN_ (3,C2,1), 0), + SR_CORE ("currentel", CPEN_ (0,C2,2), F_REG_READ), + SR_PAN ("pan", CPEN_ (0,C2,3), 0), + SR_V8_2 ("uao", CPEN_ (0,C2,4), 0), + SR_CORE ("nzcv", CPEN_ (3,C2,0), 0), + SR_SSBS ("ssbs", CPEN_ (3,C2,6), 0), + SR_CORE ("fpcr", CPEN_ (3,C4,0), 0), + SR_CORE ("fpsr", CPEN_ (3,C4,1), 0), + SR_CORE ("dspsr_el0", CPEN_ (3,C5,0), 0), + SR_CORE ("dlr_el0", CPEN_ (3,C5,1), 0), + SR_CORE ("spsr_el2", CPEN_ (4,C0,0), 0), /* = spsr_hyp. */ + SR_CORE ("elr_el2", CPEN_ (4,C0,1), 0), + SR_CORE ("sp_el1", CPEN_ (4,C1,0), 0), + SR_CORE ("spsr_irq", CPEN_ (4,C3,0), 0), + SR_CORE ("spsr_abt", CPEN_ (4,C3,1), 0), + SR_CORE ("spsr_und", CPEN_ (4,C3,2), 0), + SR_CORE ("spsr_fiq", CPEN_ (4,C3,3), 0), + SR_CORE ("spsr_el3", CPEN_ (6,C0,0), 0), + SR_CORE ("elr_el3", CPEN_ (6,C0,1), 0), + SR_CORE ("sp_el2", CPEN_ (6,C1,0), 0), + SR_CORE ("spsr_svc", CPEN_ (0,C0,0), F_DEPRECATED), /* = spsr_el1. */ + SR_CORE ("spsr_hyp", CPEN_ (4,C0,0), F_DEPRECATED), /* = spsr_el2. */ + SR_CORE ("midr_el1", CPENC (3,0,C0,C0,0), F_REG_READ), + SR_CORE ("ctr_el0", CPENC (3,3,C0,C0,1), F_REG_READ), + SR_CORE ("mpidr_el1", CPENC (3,0,C0,C0,5), F_REG_READ), + SR_CORE ("revidr_el1", CPENC (3,0,C0,C0,6), F_REG_READ), + SR_CORE ("aidr_el1", CPENC (3,1,C0,C0,7), F_REG_READ), + SR_CORE ("dczid_el0", CPENC (3,3,C0,C0,7), F_REG_READ), + SR_CORE ("id_dfr0_el1", CPENC (3,0,C0,C1,2), F_REG_READ), + SR_CORE ("id_pfr0_el1", CPENC (3,0,C0,C1,0), F_REG_READ), + SR_CORE ("id_pfr1_el1", CPENC (3,0,C0,C1,1), F_REG_READ), + SR_ID_PFR2 ("id_pfr2_el1", CPENC (3,0,C0,C3,4), F_REG_READ), + SR_CORE ("id_afr0_el1", CPENC (3,0,C0,C1,3), F_REG_READ), + SR_CORE ("id_mmfr0_el1", CPENC (3,0,C0,C1,4), F_REG_READ), + SR_CORE ("id_mmfr1_el1", CPENC (3,0,C0,C1,5), F_REG_READ), + SR_CORE ("id_mmfr2_el1", CPENC (3,0,C0,C1,6), F_REG_READ), + SR_CORE ("id_mmfr3_el1", CPENC (3,0,C0,C1,7), F_REG_READ), + SR_CORE ("id_mmfr4_el1", CPENC (3,0,C0,C2,6), F_REG_READ), + SR_CORE ("id_isar0_el1", CPENC (3,0,C0,C2,0), F_REG_READ), + SR_CORE ("id_isar1_el1", CPENC (3,0,C0,C2,1), F_REG_READ), + SR_CORE ("id_isar2_el1", CPENC (3,0,C0,C2,2), F_REG_READ), + SR_CORE ("id_isar3_el1", CPENC (3,0,C0,C2,3), F_REG_READ), + SR_CORE ("id_isar4_el1", CPENC (3,0,C0,C2,4), F_REG_READ), + SR_CORE ("id_isar5_el1", CPENC (3,0,C0,C2,5), F_REG_READ), + SR_CORE ("mvfr0_el1", CPENC (3,0,C0,C3,0), F_REG_READ), + SR_CORE ("mvfr1_el1", CPENC (3,0,C0,C3,1), F_REG_READ), + SR_CORE ("mvfr2_el1", CPENC (3,0,C0,C3,2), F_REG_READ), + SR_CORE ("ccsidr_el1", CPENC (3,1,C0,C0,0), F_REG_READ), + SR_CORE ("id_aa64pfr0_el1", CPENC (3,0,C0,C4,0), F_REG_READ), + SR_CORE ("id_aa64pfr1_el1", CPENC (3,0,C0,C4,1), F_REG_READ), + SR_CORE ("id_aa64dfr0_el1", CPENC (3,0,C0,C5,0), F_REG_READ), + SR_CORE ("id_aa64dfr1_el1", CPENC (3,0,C0,C5,1), F_REG_READ), + SR_CORE ("id_aa64isar0_el1", CPENC (3,0,C0,C6,0), F_REG_READ), + SR_CORE ("id_aa64isar1_el1", CPENC (3,0,C0,C6,1), F_REG_READ), + SR_CORE ("id_aa64mmfr0_el1", CPENC (3,0,C0,C7,0), F_REG_READ), + SR_CORE ("id_aa64mmfr1_el1", CPENC (3,0,C0,C7,1), F_REG_READ), + SR_V8_2 ("id_aa64mmfr2_el1", CPENC (3,0,C0,C7,2), F_REG_READ), + SR_CORE ("id_aa64afr0_el1", CPENC (3,0,C0,C5,4), F_REG_READ), + SR_CORE ("id_aa64afr1_el1", CPENC (3,0,C0,C5,5), F_REG_READ), + SR_SVE ("id_aa64zfr0_el1", CPENC (3,0,C0,C4,4), F_REG_READ), + SR_CORE ("clidr_el1", CPENC (3,1,C0,C0,1), F_REG_READ), + SR_CORE ("csselr_el1", CPENC (3,2,C0,C0,0), 0), + SR_CORE ("vpidr_el2", CPENC (3,4,C0,C0,0), 0), + SR_CORE ("vmpidr_el2", CPENC (3,4,C0,C0,5), 0), + SR_CORE ("sctlr_el1", CPENC (3,0,C1,C0,0), 0), + SR_CORE ("sctlr_el2", CPENC (3,4,C1,C0,0), 0), + SR_CORE ("sctlr_el3", CPENC (3,6,C1,C0,0), 0), + SR_V8_1 ("sctlr_el12", CPENC (3,5,C1,C0,0), 0), + SR_CORE ("actlr_el1", CPENC (3,0,C1,C0,1), 0), + SR_CORE ("actlr_el2", CPENC (3,4,C1,C0,1), 0), + SR_CORE ("actlr_el3", CPENC (3,6,C1,C0,1), 0), + SR_CORE ("cpacr_el1", CPENC (3,0,C1,C0,2), 0), + SR_V8_1 ("cpacr_el12", CPENC (3,5,C1,C0,2), 0), + SR_CORE ("cptr_el2", CPENC (3,4,C1,C1,2), 0), + SR_CORE ("cptr_el3", CPENC (3,6,C1,C1,2), 0), + SR_CORE ("scr_el3", CPENC (3,6,C1,C1,0), 0), + SR_CORE ("hcr_el2", CPENC (3,4,C1,C1,0), 0), + SR_CORE ("mdcr_el2", CPENC (3,4,C1,C1,1), 0), + SR_CORE ("mdcr_el3", CPENC (3,6,C1,C3,1), 0), + SR_CORE ("hstr_el2", CPENC (3,4,C1,C1,3), 0), + SR_CORE ("hacr_el2", CPENC (3,4,C1,C1,7), 0), + SR_SVE ("zcr_el1", CPENC (3,0,C1,C2,0), 0), + SR_SVE ("zcr_el12", CPENC (3,5,C1,C2,0), 0), + SR_SVE ("zcr_el2", CPENC (3,4,C1,C2,0), 0), + SR_SVE ("zcr_el3", CPENC (3,6,C1,C2,0), 0), + SR_SVE ("zidr_el1", CPENC (3,0,C0,C0,7), 0), + SR_CORE ("ttbr0_el1", CPENC (3,0,C2,C0,0), 0), + SR_CORE ("ttbr1_el1", CPENC (3,0,C2,C0,1), 0), + SR_CORE ("ttbr0_el2", CPENC (3,4,C2,C0,0), 0), + SR_V8_1 ("ttbr1_el2", CPENC (3,4,C2,C0,1), 0), + SR_CORE ("ttbr0_el3", CPENC (3,6,C2,C0,0), 0), + SR_V8_1 ("ttbr0_el12", CPENC (3,5,C2,C0,0), 0), + SR_V8_1 ("ttbr1_el12", CPENC (3,5,C2,C0,1), 0), + SR_CORE ("vttbr_el2", CPENC (3,4,C2,C1,0), 0), + SR_CORE ("tcr_el1", CPENC (3,0,C2,C0,2), 0), + SR_CORE ("tcr_el2", CPENC (3,4,C2,C0,2), 0), + SR_CORE ("tcr_el3", CPENC (3,6,C2,C0,2), 0), + SR_V8_1 ("tcr_el12", CPENC (3,5,C2,C0,2), 0), + SR_CORE ("vtcr_el2", CPENC (3,4,C2,C1,2), 0), + SR_V8_3 ("apiakeylo_el1", CPENC (3,0,C2,C1,0), 0), + SR_V8_3 ("apiakeyhi_el1", CPENC (3,0,C2,C1,1), 0), + SR_V8_3 ("apibkeylo_el1", CPENC (3,0,C2,C1,2), 0), + SR_V8_3 ("apibkeyhi_el1", CPENC (3,0,C2,C1,3), 0), + SR_V8_3 ("apdakeylo_el1", CPENC (3,0,C2,C2,0), 0), + SR_V8_3 ("apdakeyhi_el1", CPENC (3,0,C2,C2,1), 0), + SR_V8_3 ("apdbkeylo_el1", CPENC (3,0,C2,C2,2), 0), + SR_V8_3 ("apdbkeyhi_el1", CPENC (3,0,C2,C2,3), 0), + SR_V8_3 ("apgakeylo_el1", CPENC (3,0,C2,C3,0), 0), + SR_V8_3 ("apgakeyhi_el1", CPENC (3,0,C2,C3,1), 0), + SR_CORE ("afsr0_el1", CPENC (3,0,C5,C1,0), 0), + SR_CORE ("afsr1_el1", CPENC (3,0,C5,C1,1), 0), + SR_CORE ("afsr0_el2", CPENC (3,4,C5,C1,0), 0), + SR_CORE ("afsr1_el2", CPENC (3,4,C5,C1,1), 0), + SR_CORE ("afsr0_el3", CPENC (3,6,C5,C1,0), 0), + SR_V8_1 ("afsr0_el12", CPENC (3,5,C5,C1,0), 0), + SR_CORE ("afsr1_el3", CPENC (3,6,C5,C1,1), 0), + SR_V8_1 ("afsr1_el12", CPENC (3,5,C5,C1,1), 0), + SR_CORE ("esr_el1", CPENC (3,0,C5,C2,0), 0), + SR_CORE ("esr_el2", CPENC (3,4,C5,C2,0), 0), + SR_CORE ("esr_el3", CPENC (3,6,C5,C2,0), 0), + SR_V8_1 ("esr_el12", CPENC (3,5,C5,C2,0), 0), + SR_RAS ("vsesr_el2", CPENC (3,4,C5,C2,3), 0), + SR_CORE ("fpexc32_el2", CPENC (3,4,C5,C3,0), 0), + SR_RAS ("erridr_el1", CPENC (3,0,C5,C3,0), F_REG_READ), + SR_RAS ("errselr_el1", CPENC (3,0,C5,C3,1), 0), + SR_RAS ("erxfr_el1", CPENC (3,0,C5,C4,0), F_REG_READ), + SR_RAS ("erxctlr_el1", CPENC (3,0,C5,C4,1), 0), + SR_RAS ("erxstatus_el1", CPENC (3,0,C5,C4,2), 0), + SR_RAS ("erxaddr_el1", CPENC (3,0,C5,C4,3), 0), + SR_RAS ("erxmisc0_el1", CPENC (3,0,C5,C5,0), 0), + SR_RAS ("erxmisc1_el1", CPENC (3,0,C5,C5,1), 0), + SR_CORE ("far_el1", CPENC (3,0,C6,C0,0), 0), + SR_CORE ("far_el2", CPENC (3,4,C6,C0,0), 0), + SR_CORE ("far_el3", CPENC (3,6,C6,C0,0), 0), + SR_V8_1 ("far_el12", CPENC (3,5,C6,C0,0), 0), + SR_CORE ("hpfar_el2", CPENC (3,4,C6,C0,4), 0), + SR_CORE ("par_el1", CPENC (3,0,C7,C4,0), 0), + SR_CORE ("mair_el1", CPENC (3,0,C10,C2,0), 0), + SR_CORE ("mair_el2", CPENC (3,4,C10,C2,0), 0), + SR_CORE ("mair_el3", CPENC (3,6,C10,C2,0), 0), + SR_V8_1 ("mair_el12", CPENC (3,5,C10,C2,0), 0), + SR_CORE ("amair_el1", CPENC (3,0,C10,C3,0), 0), + SR_CORE ("amair_el2", CPENC (3,4,C10,C3,0), 0), + SR_CORE ("amair_el3", CPENC (3,6,C10,C3,0), 0), + SR_V8_1 ("amair_el12", CPENC (3,5,C10,C3,0), 0), + SR_CORE ("vbar_el1", CPENC (3,0,C12,C0,0), 0), + SR_CORE ("vbar_el2", CPENC (3,4,C12,C0,0), 0), + SR_CORE ("vbar_el3", CPENC (3,6,C12,C0,0), 0), + SR_V8_1 ("vbar_el12", CPENC (3,5,C12,C0,0), 0), + SR_CORE ("rvbar_el1", CPENC (3,0,C12,C0,1), F_REG_READ), + SR_CORE ("rvbar_el2", CPENC (3,4,C12,C0,1), F_REG_READ), + SR_CORE ("rvbar_el3", CPENC (3,6,C12,C0,1), F_REG_READ), + SR_CORE ("rmr_el1", CPENC (3,0,C12,C0,2), 0), + SR_CORE ("rmr_el2", CPENC (3,4,C12,C0,2), 0), + SR_CORE ("rmr_el3", CPENC (3,6,C12,C0,2), 0), + SR_CORE ("isr_el1", CPENC (3,0,C12,C1,0), F_REG_READ), + SR_RAS ("disr_el1", CPENC (3,0,C12,C1,1), 0), + SR_RAS ("vdisr_el2", CPENC (3,4,C12,C1,1), 0), + SR_CORE ("contextidr_el1", CPENC (3,0,C13,C0,1), 0), + SR_V8_1 ("contextidr_el2", CPENC (3,4,C13,C0,1), 0), + SR_V8_1 ("contextidr_el12", CPENC (3,5,C13,C0,1), 0), + SR_RNG ("rndr", CPENC (3,3,C2,C4,0), F_REG_READ), + SR_RNG ("rndrrs", CPENC (3,3,C2,C4,1), F_REG_READ), + SR_MEMTAG ("tco", CPENC (3,3,C4,C2,7), 0), + SR_MEMTAG ("tfsre0_el1", CPENC (3,0,C5,C6,1), 0), + SR_MEMTAG ("tfsr_el1", CPENC (3,0,C5,C6,0), 0), + SR_MEMTAG ("tfsr_el2", CPENC (3,4,C5,C6,0), 0), + SR_MEMTAG ("tfsr_el3", CPENC (3,6,C5,C6,0), 0), + SR_MEMTAG ("tfsr_el12", CPENC (3,5,C5,C6,0), 0), + SR_MEMTAG ("rgsr_el1", CPENC (3,0,C1,C0,5), 0), + SR_MEMTAG ("gcr_el1", CPENC (3,0,C1,C0,6), 0), + SR_MEMTAG ("gmid_el1", CPENC (3,1,C0,C0,4), F_REG_READ), + SR_CORE ("tpidr_el0", CPENC (3,3,C13,C0,2), 0), + SR_CORE ("tpidrro_el0", CPENC (3,3,C13,C0,3), 0), + SR_CORE ("tpidr_el1", CPENC (3,0,C13,C0,4), 0), + SR_CORE ("tpidr_el2", CPENC (3,4,C13,C0,2), 0), + SR_CORE ("tpidr_el3", CPENC (3,6,C13,C0,2), 0), + SR_SCXTNUM ("scxtnum_el0", CPENC (3,3,C13,C0,7), 0), + SR_SCXTNUM ("scxtnum_el1", CPENC (3,0,C13,C0,7), 0), + SR_SCXTNUM ("scxtnum_el2", CPENC (3,4,C13,C0,7), 0), + SR_SCXTNUM ("scxtnum_el12", CPENC (3,5,C13,C0,7), 0), + SR_SCXTNUM ("scxtnum_el3", CPENC (3,6,C13,C0,7), 0), + SR_CORE ("teecr32_el1", CPENC (2,2,C0, C0,0), 0), /* See section 3.9.7.1. */ + SR_CORE ("cntfrq_el0", CPENC (3,3,C14,C0,0), 0), + SR_CORE ("cntpct_el0", CPENC (3,3,C14,C0,1), F_REG_READ), + SR_CORE ("cntvct_el0", CPENC (3,3,C14,C0,2), F_REG_READ), + SR_CORE ("cntvoff_el2", CPENC (3,4,C14,C0,3), 0), + SR_CORE ("cntkctl_el1", CPENC (3,0,C14,C1,0), 0), + SR_V8_1 ("cntkctl_el12", CPENC (3,5,C14,C1,0), 0), + SR_CORE ("cnthctl_el2", CPENC (3,4,C14,C1,0), 0), + SR_CORE ("cntp_tval_el0", CPENC (3,3,C14,C2,0), 0), + SR_V8_1 ("cntp_tval_el02", CPENC (3,5,C14,C2,0), 0), + SR_CORE ("cntp_ctl_el0", CPENC (3,3,C14,C2,1), 0), + SR_V8_1 ("cntp_ctl_el02", CPENC (3,5,C14,C2,1), 0), + SR_CORE ("cntp_cval_el0", CPENC (3,3,C14,C2,2), 0), + SR_V8_1 ("cntp_cval_el02", CPENC (3,5,C14,C2,2), 0), + SR_CORE ("cntv_tval_el0", CPENC (3,3,C14,C3,0), 0), + SR_V8_1 ("cntv_tval_el02", CPENC (3,5,C14,C3,0), 0), + SR_CORE ("cntv_ctl_el0", CPENC (3,3,C14,C3,1), 0), + SR_V8_1 ("cntv_ctl_el02", CPENC (3,5,C14,C3,1), 0), + SR_CORE ("cntv_cval_el0", CPENC (3,3,C14,C3,2), 0), + SR_V8_1 ("cntv_cval_el02", CPENC (3,5,C14,C3,2), 0), + SR_CORE ("cnthp_tval_el2", CPENC (3,4,C14,C2,0), 0), + SR_CORE ("cnthp_ctl_el2", CPENC (3,4,C14,C2,1), 0), + SR_CORE ("cnthp_cval_el2", CPENC (3,4,C14,C2,2), 0), + SR_CORE ("cntps_tval_el1", CPENC (3,7,C14,C2,0), 0), + SR_CORE ("cntps_ctl_el1", CPENC (3,7,C14,C2,1), 0), + SR_CORE ("cntps_cval_el1", CPENC (3,7,C14,C2,2), 0), + SR_V8_1 ("cnthv_tval_el2", CPENC (3,4,C14,C3,0), 0), + SR_V8_1 ("cnthv_ctl_el2", CPENC (3,4,C14,C3,1), 0), + SR_V8_1 ("cnthv_cval_el2", CPENC (3,4,C14,C3,2), 0), + SR_CORE ("dacr32_el2", CPENC (3,4,C3,C0,0), 0), + SR_CORE ("ifsr32_el2", CPENC (3,4,C5,C0,1), 0), + SR_CORE ("teehbr32_el1", CPENC (2,2,C1,C0,0), 0), + SR_CORE ("sder32_el3", CPENC (3,6,C1,C1,1), 0), + SR_CORE ("mdscr_el1", CPENC (2,0,C0,C2,2), 0), + SR_CORE ("mdccsr_el0", CPENC (2,3,C0,C1,0), F_REG_READ), + SR_CORE ("mdccint_el1", CPENC (2,0,C0,C2,0), 0), + SR_CORE ("dbgdtr_el0", CPENC (2,3,C0,C4,0), 0), + SR_CORE ("dbgdtrrx_el0", CPENC (2,3,C0,C5,0), F_REG_READ), + SR_CORE ("dbgdtrtx_el0", CPENC (2,3,C0,C5,0), F_REG_WRITE), + SR_CORE ("osdtrrx_el1", CPENC (2,0,C0,C0,2), 0), + SR_CORE ("osdtrtx_el1", CPENC (2,0,C0,C3,2), 0), + SR_CORE ("oseccr_el1", CPENC (2,0,C0,C6,2), 0), + SR_CORE ("dbgvcr32_el2", CPENC (2,4,C0,C7,0), 0), + SR_CORE ("dbgbvr0_el1", CPENC (2,0,C0,C0,4), 0), + SR_CORE ("dbgbvr1_el1", CPENC (2,0,C0,C1,4), 0), + SR_CORE ("dbgbvr2_el1", CPENC (2,0,C0,C2,4), 0), + SR_CORE ("dbgbvr3_el1", CPENC (2,0,C0,C3,4), 0), + SR_CORE ("dbgbvr4_el1", CPENC (2,0,C0,C4,4), 0), + SR_CORE ("dbgbvr5_el1", CPENC (2,0,C0,C5,4), 0), + SR_CORE ("dbgbvr6_el1", CPENC (2,0,C0,C6,4), 0), + SR_CORE ("dbgbvr7_el1", CPENC (2,0,C0,C7,4), 0), + SR_CORE ("dbgbvr8_el1", CPENC (2,0,C0,C8,4), 0), + SR_CORE ("dbgbvr9_el1", CPENC (2,0,C0,C9,4), 0), + SR_CORE ("dbgbvr10_el1", CPENC (2,0,C0,C10,4), 0), + SR_CORE ("dbgbvr11_el1", CPENC (2,0,C0,C11,4), 0), + SR_CORE ("dbgbvr12_el1", CPENC (2,0,C0,C12,4), 0), + SR_CORE ("dbgbvr13_el1", CPENC (2,0,C0,C13,4), 0), + SR_CORE ("dbgbvr14_el1", CPENC (2,0,C0,C14,4), 0), + SR_CORE ("dbgbvr15_el1", CPENC (2,0,C0,C15,4), 0), + SR_CORE ("dbgbcr0_el1", CPENC (2,0,C0,C0,5), 0), + SR_CORE ("dbgbcr1_el1", CPENC (2,0,C0,C1,5), 0), + SR_CORE ("dbgbcr2_el1", CPENC (2,0,C0,C2,5), 0), + SR_CORE ("dbgbcr3_el1", CPENC (2,0,C0,C3,5), 0), + SR_CORE ("dbgbcr4_el1", CPENC (2,0,C0,C4,5), 0), + SR_CORE ("dbgbcr5_el1", CPENC (2,0,C0,C5,5), 0), + SR_CORE ("dbgbcr6_el1", CPENC (2,0,C0,C6,5), 0), + SR_CORE ("dbgbcr7_el1", CPENC (2,0,C0,C7,5), 0), + SR_CORE ("dbgbcr8_el1", CPENC (2,0,C0,C8,5), 0), + SR_CORE ("dbgbcr9_el1", CPENC (2,0,C0,C9,5), 0), + SR_CORE ("dbgbcr10_el1", CPENC (2,0,C0,C10,5), 0), + SR_CORE ("dbgbcr11_el1", CPENC (2,0,C0,C11,5), 0), + SR_CORE ("dbgbcr12_el1", CPENC (2,0,C0,C12,5), 0), + SR_CORE ("dbgbcr13_el1", CPENC (2,0,C0,C13,5), 0), + SR_CORE ("dbgbcr14_el1", CPENC (2,0,C0,C14,5), 0), + SR_CORE ("dbgbcr15_el1", CPENC (2,0,C0,C15,5), 0), + SR_CORE ("dbgwvr0_el1", CPENC (2,0,C0,C0,6), 0), + SR_CORE ("dbgwvr1_el1", CPENC (2,0,C0,C1,6), 0), + SR_CORE ("dbgwvr2_el1", CPENC (2,0,C0,C2,6), 0), + SR_CORE ("dbgwvr3_el1", CPENC (2,0,C0,C3,6), 0), + SR_CORE ("dbgwvr4_el1", CPENC (2,0,C0,C4,6), 0), + SR_CORE ("dbgwvr5_el1", CPENC (2,0,C0,C5,6), 0), + SR_CORE ("dbgwvr6_el1", CPENC (2,0,C0,C6,6), 0), + SR_CORE ("dbgwvr7_el1", CPENC (2,0,C0,C7,6), 0), + SR_CORE ("dbgwvr8_el1", CPENC (2,0,C0,C8,6), 0), + SR_CORE ("dbgwvr9_el1", CPENC (2,0,C0,C9,6), 0), + SR_CORE ("dbgwvr10_el1", CPENC (2,0,C0,C10,6), 0), + SR_CORE ("dbgwvr11_el1", CPENC (2,0,C0,C11,6), 0), + SR_CORE ("dbgwvr12_el1", CPENC (2,0,C0,C12,6), 0), + SR_CORE ("dbgwvr13_el1", CPENC (2,0,C0,C13,6), 0), + SR_CORE ("dbgwvr14_el1", CPENC (2,0,C0,C14,6), 0), + SR_CORE ("dbgwvr15_el1", CPENC (2,0,C0,C15,6), 0), + SR_CORE ("dbgwcr0_el1", CPENC (2,0,C0,C0,7), 0), + SR_CORE ("dbgwcr1_el1", CPENC (2,0,C0,C1,7), 0), + SR_CORE ("dbgwcr2_el1", CPENC (2,0,C0,C2,7), 0), + SR_CORE ("dbgwcr3_el1", CPENC (2,0,C0,C3,7), 0), + SR_CORE ("dbgwcr4_el1", CPENC (2,0,C0,C4,7), 0), + SR_CORE ("dbgwcr5_el1", CPENC (2,0,C0,C5,7), 0), + SR_CORE ("dbgwcr6_el1", CPENC (2,0,C0,C6,7), 0), + SR_CORE ("dbgwcr7_el1", CPENC (2,0,C0,C7,7), 0), + SR_CORE ("dbgwcr8_el1", CPENC (2,0,C0,C8,7), 0), + SR_CORE ("dbgwcr9_el1", CPENC (2,0,C0,C9,7), 0), + SR_CORE ("dbgwcr10_el1", CPENC (2,0,C0,C10,7), 0), + SR_CORE ("dbgwcr11_el1", CPENC (2,0,C0,C11,7), 0), + SR_CORE ("dbgwcr12_el1", CPENC (2,0,C0,C12,7), 0), + SR_CORE ("dbgwcr13_el1", CPENC (2,0,C0,C13,7), 0), + SR_CORE ("dbgwcr14_el1", CPENC (2,0,C0,C14,7), 0), + SR_CORE ("dbgwcr15_el1", CPENC (2,0,C0,C15,7), 0), + SR_CORE ("mdrar_el1", CPENC (2,0,C1,C0,0), F_REG_READ), + SR_CORE ("oslar_el1", CPENC (2,0,C1,C0,4), F_REG_WRITE), + SR_CORE ("oslsr_el1", CPENC (2,0,C1,C1,4), F_REG_READ), + SR_CORE ("osdlr_el1", CPENC (2,0,C1,C3,4), 0), + SR_CORE ("dbgprcr_el1", CPENC (2,0,C1,C4,4), 0), + SR_CORE ("dbgclaimset_el1", CPENC (2,0,C7,C8,6), 0), + SR_CORE ("dbgclaimclr_el1", CPENC (2,0,C7,C9,6), 0), + SR_CORE ("dbgauthstatus_el1", CPENC (2,0,C7,C14,6), F_REG_READ), + SR_PROFILE ("pmblimitr_el1", CPENC (3,0,C9,C10,0), 0), + SR_PROFILE ("pmbptr_el1", CPENC (3,0,C9,C10,1), 0), + SR_PROFILE ("pmbsr_el1", CPENC (3,0,C9,C10,3), 0), + SR_PROFILE ("pmbidr_el1", CPENC (3,0,C9,C10,7), F_REG_READ), + SR_PROFILE ("pmscr_el1", CPENC (3,0,C9,C9,0), 0), + SR_PROFILE ("pmsicr_el1", CPENC (3,0,C9,C9,2), 0), + SR_PROFILE ("pmsirr_el1", CPENC (3,0,C9,C9,3), 0), + SR_PROFILE ("pmsfcr_el1", CPENC (3,0,C9,C9,4), 0), + SR_PROFILE ("pmsevfr_el1", CPENC (3,0,C9,C9,5), 0), + SR_PROFILE ("pmslatfr_el1", CPENC (3,0,C9,C9,6), 0), + SR_PROFILE ("pmsidr_el1", CPENC (3,0,C9,C9,7), 0), + SR_PROFILE ("pmscr_el2", CPENC (3,4,C9,C9,0), 0), + SR_PROFILE ("pmscr_el12", CPENC (3,5,C9,C9,0), 0), + SR_CORE ("pmcr_el0", CPENC (3,3,C9,C12,0), 0), + SR_CORE ("pmcntenset_el0", CPENC (3,3,C9,C12,1), 0), + SR_CORE ("pmcntenclr_el0", CPENC (3,3,C9,C12,2), 0), + SR_CORE ("pmovsclr_el0", CPENC (3,3,C9,C12,3), 0), + SR_CORE ("pmswinc_el0", CPENC (3,3,C9,C12,4), F_REG_WRITE), + SR_CORE ("pmselr_el0", CPENC (3,3,C9,C12,5), 0), + SR_CORE ("pmceid0_el0", CPENC (3,3,C9,C12,6), F_REG_READ), + SR_CORE ("pmceid1_el0", CPENC (3,3,C9,C12,7), F_REG_READ), + SR_CORE ("pmccntr_el0", CPENC (3,3,C9,C13,0), 0), + SR_CORE ("pmxevtyper_el0", CPENC (3,3,C9,C13,1), 0), + SR_CORE ("pmxevcntr_el0", CPENC (3,3,C9,C13,2), 0), + SR_CORE ("pmuserenr_el0", CPENC (3,3,C9,C14,0), 0), + SR_CORE ("pmintenset_el1", CPENC (3,0,C9,C14,1), 0), + SR_CORE ("pmintenclr_el1", CPENC (3,0,C9,C14,2), 0), + SR_CORE ("pmovsset_el0", CPENC (3,3,C9,C14,3), 0), + SR_CORE ("pmevcntr0_el0", CPENC (3,3,C14,C8,0), 0), + SR_CORE ("pmevcntr1_el0", CPENC (3,3,C14,C8,1), 0), + SR_CORE ("pmevcntr2_el0", CPENC (3,3,C14,C8,2), 0), + SR_CORE ("pmevcntr3_el0", CPENC (3,3,C14,C8,3), 0), + SR_CORE ("pmevcntr4_el0", CPENC (3,3,C14,C8,4), 0), + SR_CORE ("pmevcntr5_el0", CPENC (3,3,C14,C8,5), 0), + SR_CORE ("pmevcntr6_el0", CPENC (3,3,C14,C8,6), 0), + SR_CORE ("pmevcntr7_el0", CPENC (3,3,C14,C8,7), 0), + SR_CORE ("pmevcntr8_el0", CPENC (3,3,C14,C9,0), 0), + SR_CORE ("pmevcntr9_el0", CPENC (3,3,C14,C9,1), 0), + SR_CORE ("pmevcntr10_el0", CPENC (3,3,C14,C9,2), 0), + SR_CORE ("pmevcntr11_el0", CPENC (3,3,C14,C9,3), 0), + SR_CORE ("pmevcntr12_el0", CPENC (3,3,C14,C9,4), 0), + SR_CORE ("pmevcntr13_el0", CPENC (3,3,C14,C9,5), 0), + SR_CORE ("pmevcntr14_el0", CPENC (3,3,C14,C9,6), 0), + SR_CORE ("pmevcntr15_el0", CPENC (3,3,C14,C9,7), 0), + SR_CORE ("pmevcntr16_el0", CPENC (3,3,C14,C10,0), 0), + SR_CORE ("pmevcntr17_el0", CPENC (3,3,C14,C10,1), 0), + SR_CORE ("pmevcntr18_el0", CPENC (3,3,C14,C10,2), 0), + SR_CORE ("pmevcntr19_el0", CPENC (3,3,C14,C10,3), 0), + SR_CORE ("pmevcntr20_el0", CPENC (3,3,C14,C10,4), 0), + SR_CORE ("pmevcntr21_el0", CPENC (3,3,C14,C10,5), 0), + SR_CORE ("pmevcntr22_el0", CPENC (3,3,C14,C10,6), 0), + SR_CORE ("pmevcntr23_el0", CPENC (3,3,C14,C10,7), 0), + SR_CORE ("pmevcntr24_el0", CPENC (3,3,C14,C11,0), 0), + SR_CORE ("pmevcntr25_el0", CPENC (3,3,C14,C11,1), 0), + SR_CORE ("pmevcntr26_el0", CPENC (3,3,C14,C11,2), 0), + SR_CORE ("pmevcntr27_el0", CPENC (3,3,C14,C11,3), 0), + SR_CORE ("pmevcntr28_el0", CPENC (3,3,C14,C11,4), 0), + SR_CORE ("pmevcntr29_el0", CPENC (3,3,C14,C11,5), 0), + SR_CORE ("pmevcntr30_el0", CPENC (3,3,C14,C11,6), 0), + SR_CORE ("pmevtyper0_el0", CPENC (3,3,C14,C12,0), 0), + SR_CORE ("pmevtyper1_el0", CPENC (3,3,C14,C12,1), 0), + SR_CORE ("pmevtyper2_el0", CPENC (3,3,C14,C12,2), 0), + SR_CORE ("pmevtyper3_el0", CPENC (3,3,C14,C12,3), 0), + SR_CORE ("pmevtyper4_el0", CPENC (3,3,C14,C12,4), 0), + SR_CORE ("pmevtyper5_el0", CPENC (3,3,C14,C12,5), 0), + SR_CORE ("pmevtyper6_el0", CPENC (3,3,C14,C12,6), 0), + SR_CORE ("pmevtyper7_el0", CPENC (3,3,C14,C12,7), 0), + SR_CORE ("pmevtyper8_el0", CPENC (3,3,C14,C13,0), 0), + SR_CORE ("pmevtyper9_el0", CPENC (3,3,C14,C13,1), 0), + SR_CORE ("pmevtyper10_el0", CPENC (3,3,C14,C13,2), 0), + SR_CORE ("pmevtyper11_el0", CPENC (3,3,C14,C13,3), 0), + SR_CORE ("pmevtyper12_el0", CPENC (3,3,C14,C13,4), 0), + SR_CORE ("pmevtyper13_el0", CPENC (3,3,C14,C13,5), 0), + SR_CORE ("pmevtyper14_el0", CPENC (3,3,C14,C13,6), 0), + SR_CORE ("pmevtyper15_el0", CPENC (3,3,C14,C13,7), 0), + SR_CORE ("pmevtyper16_el0", CPENC (3,3,C14,C14,0), 0), + SR_CORE ("pmevtyper17_el0", CPENC (3,3,C14,C14,1), 0), + SR_CORE ("pmevtyper18_el0", CPENC (3,3,C14,C14,2), 0), + SR_CORE ("pmevtyper19_el0", CPENC (3,3,C14,C14,3), 0), + SR_CORE ("pmevtyper20_el0", CPENC (3,3,C14,C14,4), 0), + SR_CORE ("pmevtyper21_el0", CPENC (3,3,C14,C14,5), 0), + SR_CORE ("pmevtyper22_el0", CPENC (3,3,C14,C14,6), 0), + SR_CORE ("pmevtyper23_el0", CPENC (3,3,C14,C14,7), 0), + SR_CORE ("pmevtyper24_el0", CPENC (3,3,C14,C15,0), 0), + SR_CORE ("pmevtyper25_el0", CPENC (3,3,C14,C15,1), 0), + SR_CORE ("pmevtyper26_el0", CPENC (3,3,C14,C15,2), 0), + SR_CORE ("pmevtyper27_el0", CPENC (3,3,C14,C15,3), 0), + SR_CORE ("pmevtyper28_el0", CPENC (3,3,C14,C15,4), 0), + SR_CORE ("pmevtyper29_el0", CPENC (3,3,C14,C15,5), 0), + SR_CORE ("pmevtyper30_el0", CPENC (3,3,C14,C15,6), 0), + SR_CORE ("pmccfiltr_el0", CPENC (3,3,C14,C15,7), 0), + + SR_V8_4 ("dit", CPEN_ (3,C2,5), 0), + SR_V8_4 ("vstcr_el2", CPENC (3,4,C2,C6,2), 0), + SR_V8_4 ("vsttbr_el2", CPENC (3,4,C2,C6,0), 0), + SR_V8_4 ("cnthvs_tval_el2", CPENC (3,4,C14,C4,0), 0), + SR_V8_4 ("cnthvs_cval_el2", CPENC (3,4,C14,C4,2), 0), + SR_V8_4 ("cnthvs_ctl_el2", CPENC (3,4,C14,C4,1), 0), + SR_V8_4 ("cnthps_tval_el2", CPENC (3,4,C14,C5,0), 0), + SR_V8_4 ("cnthps_cval_el2", CPENC (3,4,C14,C5,2), 0), + SR_V8_4 ("cnthps_ctl_el2", CPENC (3,4,C14,C5,1), 0), + SR_V8_4 ("sder32_el2", CPENC (3,4,C1,C3,1), 0), + SR_V8_4 ("vncr_el2", CPENC (3,4,C2,C2,0), 0), + + { 0, CPENC (0,0,0,0,0), 0, 0 } }; bfd_boolean @@ -4228,165 +4257,7 @@ aarch64_sys_reg_supported_p (const aarch64_feature_set features, if (!(reg->flags & F_ARCHEXT)) return TRUE; - /* PAN. Values are from aarch64_sys_regs. */ - if (reg->value == CPEN_(0,C2,3) - && !AARCH64_CPU_HAS_FEATURE (features, AARCH64_FEATURE_PAN)) - return FALSE; - - /* SCXTNUM_ELx registers. */ - if ((reg->value == CPENC (3, 3, C13, C0, 7) - || reg->value == CPENC (3, 0, C13, C0, 7) - || reg->value == CPENC (3, 4, C13, C0, 7) - || reg->value == CPENC (3, 6, C13, C0, 7) - || reg->value == CPENC (3, 5, C13, C0, 7)) - && !AARCH64_CPU_HAS_FEATURE (features, AARCH64_FEATURE_SCXTNUM)) - return FALSE; - - /* ID_PFR2_EL1 register. */ - if (reg->value == CPENC(3, 0, C0, C3, 4) - && !AARCH64_CPU_HAS_FEATURE (features, AARCH64_FEATURE_ID_PFR2)) - return FALSE; - - /* SSBS. Values are from aarch64_sys_regs. */ - if (reg->value == CPEN_(3,C2,6) - && !AARCH64_CPU_HAS_FEATURE (features, AARCH64_FEATURE_SSBS)) - return FALSE; - - /* Virtualization host extensions: system registers. */ - if ((reg->value == CPENC (3, 4, C2, C0, 1) - || reg->value == CPENC (3, 4, C13, C0, 1) - || reg->value == CPENC (3, 4, C14, C3, 0) - || reg->value == CPENC (3, 4, C14, C3, 1) - || reg->value == CPENC (3, 4, C14, C3, 2)) - && !AARCH64_CPU_HAS_FEATURE (features, AARCH64_FEATURE_V8_1)) - return FALSE; - - /* Virtualization host extensions: *_el12 names of *_el1 registers. */ - if ((reg->value == CPEN_ (5, C0, 0) - || reg->value == CPEN_ (5, C0, 1) - || reg->value == CPENC (3, 5, C1, C0, 0) - || reg->value == CPENC (3, 5, C1, C0, 2) - || reg->value == CPENC (3, 5, C2, C0, 0) - || reg->value == CPENC (3, 5, C2, C0, 1) - || reg->value == CPENC (3, 5, C2, C0, 2) - || reg->value == CPENC (3, 5, C5, C1, 0) - || reg->value == CPENC (3, 5, C5, C1, 1) - || reg->value == CPENC (3, 5, C5, C2, 0) - || reg->value == CPENC (3, 5, C6, C0, 0) - || reg->value == CPENC (3, 5, C10, C2, 0) - || reg->value == CPENC (3, 5, C10, C3, 0) - || reg->value == CPENC (3, 5, C12, C0, 0) - || reg->value == CPENC (3, 5, C13, C0, 1) - || reg->value == CPENC (3, 5, C14, C1, 0)) - && !AARCH64_CPU_HAS_FEATURE (features, AARCH64_FEATURE_V8_1)) - return FALSE; - - /* Virtualization host extensions: *_el02 names of *_el0 registers. */ - if ((reg->value == CPENC (3, 5, C14, C2, 0) - || reg->value == CPENC (3, 5, C14, C2, 1) - || reg->value == CPENC (3, 5, C14, C2, 2) - || reg->value == CPENC (3, 5, C14, C3, 0) - || reg->value == CPENC (3, 5, C14, C3, 1) - || reg->value == CPENC (3, 5, C14, C3, 2)) - && !AARCH64_CPU_HAS_FEATURE (features, AARCH64_FEATURE_V8_1)) - return FALSE; - - /* ARMv8.2 features. */ - - /* ID_AA64MMFR2_EL1. */ - if (reg->value == CPENC (3, 0, C0, C7, 2) - && !AARCH64_CPU_HAS_FEATURE (features, AARCH64_FEATURE_V8_2)) - return FALSE; - - /* PSTATE.UAO. */ - if (reg->value == CPEN_ (0, C2, 4) - && !AARCH64_CPU_HAS_FEATURE (features, AARCH64_FEATURE_V8_2)) - return FALSE; - - /* RAS extension. */ - - /* ERRIDR_EL1, ERRSELR_EL1, ERXFR_EL1, ERXCTLR_EL1, ERXSTATUS_EL, ERXADDR_EL1, - ERXMISC0_EL1 AND ERXMISC1_EL1. */ - if ((reg->value == CPENC (3, 0, C5, C3, 0) - || reg->value == CPENC (3, 0, C5, C3, 1) - || reg->value == CPENC (3, 0, C5, C3, 2) - || reg->value == CPENC (3, 0, C5, C3, 3) - || reg->value == CPENC (3, 0, C5, C4, 0) - || reg->value == CPENC (3, 0, C5, C4, 1) - || reg->value == CPENC (3, 0, C5, C4, 2) - || reg->value == CPENC (3, 0, C5, C4, 3) - || reg->value == CPENC (3, 0, C5, C5, 0) - || reg->value == CPENC (3, 0, C5, C5, 1)) - && !AARCH64_CPU_HAS_FEATURE (features, AARCH64_FEATURE_RAS)) - return FALSE; - - /* VSESR_EL2, DISR_EL1 and VDISR_EL2. */ - if ((reg->value == CPENC (3, 4, C5, C2, 3) - || reg->value == CPENC (3, 0, C12, C1, 1) - || reg->value == CPENC (3, 4, C12, C1, 1)) - && !AARCH64_CPU_HAS_FEATURE (features, AARCH64_FEATURE_RAS)) - return FALSE; - - /* Statistical Profiling extension. */ - if ((reg->value == CPENC (3, 0, C9, C10, 0) - || reg->value == CPENC (3, 0, C9, C10, 1) - || reg->value == CPENC (3, 0, C9, C10, 3) - || reg->value == CPENC (3, 0, C9, C10, 7) - || reg->value == CPENC (3, 0, C9, C9, 0) - || reg->value == CPENC (3, 0, C9, C9, 2) - || reg->value == CPENC (3, 0, C9, C9, 3) - || reg->value == CPENC (3, 0, C9, C9, 4) - || reg->value == CPENC (3, 0, C9, C9, 5) - || reg->value == CPENC (3, 0, C9, C9, 6) - || reg->value == CPENC (3, 0, C9, C9, 7) - || reg->value == CPENC (3, 4, C9, C9, 0) - || reg->value == CPENC (3, 5, C9, C9, 0)) - && !AARCH64_CPU_HAS_FEATURE (features, AARCH64_FEATURE_PROFILE)) - return FALSE; - - /* ARMv8.3 Pointer authentication keys. */ - if ((reg->value == CPENC (3, 0, C2, C1, 0) - || reg->value == CPENC (3, 0, C2, C1, 1) - || reg->value == CPENC (3, 0, C2, C1, 2) - || reg->value == CPENC (3, 0, C2, C1, 3) - || reg->value == CPENC (3, 0, C2, C2, 0) - || reg->value == CPENC (3, 0, C2, C2, 1) - || reg->value == CPENC (3, 0, C2, C2, 2) - || reg->value == CPENC (3, 0, C2, C2, 3) - || reg->value == CPENC (3, 0, C2, C3, 0) - || reg->value == CPENC (3, 0, C2, C3, 1)) - && !AARCH64_CPU_HAS_FEATURE (features, AARCH64_FEATURE_V8_3)) - return FALSE; - - /* SVE. */ - if ((reg->value == CPENC (3, 0, C0, C4, 4) - || reg->value == CPENC (3, 0, C1, C2, 0) - || reg->value == CPENC (3, 4, C1, C2, 0) - || reg->value == CPENC (3, 6, C1, C2, 0) - || reg->value == CPENC (3, 5, C1, C2, 0) - || reg->value == CPENC (3, 0, C0, C0, 7)) - && !AARCH64_CPU_HAS_FEATURE (features, AARCH64_FEATURE_SVE)) - return FALSE; - - /* ARMv8.4 features. */ - - /* PSTATE.DIT. */ - if (reg->value == CPEN_ (3, C2, 5) - && !AARCH64_CPU_HAS_FEATURE (features, AARCH64_FEATURE_V8_4)) - return FALSE; - - /* Virtualization extensions. */ - if ((reg->value == CPENC(3, 4, C2, C6, 2) - || reg->value == CPENC(3, 4, C2, C6, 0) - || reg->value == CPENC(3, 4, C14, C4, 0) - || reg->value == CPENC(3, 4, C14, C4, 2) - || reg->value == CPENC(3, 4, C14, C4, 1) - || reg->value == CPENC(3, 4, C14, C5, 0) - || reg->value == CPENC(3, 4, C14, C5, 2) - || reg->value == CPENC(3, 4, C14, C5, 1) - || reg->value == CPENC(3, 4, C1, C3, 1) - || reg->value == CPENC(3, 4, C2, C2, 0)) - && !AARCH64_CPU_HAS_FEATURE (features, AARCH64_FEATURE_V8_4)) + if (!AARCH64_CPU_HAS_ALL_FEATURES (features, reg->features)) return FALSE; /* ARMv8.4 TLB instructions. */ @@ -4439,27 +4310,6 @@ aarch64_sys_reg_supported_p (const aarch64_feature_set features, && !AARCH64_CPU_HAS_FEATURE (features, AARCH64_FEATURE_V8_4)) return FALSE; - /* Random Number Instructions. For now they are available - (and optional) only with ARMv8.5-A. */ - if ((reg->value == CPENC (3, 3, C2, C4, 0) - || reg->value == CPENC (3, 3, C2, C4, 1)) - && !(AARCH64_CPU_HAS_FEATURE (features, AARCH64_FEATURE_RNG) - && AARCH64_CPU_HAS_FEATURE (features, AARCH64_FEATURE_V8_5))) - return FALSE; - - /* System Registers in ARMv8.5-A with AARCH64_FEATURE_MEMTAG. */ - if ((reg->value == CPENC (3, 3, C4, C2, 7) - || reg->value == CPENC (3, 0, C5, C6, 1) - || reg->value == CPENC (3, 0, C5, C6, 0) - || reg->value == CPENC (3, 4, C5, C6, 0) - || reg->value == CPENC (3, 6, C5, C6, 0) - || reg->value == CPENC (3, 5, C5, C6, 0) - || reg->value == CPENC (3, 0, C1, C0, 5) - || reg->value == CPENC (3, 0, C1, C0, 6) - || reg->value == CPENC (3, 1, C0, C0, 4)) - && !(AARCH64_CPU_HAS_FEATURE (features, AARCH64_FEATURE_MEMTAG))) - return FALSE; - return TRUE; } @@ -4472,15 +4322,15 @@ aarch64_sys_reg_supported_p (const aarch64_feature_set features, 0b011010 (0x1a). */ const aarch64_sys_reg aarch64_pstatefields [] = { - { "spsel", 0x05, 0 }, - { "daifset", 0x1e, 0 }, - { "daifclr", 0x1f, 0 }, - { "pan", 0x04, F_ARCHEXT }, - { "uao", 0x03, F_ARCHEXT }, - { "ssbs", 0x19, F_ARCHEXT }, - { "dit", 0x1a, F_ARCHEXT }, - { "tco", 0x1c, F_ARCHEXT }, - { 0, CPENC(0,0,0,0,0), 0 }, + SR_CORE ("spsel", 0x05, 0), + SR_CORE ("daifset", 0x1e, 0), + SR_CORE ("daifclr", 0x1f, 0), + SR_PAN ("pan", 0x04, 0), + SR_V8_2 ("uao", 0x03, 0), + SR_SSBS ("ssbs", 0x19, 0), + SR_V8_4 ("dit", 0x1a, 0), + SR_MEMTAG ("tco", 0x1c, 0), + { 0, CPENC (0,0,0,0,0), 0, 0 }, }; bfd_boolean @@ -4490,32 +4340,7 @@ aarch64_pstatefield_supported_p (const aarch64_feature_set features, if (!(reg->flags & F_ARCHEXT)) return TRUE; - /* PAN. Values are from aarch64_pstatefields. */ - if (reg->value == 0x04 - && !AARCH64_CPU_HAS_FEATURE (features, AARCH64_FEATURE_PAN)) - return FALSE; - - /* UAO. Values are from aarch64_pstatefields. */ - if (reg->value == 0x03 - && !AARCH64_CPU_HAS_FEATURE (features, AARCH64_FEATURE_V8_2)) - return FALSE; - - /* SSBS. Values are from aarch64_pstatefields. */ - if (reg->value == 0x19 - && !AARCH64_CPU_HAS_FEATURE (features, AARCH64_FEATURE_SSBS)) - return FALSE; - - /* DIT. Values are from aarch64_pstatefields. */ - if (reg->value == 0x1a - && !AARCH64_CPU_HAS_FEATURE (features, AARCH64_FEATURE_V8_4)) - return FALSE; - - /* TCO. Values are from aarch64_pstatefields. */ - if (reg->value == 0x1c - && !AARCH64_CPU_HAS_FEATURE (features, AARCH64_FEATURE_MEMTAG)) - return FALSE; - - return TRUE; + return AARCH64_CPU_HAS_ALL_FEATURES (features, reg->features); } const aarch64_sys_ins_reg aarch64_sys_regs_ic[] = -- 2.30.2