tools/apple_regs.json: Update some regs with stuff from XNU dumps

Signed-off-by: Hector Martin <[email protected]>

Author: marcan

tools/apple_regs.json

@@ -150,12 +150,13 @@
     {"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": "ACNTPCT_EL0",                 "fullname": "Physical timer counter register (pre-spec CNTPCTSS_EL0)",      "enc": [3, 4, 15, 10, 5 ], "width": 64},
+    {"index": 0, "name": "ACNTVCT_EL0",                 "fullname": "Virtual timer counter register (pre-spec CNTVCTSS_EL0)",       "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},
     {"index": 0, "name": "CTRR_A_UPR_EL2",              "fullname": "CTRR A Upper Address (EL2)",                                   "enc": [3, 4, 15, 11, 1 ], "width": 64},
     {"index": 0, "name": "CTRR_CTL_EL2",                "fullname": "CTRR Control (EL2)",                                           "enc": [3, 4, 15, 11, 4 ], "width": 64},
     {"index": 0, "name": "CTRR_LOCK_EL2",               "fullname": "CTRR Lock",                                                    "enc": [3, 4, 15, 11, 5 ], "width": 64},
+    {"index": 0, "name": "JCTL_EL0",                    "fullname": "JITBox Control (EL0)",                                         "enc": [3, 4, 15, 15, 6 ], "width": 64},
     {"index": 0, "name": "IPI_RR_LOCAL_EL1",            "fullname": "IPI Request Register (Local)",                                 "enc": [3, 5, 15, 0, 0  ], "width": 64},
     {"index": 0, "name": "IPI_RR_GLOBAL_EL1",           "fullname": "IPI Request Register (Global)",                                "enc": [3, 5, 15, 0, 1  ], "width": 64},
     {"index": 0, "name": "DPC_ERR_STS_EL1",             "fullname": "DPC Error Status",                                             "enc": [3, 5, 15, 0, 5  ], "width": 64},