Added 7.0x Support (#36)

* Added support for the remaining 5xx firmwares.

* Added 7.0x Support

* Added GAD_POP_RSP_RET To 5.xx

README.md

@@ -21,7 +21,7 @@ Features:
 - **4.00**, **4.02**, **4.03**, **4.50**, **4.51** with M.2 support
 - **5.00**, **5.02**, **5.10**, **5.50** with M.2 support
 - **6.00**, **6.02**, **6.50** with M.2 support
-- **7.20**, **7.61** with M.2 support
+- **7.00**, **7.01**, **7.20**, **7.40**, **7.60**, **7.61** with M.2 support
 
 Support for 1.xx and 2.xx firmwares may be added in the future, but we will not prioritize this effort.
 

include/offsets.h

@@ -68,7 +68,11 @@ extern offset_list off_0550;
 extern offset_list off_0600;
 extern offset_list off_0602;
 extern offset_list off_0650;
+extern offset_list off_0700;
+extern offset_list off_0701;
 extern offset_list off_0720;
+extern offset_list off_0740;
+extern offset_list off_0760;
 extern offset_list off_0761;
 
 #endif

source/hv_defeat_0607.c

@@ -29,7 +29,7 @@ static void setidt(int idx, uintptr_t func, int typ, int dpl, int ist) {
 }
 
 static uint64_t get_hv_stack(void) {
-  if (fw >= 0x0720 && fw < 0x0800) {
+  if (fw >= 0x0700 && fw < 0x0800) {
     return 0x628ec000;
   }
   if (fw == 0x0650) {

source/offsets.c

@@ -238,6 +238,7 @@ offset_list off_0500 = {
     .GAD_POP_RSI_RET = (0xffffffff803a92b0 - KERNEL_TEXT),
     .GAD_POP_RDX_RET = (0xffffffff8040dafc - KERNEL_TEXT),
     // .GAD_POP_RCX_RET not needed
+	.GAD_POP_RSP_RET = (0xffffffff804510b0 - KERNEL_TEXT),
     // .GAD_WRMSR_RET not needed
     .GAD_MOV_QWORD_PTR_RDI_RSI_POP_RBP_RET = (0xffffffff80603c0a - KERNEL_TEXT),
     // .HOOK_ACPI_WAKEUP_MACHDEP not needed
@@ -279,6 +280,7 @@ offset_list off_0502 = {
     .GAD_POP_RSI_RET = (0xffffffff803a92b0 - KERNEL_TEXT),
     .GAD_POP_RDX_RET = (0xffffffff8054d532 - KERNEL_TEXT),
     // .GAD_POP_RCX_RET not needed
+	.GAD_POP_RSP_RET = (0xffffffff804510b0 - KERNEL_TEXT),
     // .GAD_WRMSR_RET not needed
     .GAD_MOV_QWORD_PTR_RDI_RSI_POP_RBP_RET = (0xffffffff80603c0a - KERNEL_TEXT),
     // .HOOK_ACPI_WAKEUP_MACHDEP not needed
@@ -320,6 +322,7 @@ offset_list off_0510 = {
     .GAD_POP_RSI_RET = (0xffffffff803a92b0 - KERNEL_TEXT),
     .GAD_POP_RDX_RET = (0xffffffff8054d532 - KERNEL_TEXT),
     // .GAD_POP_RCX_RET not needed
+	.GAD_POP_RSP_RET = (0xffffffff804510b0 - KERNEL_TEXT),
     // .GAD_WRMSR_RET not needed
     .GAD_MOV_QWORD_PTR_RDI_RSI_POP_RBP_RET = (0xffffffff80603c0a - KERNEL_TEXT),
     // .HOOK_ACPI_WAKEUP_MACHDEP not needed
@@ -361,6 +364,7 @@ offset_list off_0550 = {
     .GAD_POP_RSI_RET = (0xffffffff803a9270 - KERNEL_TEXT),
     .GAD_POP_RDX_RET = (0xffffffff8054d4f2 - KERNEL_TEXT),
     // .GAD_POP_RCX_RET not needed
+	.GAD_POP_RSP_RET = (0xffffffff80451070 - KERNEL_TEXT),
     // .GAD_WRMSR_RET not needed
     .GAD_MOV_QWORD_PTR_RDI_RSI_POP_RBP_RET = (0xffffffff80603cba - KERNEL_TEXT),
     // .HOOK_ACPI_WAKEUP_MACHDEP not needed
@@ -510,6 +514,90 @@ offset_list off_0650 = {
     .PS5_WIFI_FW_SIZE = 494536,
 };
 
+offset_list off_0700 = {
+    // .IOMMU_SOFTC not needed
+    // .VMSPACE_VM_VMID not needed
+    .VMSPACE_VM_PMAP = 0x1D8,
+    // .DATA_BASE_GVMSPACE not needed
+    .ACPIGBL_FACS = (0xFFFFFFFF83AC9C50 - KERNEL_TEXT),
+    .IDT = (0xFFFFFFFF83CDFDF0 - KERNEL_TEXT),
+    .COMMON_TSS = (0xFFFFFFFF83CE2AB0 - KERNEL_TEXT),
+    // .STOPPED_CPUS not needed
+    // .FUN_STOP_CPUS not needed
+    // .FUN_AS_LAPIC_EOI not needed
+    // .FUN_HV_UNMAP_PT_TMR not needed
+    .FUN_MEMCPY = (0xFFFFFFFF804933C0 - KERNEL_TEXT),
+    .GAD_ADD_RSP_28_POP_RBP_RET = (0xFFFFFFFF80C431AF - KERNEL_TEXT),
+    .GAD_IRETQ = (0xffffffff804545cd - KERNEL_TEXT),
+    .GAD_POP_RAX_RET = (0xffffffff8040e790 - KERNEL_TEXT),
+    .GAD_POP_RDI_RET = (0xffffffff803f1b38 - KERNEL_TEXT),
+    .GAD_POP_RSI_RET = (0xffffffff803b2670 - KERNEL_TEXT),
+    .GAD_POP_RDX_RET = (0xffffffff80333ec2 - KERNEL_TEXT),
+    .GAD_POP_RCX_RET = (0xffffffff804e1fc1 - KERNEL_TEXT),
+    .GAD_POP_RSP_RET = (0xffffffff8045a610 - KERNEL_TEXT),
+    .GAD_WRMSR_RET = (0xffffffff80451ac4 - KERNEL_TEXT),
+    // .GAD_MOV_QWORD_PTR_RDI_RSI_POP_RBP_RET not needed
+    // .HOOK_ACPI_WAKEUP_MACHDEP not needed
+    .KERNEL_CODE_CAVE = 0x500,
+    .FUN_PRINTF = (0xFFFFFFFF806CC530 - KERNEL_TEXT),
+    // .FUN_HV_IOMMU_SET_BUFFERS not needed
+    // .FUN_HV_IOMM_WAIT_COMPLETION not needed
+    .FUN_SMP_RENDEZVOUS = (0xFFFFFFFF80CB5CB0 - KERNEL_TEXT),
+    .FUN_SMP_NO_RENDEVOUS_BARRIER = (0xFFFFFFFF804BB4C8 - KERNEL_TEXT),
+    .HV_CODE_CAVE_PA = 0x62806F00,
+    .HV_HANDLE_VMEXIT_PA = 0x6283D800,
+    .KERNEL_UART_OVERRIDE = (0xFFFFFFFF822C3338 - KERNEL_TEXT),
+    .KERNEL_CFI_CHECK = (0xFFFFFFFF806854A0 - KERNEL_TEXT),
+    .G_VBIOS = (0xffffffff83ef7a40 - KERNEL_TEXT),
+    .FUN_TRANSMITTER_CONTROL = (0xFFFFFFFF80DAECC0 - KERNEL_TEXT),
+    .FUN_MP3_INITIALIZE = (0xFFFFFFFF80BCB5C0 - KERNEL_TEXT),
+    .FUN_MP3_INVOKE = (0xFFFFFFFF80BCA380 - KERNEL_TEXT),
+    .PS5_WIFI_FW_OFFSET = (0xFFFFFFFF81655400 - KERNEL_TEXT),
+    .PS5_WIFI_FW_SIZE = 497636,
+};
+
+offset_list off_0701 = {
+    // .IOMMU_SOFTC not needed
+    // .VMSPACE_VM_VMID not needed
+    .VMSPACE_VM_PMAP = 0x1D8,
+    // .DATA_BASE_GVMSPACE not needed
+    .ACPIGBL_FACS = (0xFFFFFFFF83AC9C50 - KERNEL_TEXT),
+    .IDT = (0xFFFFFFFF83CDFDF0 - KERNEL_TEXT),
+    .COMMON_TSS = (0xFFFFFFFF83CE2AB0 - KERNEL_TEXT),
+    // .STOPPED_CPUS not needed
+    // .FUN_STOP_CPUS not needed
+    // .FUN_AS_LAPIC_EOI not needed
+    // .FUN_HV_UNMAP_PT_TMR not needed
+    .FUN_MEMCPY = (0xFFFFFFFF804933C0 - KERNEL_TEXT),
+    .GAD_ADD_RSP_28_POP_RBP_RET = (0xFFFFFFFF80C431AF - KERNEL_TEXT),
+    .GAD_IRETQ = (0xffffffff804545cd - KERNEL_TEXT),
+    .GAD_POP_RAX_RET = (0xffffffff8040e790 - KERNEL_TEXT),
+    .GAD_POP_RDI_RET = (0xffffffff803f1b38 - KERNEL_TEXT),
+    .GAD_POP_RSI_RET = (0xffffffff803b2670 - KERNEL_TEXT),
+    .GAD_POP_RDX_RET = (0xffffffff805451e2 - KERNEL_TEXT),
+    .GAD_POP_RCX_RET = (0xffffffff804e1fc1 - KERNEL_TEXT),
+    .GAD_POP_RSP_RET = (0xffffffff8045a610 - KERNEL_TEXT),
+    .GAD_WRMSR_RET = (0xffffffff80451ac4 - KERNEL_TEXT),
+    // .GAD_MOV_QWORD_PTR_RDI_RSI_POP_RBP_RET not needed
+    // .HOOK_ACPI_WAKEUP_MACHDEP not needed
+    .KERNEL_CODE_CAVE = 0x500,
+    .FUN_PRINTF = (0xFFFFFFFF806CC530 - KERNEL_TEXT),
+    // .FUN_HV_IOMMU_SET_BUFFERS not needed
+    // .FUN_HV_IOMM_WAIT_COMPLETION not needed
+    .FUN_SMP_RENDEZVOUS = (0xFFFFFFFF80CB5CB0 - KERNEL_TEXT),
+    .FUN_SMP_NO_RENDEVOUS_BARRIER = (0xFFFFFFFF804BA8F8 - KERNEL_TEXT),
+    .HV_CODE_CAVE_PA = 0x62806F00,
+    .HV_HANDLE_VMEXIT_PA = 0x6283D800,
+    .KERNEL_UART_OVERRIDE = (0xFFFFFFFF822C3338 - KERNEL_TEXT),
+    .KERNEL_CFI_CHECK = (0xFFFFFFFF806854A0 - KERNEL_TEXT),
+    .G_VBIOS = (0xffffffff83ef7a40 - KERNEL_TEXT),
+    .FUN_TRANSMITTER_CONTROL = (0xFFFFFFFF80DAECC0 - KERNEL_TEXT),
+    .FUN_MP3_INITIALIZE = (0xFFFFFFFF80BCB5C0 - KERNEL_TEXT),
+    .FUN_MP3_INVOKE = (0xFFFFFFFF80BCA380 - KERNEL_TEXT),
+    .PS5_WIFI_FW_OFFSET = (0xFFFFFFFF81655400 - KERNEL_TEXT),
+    .PS5_WIFI_FW_SIZE = 497636,
+};
+
 offset_list off_0720 = {
     // .IOMMU_SOFTC not needed
     // .VMSPACE_VM_VMID not needed
@@ -552,6 +640,90 @@ offset_list off_0720 = {
     .PS5_WIFI_FW_SIZE = 497636,
 };
 
+offset_list off_0740 = {
+    // .IOMMU_SOFTC not needed
+    // .VMSPACE_VM_VMID not needed
+    .VMSPACE_VM_PMAP = 0x1D8,
+    // .DATA_BASE_GVMSPACE not needed
+    .ACPIGBL_FACS = (0xFFFFFFFF83AC9C50 - KERNEL_TEXT),
+    .IDT = (0xFFFFFFFF83CDFDF0 - KERNEL_TEXT),
+    .COMMON_TSS = (0xFFFFFFFF83CE2AD0 - KERNEL_TEXT),
+    // .STOPPED_CPUS not needed
+    // .FUN_STOP_CPUS not needed
+    // .FUN_AS_LAPIC_EOI not needed
+    // .FUN_HV_UNMAP_PT_TMR not needed
+    .FUN_MEMCPY = (0xFFFFFFFF80493600 - KERNEL_TEXT),
+    .GAD_ADD_RSP_28_POP_RBP_RET = (0xffffffff80c435ff - KERNEL_TEXT),
+    .GAD_IRETQ = (0xffffffff8045480d - KERNEL_TEXT),
+    .GAD_POP_RAX_RET = (0xffffffff8040e9d0 - KERNEL_TEXT),
+    .GAD_POP_RDI_RET = (0xffffffff803f1d78 - KERNEL_TEXT),
+    .GAD_POP_RSI_RET = (0xffffffff803b28b0 - KERNEL_TEXT),
+    .GAD_POP_RDX_RET = (0xffffffff805cd53c - KERNEL_TEXT),
+    .GAD_POP_RCX_RET = (0xffffffff80e24def - KERNEL_TEXT),
+    .GAD_POP_RSP_RET = (0xffffffff8045a850 - KERNEL_TEXT),
+    .GAD_WRMSR_RET = (0xffffffff80451d04 - KERNEL_TEXT),
+    // .GAD_MOV_QWORD_PTR_RDI_RSI_POP_RBP_RET not needed
+    // .HOOK_ACPI_WAKEUP_MACHDEP not needed
+    .KERNEL_CODE_CAVE = 0x500,
+    .FUN_PRINTF = (0xffffffff804b19f0 - KERNEL_TEXT),//0xffffffff806cc830
+    // .FUN_HV_IOMMU_SET_BUFFERS not needed
+    // .FUN_HV_IOMM_WAIT_COMPLETION not needed
+    .FUN_SMP_RENDEZVOUS = (0xffffffff80cb6100  - KERNEL_TEXT),
+    .FUN_SMP_NO_RENDEVOUS_BARRIER = (0xffffffff804badf0 - KERNEL_TEXT),
+    .HV_CODE_CAVE_PA = 0x62806F00,
+    .HV_HANDLE_VMEXIT_PA = 0x6283D800,
+    .KERNEL_UART_OVERRIDE = (0xFFFFFFFF822C33F8 - KERNEL_TEXT),
+    .KERNEL_CFI_CHECK = (0xffffffff806857a0 - KERNEL_TEXT),
+    .G_VBIOS = (0xFFFFFFFF83EF7A40 - KERNEL_TEXT),
+    .FUN_TRANSMITTER_CONTROL = (0xffffffff80dafcc0 - KERNEL_TEXT),
+    .FUN_MP3_INITIALIZE = (0xffffffff80bcba10 - KERNEL_TEXT),
+    .FUN_MP3_INVOKE = (0xffffffff80bca7d0 - KERNEL_TEXT),
+    .PS5_WIFI_FW_OFFSET = (0xffffffff81655700 - KERNEL_TEXT),
+    .PS5_WIFI_FW_SIZE = 497636,
+};
+
+offset_list off_0760 = {
+    // .IOMMU_SOFTC not needed
+    // .VMSPACE_VM_VMID not needed
+    .VMSPACE_VM_PMAP = 0x1D8,
+    // .DATA_BASE_GVMSPACE not needed
+    .ACPIGBL_FACS = (0xFFFFFFFF83AC9C50 - KERNEL_TEXT),
+    .IDT = (0xFFFFFFFF83CDFDF0 - KERNEL_TEXT),
+    .COMMON_TSS = (0xFFFFFFFF83CE2AD0 - KERNEL_TEXT),
+    // .STOPPED_CPUS not needed
+    // .FUN_STOP_CPUS not needed
+    // .FUN_AS_LAPIC_EOI not needed
+    // .FUN_HV_UNMAP_PT_TMR not needed
+    .FUN_MEMCPY = (0xFFFFFFFF80493600 - KERNEL_TEXT),
+    .GAD_ADD_RSP_28_POP_RBP_RET = (0xffffffff80b9da44 - KERNEL_TEXT),
+    .GAD_IRETQ = (0xFFFFFFFF8045480D - KERNEL_TEXT),
+    .GAD_POP_RAX_RET = (0xffffffff8040e9d0 - KERNEL_TEXT), 
+    .GAD_POP_RDI_RET = (0xffffffff803f1d78 - KERNEL_TEXT),
+    .GAD_POP_RSI_RET = (0xffffffff803b28b0 - KERNEL_TEXT),
+    .GAD_POP_RDX_RET = (0xffffffff8078d502 - KERNEL_TEXT),
+    .GAD_POP_RCX_RET = (0xffffffff804e2231 - KERNEL_TEXT),
+    .GAD_POP_RSP_RET = (0xffffffff8045a850 - KERNEL_TEXT),
+    .GAD_WRMSR_RET = (0xffffffff80451d04 - KERNEL_TEXT),
+    // .GAD_MOV_QWORD_PTR_RDI_RSI_POP_RBP_RET not needed
+    // .HOOK_ACPI_WAKEUP_MACHDEP not needed
+    .KERNEL_CODE_CAVE = 0x500,
+    .FUN_PRINTF = (0xFFFFFFFF804B1DB8 - KERNEL_TEXT), 
+    // .FUN_HV_IOMMU_SET_BUFFERS not needed
+    // .FUN_HV_IOMM_WAIT_COMPLETION not needed
+    .FUN_SMP_RENDEZVOUS = (0xFFFFFFFF80CB6710  - KERNEL_TEXT),
+    .FUN_SMP_NO_RENDEVOUS_BARRIER = (0xFFFFFFFF804BD280 - KERNEL_TEXT),
+    .HV_CODE_CAVE_PA = 0x62806F00, 
+    .HV_HANDLE_VMEXIT_PA = 0x6283D800,
+    .KERNEL_UART_OVERRIDE = (0xFFFFFFFF822C33F8 - KERNEL_TEXT),
+    .KERNEL_CFI_CHECK = (0xFFFFFFFF806857B0 - KERNEL_TEXT),
+    .G_VBIOS = (0xFFFFFFFF83EF7A40 - KERNEL_TEXT),
+    .FUN_TRANSMITTER_CONTROL = (0xFFFFFFFF80DB02D0 - KERNEL_TEXT),
+    .FUN_MP3_INITIALIZE = (0xFFFFFFFF80BCC020 - KERNEL_TEXT),
+    .FUN_MP3_INVOKE = (0xFFFFFFFF80BCADE0 - KERNEL_TEXT),
+    .PS5_WIFI_FW_OFFSET = (0xFFFFFFFF81655800 - KERNEL_TEXT),
+    .PS5_WIFI_FW_SIZE = 497636,
+};
+
 offset_list off_0761 = {
     // .IOMMU_SOFTC not needed
     // .VMSPACE_VM_VMID not needed

source/utils.c

@@ -79,9 +79,21 @@ int set_offsets(void) {
   case 0x0650:
     env_offset = off_0650;
     break;
+  case 0x0700:
+    env_offset = off_0700;
+    break;
+  case 0x0701:
+    env_offset = off_0701;
+    break;
   case 0x0720:
     env_offset = off_0720;
     break;
+  case 0x0740:
+    env_offset = off_0740;
+    break;
+  case 0x0760:
+    env_offset = off_0760;
+    break;
   case 0x0761:
     env_offset = off_0761;
     break;