apple_regs.json: More GXF and SPRR registers

Signed-off-by: Hector Martin <marcan@marcan.st>
This commit is contained in:
Hector Martin 2021-05-22 04:12:20 +09:00
parent aacbdf0949
commit 81bf0ad578
2 changed files with 34 additions and 7 deletions

View file

@ -75,12 +75,14 @@ class HV:
SPRR_PERM_EL1: SPRR_PERM_EL12,
SPRR_PERM_EL0: SPRR_PERM_EL02,
SPRR_UNK1_EL1: SPRR_UNK1_EL12,
SPRR_UMASK_EL1: SPRR_UMASK_EL12,
SPRR_UMASK0_EL1: SPRR_UMASK0_EL12,
APCTL_EL1: APCTL_EL12,
APSTS_EL1: APSTS_EL12,
KERNELKEYLO_EL1: KERNELKEYLO_EL12,
KERNELKEYHI_EL1: KERNELKEYHI_EL12,
GXF_CONFIG_EL1: GXF_CONFIG_EL12,
GXF_ABORT_EL1: GXF_ABORT_EL12,
GXF_ENTER_EL1: GXF_ENTER_EL12,
}
def __init__(self, iface, proxy, utils):

View file

@ -78,9 +78,15 @@
]}]},
{"index": 0, "name": "SPRR_PERM_EL20_SILLY_THING", "fullname": "SPRR Permission Configuration Register (EL20, useless)", "enc": [3, 4, 15, 5, 1 ], "width": 64},
{"index": 0, "name": "SPRR_PERM_EL02", "fullname": "SPRR Permission Configuration Register (EL02)", "enc": [3, 4, 15, 5, 2 ], "width": 64},
{"index": 0, "name": "SPRR_KMASK_EL12", "fullname": "SPRR Kernel Permission Unlock Mask (EL12)", "enc": [3, 4, 15, 6, 0 ], "width": 32},
{"index": 0, "name": "SPRR_UMASK_EL2", "fullname": "SPRR Permission Unlock Mask (EL2)", "enc": [3, 4, 15, 7, 0 ], "width": 32},
{"index": 0, "name": "SPRR_UMASK_EL12", "fullname": "SPRR Permission Unlock Mask (EL12)", "enc": [3, 4, 15, 8, 0 ], "width": 32},
{"index": 0, "name": "SPRR_KMASK0_EL12", "fullname": "SPRR Kernel Permission Unlock Mask (EL12)", "enc": [3, 4, 15, 6, 0 ], "width": 32},
{"index": 0, "name": "SPRR_UMASK0_EL2", "fullname": "SPRR Permission Unlock Mask 0 (EL2)", "enc": [3, 4, 15, 7, 0 ], "width": 32},
{"index": 0, "name": "SPRR_UMASK1_EL2", "fullname": "SPRR Permission Unlock Mask 1 (EL2)", "enc": [3, 4, 15, 7, 1 ], "width": 32},
{"index": 0, "name": "SPRR_UMASK2_EL2", "fullname": "SPRR Permission Unlock Mask 2 (EL2)", "enc": [3, 4, 15, 7, 2 ], "width": 32},
{"index": 0, "name": "SPRR_UMASK3_EL2", "fullname": "SPRR Permission Unlock Mask 3 (EL2)", "enc": [3, 4, 15, 7, 3 ], "width": 32},
{"index": 0, "name": "SPRR_UMASK0_EL12", "fullname": "SPRR Permission Unlock Mask 0 (EL12)", "enc": [3, 4, 15, 8, 0 ], "width": 32},
{"index": 0, "name": "SPRR_UMASK1_EL12", "fullname": "SPRR Permission Unlock Mask 1 (EL12)", "enc": [3, 4, 15, 8, 1 ], "width": 32},
{"index": 0, "name": "SPRR_UMASK2_EL12", "fullname": "SPRR Permission Unlock Mask 2 (EL12)", "enc": [3, 4, 15, 8, 2 ], "width": 32},
{"index": 0, "name": "SPRR_UMASK3_EL12", "fullname": "SPRR Permission Unlock Mask 3 (EL12)", "enc": [3, 4, 15, 8, 3 ], "width": 32},
{"index": 0, "name": "CNTPCT_ALIAS_EL0", "fullname": "Physical timer counter register", "enc": [3, 4, 15, 10, 5 ], "width": 64},
{"index": 0, "name": "CNTVCT_ALIAS_EL0", "fullname": "Virtual timer counter register", "enc": [3, 4, 15, 10, 6 ], "width": 64},
{"index": 0, "name": "CTRR_A_LWR_EL2", "fullname": "CTRR A Lower Address (EL2)", "enc": [3, 4, 15, 11, 0 ], "width": 64},
@ -122,9 +128,22 @@
{"index": 0, "name": "KERNELKEYHI_EL12", "fullname": "Pointer Authentication Kernel Key High (EL12)", "enc": [3, 6, 15, 2, 4 ], "width": 64},
{"index": 0, "name": "AFPCR_EL0", "fullname": "Apple Floating-Point Control Register", "enc": [3, 6, 15, 2, 5 ], "width": 64},
{"index": 0, "name": "AIDR2_EL1", "fullname": "Apple ID Register 2", "enc": [3, 6, 15, 2, 7 ], "width": 64},
{"index": 0, "name": "SPRR_UMASK_EL1", "fullname": "SPRR Permission Unlock Mask (EL1)", "enc": [3, 6, 15, 3, 0 ], "width": 32},
{"index": 0, "name": "SPRR_KMASK_EL1", "fullname": "SPRR Kernel Permission Unlock Mask (EL1)", "enc": [3, 6, 15, 3, 1 ], "width": 32},
{"index": 0, "name": "SPRR_KMASK_EL2", "fullname": "SPRR Kernel Permission Unlock Mask (EL2)", "enc": [3, 6, 15, 3, 2 ], "width": 32},
{"index": 0, "name": "SPRR_UMASK0_EL1", "fullname": "SPRR Permission Unlock Mask 0 (EL1)", "enc": [3, 6, 15, 3, 0 ], "width": 32},
{"index": 0, "name": "SPRR_KMASK0_EL1", "fullname": "SPRR Kernel Permission Unlock Mask 0 (EL1)", "enc": [3, 6, 15, 3, 1 ], "width": 32},
{"index": 0, "name": "SPRR_KMASK0_EL2", "fullname": "SPRR Kernel Permission Unlock Mask 0 (EL2)", "enc": [3, 6, 15, 3, 2 ], "width": 32},
{"index": 0, "name": "SPRR_UMASK1_EL1", "fullname": "SPRR Permission Unlock Mask 1 (EL1)", "enc": [3, 6, 15, 3, 3 ], "width": 32},
{"index": 0, "name": "SPRR_UMASK2_EL1", "fullname": "SPRR Permission Unlock Mask 2 (EL1)", "enc": [3, 6, 15, 3, 4 ], "width": 32},
{"index": 0, "name": "SPRR_UMASK3_EL1", "fullname": "SPRR Permission Unlock Mask 3 (EL1)", "enc": [3, 6, 15, 3, 5 ], "width": 32},
{"index": 0, "name": "SPRR_KMASK1_EL1", "fullname": "SPRR Kernel Permission Unlock Mask 1 (EL12)", "enc": [3, 6, 15, 4, 2 ], "width": 32},
{"index": 0, "name": "SPRR_KMASK2_EL1", "fullname": "SPRR Kernel Permission Unlock Mask 2 (EL12)", "enc": [3, 6, 15, 4, 3 ], "width": 32},
{"index": 0, "name": "SPRR_KMASK3_EL1", "fullname": "SPRR Kernel Permission Unlock Mask 3 (EL12)", "enc": [3, 6, 15, 4, 4 ], "width": 32},
{"index": 0, "name": "SPRR_KMASK1_EL2", "fullname": "SPRR Kernel Permission Unlock Mask 1 (EL12)", "enc": [3, 6, 15, 5, 1 ], "width": 32},
{"index": 0, "name": "SPRR_KMASK2_EL2", "fullname": "SPRR Kernel Permission Unlock Mask 2 (EL12)", "enc": [3, 6, 15, 5, 2 ], "width": 32},
{"index": 0, "name": "SPRR_KMASK3_EL2", "fullname": "SPRR Kernel Permission Unlock Mask 3 (EL12)", "enc": [3, 6, 15, 5, 3 ], "width": 32},
{"index": 0, "name": "SPRR_KMASK0_EL12", "fullname": "SPRR Kernel Permission Unlock Mask 0 (EL12)", "enc": [3, 6, 15, 6, 0 ], "width": 32},
{"index": 0, "name": "SPRR_KMASK1_EL12", "fullname": "SPRR Kernel Permission Unlock Mask 1 (EL12)", "enc": [3, 6, 15, 6, 1 ], "width": 32},
{"index": 0, "name": "SPRR_KMASK2_EL12", "fullname": "SPRR Kernel Permission Unlock Mask 2 (EL12)", "enc": [3, 6, 15, 6, 2 ], "width": 32},
{"index": 0, "name": "SPRR_KMASK3_EL12", "fullname": "SPRR Kernel Permission Unlock Mask 3 (EL12)", "enc": [3, 6, 15, 6, 3 ], "width": 32},
{"index": 0, "name": "APIAKeyLo_EL12", "fullname": "Pointer Authentication Key A for Instruction Low (EL12)", "enc": [3, 6, 15, 7, 0 ], "width": 64},
{"index": 0, "name": "APIAKeyHi_EL12", "fullname": "Pointer Authentication Key A for Instruction High (EL12)", "enc": [3, 6, 15, 7, 1 ], "width": 64},
{"index": 0, "name": "APIBKeyLo_EL12", "fullname": "Pointer Authentication Key A for Instruction Low (EL12)", "enc": [3, 6, 15, 7, 2 ], "width": 64},
@ -140,6 +159,10 @@
{"index": 0, "name": "GXF_ENTER_EL1", "fullname": "GXF genter Entry Vector Register (EL1)", "enc": [3, 6, 15, 8, 1 ], "width": 64},
{"index": 0, "name": "GXF_ABORT_EL1", "fullname": "GXF Abort Vector Register (EL1)", "enc": [3, 6, 15, 8, 2 ], "width": 64},
{"index": 0, "name": "VBAR_GL12", "fullname": "Vector Base Address Register (GL12)", "enc": [3, 6, 15, 9, 2 ], "width": 64},
{"index": 0, "name": "SPSR_GL12", "fullname": "Saved Program Status Register (GL12)", "enc": [3, 6, 15, 9, 3 ], "width": 64},
{"index": 0, "name": "ASPSR_GL12", "fullname": "ASPSR (GL12)", "enc": [3, 6, 15, 9, 4 ], "width": 64},
{"index": 0, "name": "ESR_GL12", "fullname": "Exception Syndrome Register (GL12)", "enc": [3, 6, 15, 9, 5 ], "width": 64},
{"index": 0, "name": "ELR_GL12", "fullname": "Exception Link Register (GL12)", "enc": [3, 6, 15, 9, 6 ], "width": 64},
{"index": 0, "name": "SP_GL12", "fullname": "Stack Pointer Register (GL12)", "enc": [3, 6, 15, 10, 0 ], "width": 64},
{"index": 0, "name": "TPIDR_GL1", "fullname": "Software Thread ID Register (GL1)", "enc": [3, 6, 15, 10, 1 ], "width": 64},
{"index": 0, "name": "VBAR_GL1", "fullname": "Vector Base Address Register (GL1)", "enc": [3, 6, 15, 10, 2 ], "width": 64},
@ -155,6 +178,8 @@
{"index": 0, "name": "ESR_GL2", "fullname": "Exception Syndrome Register (GL2)", "enc": [3, 6, 15, 11, 5 ], "width": 64},
{"index": 0, "name": "ELR_GL2", "fullname": "Exception Link Register (GL2)", "enc": [3, 6, 15, 11, 6 ], "width": 64},
{"index": 0, "name": "FAR_GL2", "fullname": "Fault Address Register (GL2)", "enc": [3, 6, 15, 11, 7 ], "width": 64},
{"index": 0, "name": "GXF_ENTER_EL2", "fullname": "GXF genter Entry Vector Register (EL2)", "enc": [3, 6, 15, 12, 0 ], "width": 64},
{"index": 0, "name": "GXF_ABORT_EL2", "fullname": "GXF Abort Vector Register (EL2)", "enc": [3, 6, 15, 12, 1 ], "width": 64},
{"index": 0, "name": "APCTL_EL2", "fullname": "Pointer Authentication Control (EL2)", "enc": [3, 6, 15, 12, 2 ], "width": 64},
{"index": 0, "name": "APSTS_EL2_MAYBE", "fullname": "Pointer Authentication Status (EL2, maybe)", "enc": [3, 6, 15, 12, 3 ], "width": 64},
{"index": 0, "name": "APSTS_EL1", "fullname": "Pointer Authentication Status", "enc": [3, 6, 15, 12, 4 ], "width": 64},