From 248011f7a17f5e25da14fb343fa1c6aeff5e5295 Mon Sep 17 00:00:00 2001 From: Hector Martin Date: Thu, 13 May 2021 21:28:31 +0900 Subject: [PATCH] apple_regs.json: Correct VM pauth registers Signed-off-by: Hector Martin --- tools/apple_regs.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/apple_regs.json b/tools/apple_regs.json index f44819f5..9fdefa3f 100644 --- a/tools/apple_regs.json +++ b/tools/apple_regs.json @@ -155,9 +155,11 @@ {"index": 0, "name": "APSTS_EL1", "fullname": "Pointer Authentication Status", "enc": [3, 6, 15, 12, 4 ], "width": 64}, {"index": 0, "name": "SPRR_CONFIG_EL2", "fullname": "SPRR Configuration Register (EL2)", "enc": [3, 6, 15, 14, 2 ], "width": 64}, {"index": 0, "name": "SPRR_UNK1_EL2", "fullname": "SPRR Unknown (EL2)", "enc": [3, 6, 15, 14, 3 ], "width": 64}, + {"index": 0, "name": "APVMKEYLO_EL2", "fullname": "Pointer Authentication VM Machine Key Low", "enc": [3, 6, 15, 14, 4 ], "width": 64}, + {"index": 0, "name": "APVMKEYHI_EL2", "fullname": "Pointer Authentication VM Machine Key High", "enc": [3, 6, 15, 14, 5 ], "width": 64}, {"index": 0, "name": "ACTLR_EL12", "fullname": "Auxiliary Control Register (EL12)", "enc": [3, 6, 15, 14, 6 ], "width": 64}, + {"index": 0, "name": "APSTS_EL12", "fullname": "Pointer Authentication Status (EL12)", "enc": [3, 6, 15, 14, 7 ], "width": 64}, {"index": 0, "name": "APCTL_EL12", "fullname": "Pointer Authentication Control (EL12)", "enc": [3, 6, 15, 15, 0 ], "width": 64}, - {"index": 0, "name": "APSTS_EL12_MAYBE", "fullname": "Pointer Authentication Status (EL12, maybe)", "enc": [3, 6, 15, 15, 1 ], "width": 64}, {"index": 0, "name": "GXF_ENTER_EL12", "fullname": "GXF genter Entry Vector Register (EL12)", "enc": [3, 6, 15, 15, 2 ], "width": 64}, {"index": 0, "name": "GXF_ABORT_EL12", "fullname": "GXF Abort Vector Register (EL12)", "enc": [3, 6, 15, 15, 3 ], "width": 64}, {"index": 0, "name": "SPRR_CONFIG_EL12", "fullname": "SPRR Configuration Register (EL12)", "enc": [3, 6, 15, 15, 4 ], "width": 64},