Added 8.20 Support

Author: EchoStretch

prosper0gdb/offsets.c

@@ -2221,6 +2221,100 @@ DEF(lapic_map, 0x28cf838)
 #include "offset_list.txt"
 END_FW()
 
+START_FW(820)
+DEF(allproc, 0x2875d50) 
+DEF(idt, 0x2eb3df0) 
+DEF(gdt_array, 0x2eb50d0) 
+DEF(tss_array, 0x2eb6ad0) 
+DEF(pcpu_array, 0x2ec8a00) 
+DEF(doreti_iret, -0xA28C73) 
+DEF(add_rsp_iret, doreti_iret - 7)
+DEF(swapgs_add_rsp_iret, doreti_iret - 10)
+DEF(rep_movsb_pop_rbp_ret, -0x9EC5C6) 
+DEF(rdmsr_start, -0xA2A3AA) 
+DEF(wrmsr_ret, -0xA2B77C) 
+DEF(dr2gpr_start, -0xA2FD93)
+DEF(gpr2dr_1_start, -0xA2FC7A)
+DEF(gpr2dr_2_start, -0xA2FB87)
+DEF(mov_cr3_rax_mov_ds, -0xA2F7E9) 
+DEF(mov_rax_cr3, -0x3B721F)
+DEF(nop_ret, wrmsr_ret + 2)
+DEF(cpu_switch, -0xA2FF80) 
+DEF(mprotect_fix_start, -0x965114) 
+DEF(mprotect_fix_end, mprotect_fix_start+6)
+
+DEF(mmap_self_fix_1_start, -0x0)
+DEF(mmap_self_fix_1_end, mmap_self_fix_1_start+2)
+DEF(mmap_self_fix_2_start, -0x0)
+DEF(mmap_self_fix_2_end, mmap_self_fix_2_start+2)
+
+DEF(aslr_fix_start, -0x8B12A1)
+DEF(aslr_fix_end, aslr_fix_start+2)
+
+DEF(sigaction_fix_start, -0x708140) 
+DEF(sigaction_fix_end, -0x708124) 
+DEF(sysents, 0x1a7db0) 
+DEF(sysents_ps4, 0x19f800) 
+DEF(sysentvec, 0xE21CA8) 
+DEF(sysentvec_ps4, 0xE21E20) 
+DEF(sceSblServiceMailbox, -0x6C4430)
+DEF(sceSblAuthMgrSmIsLoadable2, -0x900F10)
+DEF(mdbg_call_fix, -0x66EFC9) 
+DEF(syscall_before, -0x856F71) 
+DEF(syscall_after, -0x856F4D) 
+DEF(malloc, -0xB9E90) 
+DEF(M_something, 0x1457980) 
+DEF(loadSelfSegment_epilogue, -0x9007EB)
+DEF(loadSelfSegment_watchpoint, -0x2EB8F8)
+DEF(loadSelfSegment_watchpoint_lr, -0x900A57)
+DEF(decryptSelfBlock_watchpoint_lr, -0x9006BF)
+DEF(decryptSelfBlock_epilogue, -0x9005FE)
+//DEF(decryptMultipleSelfBlocks_watchpoint_lr, -0x8FFF81) //403
+DEF(decryptMultipleSelfBlocks_watchpoint_lr, -0x8FFF88)
+DEF(decryptMultipleSelfBlocks_epilogue, -0x8FFD57)
+DEF(sceSblServiceMailbox_lr_verifyHeader, -0x900BF7)
+DEF(sceSblServiceMailbox_lr_loadSelfSegment, -0x90085F)
+DEF(sceSblServiceMailbox_lr_decryptSelfBlock, -0x90029D)
+DEF(sceSblServiceMailbox_lr_decryptMultipleSelfBlocks, -0x8FFAB3)
+DEF(sceSblServiceMailbox_lr_sceSblAuthMgrSmFinalize, -0x900F88)
+DEF(sceSblServiceMailbox_lr_verifySuperBlock, -0x9A5693)
+DEF(sceSblServiceMailbox_lr_sceSblPfsClearKey_1, -0x9A5C11)
+DEF(sceSblServiceMailbox_lr_sceSblPfsClearKey_2, -0x9A5BA5)
+DEF(sceSblServiceMailbox_lr_npdrm_cmd_5, -0x33C403)
+DEF(sceSblServiceMailbox_lr_npdrm_cmd_6, -0x33C1D5)
+//DEF(sceSblPfsSetKeys, -0x9A5930) //403
+DEF(sceSblPfsSetKeys, -0x9A6780)
+DEF(sceSblServiceCryptAsync, -0x946F60)
+DEF(sceSblServiceCryptAsync_deref_singleton, -0x946F23)
+DEF(copyin, -0x9ECE90) 
+DEF(copyout, -0x9ECF40) 
+DEF(crypt_message_resolve, -0x49C990)
+DEF(justreturn, -0xA28EA0) 
+DEF(justreturn_pop, justreturn+8)
+DEF(mini_syscore_header, 0xED4FA8) 
+DEF(pop_all_iret, -0xA28CD2) 
+DEF(pop_all_except_rdi_iret, pop_all_iret+4)
+DEF(push_pop_all_iret, -0x9ca2b8) 
+DEF(kernel_pmap_store, 0x2e48848) 
+DEF(crypt_singleton_array, 0x2d8d830) 
+DEF(security_flags, 0xAC3064)
+DEF(targetid, 0xAC306D)
+DEF(qa_flags, 0xAC3088)
+DEF(utoken, 0xAC30F0)
+DEF(mov_rax_cr0, -0xA2FEE1)
+DEF(mov_cr0_rax, -0xA2FEDC)
+DEF(mov_rdi_cr2, -0xA2C10A) 
+DEF(lgdt_rdi, -0x9EC7A0) 
+DEF(lidt_lldt, -0xA2F731) 
+DEF(ltr_ax, -0xA2F70F) 
+DEF(kproc_shutdown, -0x9c6908) 
+DEF(s_shutdown_final, 0x379133) 
+DEF(eventhandler_register, -0x54B1C0) 
+DEF(strlen_trap, -0x46ACB8)
+DEF(lapic_map, 0x28cf838)
+#include "offset_list.txt"
+END_FW()
+
 void* dlsym(void*, const char*);
 
 int set_offsets(void)
@@ -2252,6 +2346,7 @@ int set_offsets(void)
     case 0x760: set_offsets_760(); break;
     case 0x761: set_offsets_761(); break;
     case 0x800: set_offsets_800(); break;
+    case 0x820: set_offsets_820(); break;
 #endif
     default: return -1;
     }

ps5-kstuff/main.c

@@ -1102,6 +1102,38 @@ static struct shellcore_patch shellcore_patches_800[] = {
     {0x6b77b0, "\x48\x31\xc0\xc3", 4}, // PKG Installer
 };
 
+static struct shellcore_patch shellcore_patches_820[] = {
+    {0xBAF83E, "\x52\xeb\x08", 3}, //push rdx; jmp 0xBAF849 **
+    {0xBAF849, "\xe8\xe2\xf8\xff\xff\x58\xc3", 7}, //call 0xBAF130; pop rax; ret
+    {0xBAF121, "\xe9\xae\xfd\xff\xff", 5},  // jmp 0xBAEED4 **
+    {0xBAEED4, "\x31\xc0\x50\xe8\x54\x02\x00\x00\x58\xc3", 10}, //xor eax, eax; push rax; call 0xBAF130; pop rax; ret
+    {0x6B5673, "\xeb\x04", 2},
+    {0x2f1d22, "\xeb\x04", 2},
+    {0x2f2172, "\xeb\x04", 2},
+    {0x6d4b71, "\xeb", 1},
+    {0x6bd8b5, "\x90\xe9", 2},
+    {0x6d58bd, "\xeb", 1},
+    {0x6d6e39, "\x61\x01\x00\x00", 4}, // 0x6D6F9E **
+    {0x1f72e2, "\xe8\x29\x6b\x5c\x00\x31\xc9\xff\xc1\xe9\xb3\x02\x00\x00", 14}, // call 0x7BDE10; xor ecx; inc ecx; jmp 0x1f75a3
+    {0x1f75a3, "\x83\xf8\x02\x0f\x43\xc1\xe9\xa7\xfb\xff\xff", 11},//cmp eax, 2; cmovae eax, ecx; jmp 0x1F7155
+    {0x1f6f9e, "\xe9\x3f\x03\x00\x00", 5}, // JMP 0x1f72e2
+
+	{0x6F3870, "\xC3", 1}, // callback to sceRifManagerRegisterActivationCallback
+
+    {0x1607a20, "\x31\xc0\xc3", 3}, // VR2 Min Fw Check
+    {0xa33f36, "\xeb\x03", 2}, // disable game error message
+    {0x2ea7bb, "\x90\xe9", 2}, // PS4 Disc Installer Patch 1
+    {0x2ea839, "\x90\xe9", 2}, // PS5 Disc Installer Patch 1
+    {0x2ea93c, "\xeb", 1}, // PS4 PKG Installer Patch 1
+    {0x2eaa10, "\xeb", 1}, // PS5 PKG Installer Patch 1
+    {0x2eadf7, "\x90\xe9", 2}, // PS4 PKG Installer Patch 2
+    {0x2eaf7f, "\xeb", 1}, // PS5 PKG Installer Patch 2
+    {0x2eb33e, "\x90\xe9", 2}, // PS4 PKG Installer Patch 3
+    {0x2eb3d1, "\x90\xe9", 2}, // PS5 PKG Installer Patch 3
+    {0x6b438a, "\xeb", 1}, // PS4 PKG Installer Patch 4
+    {0x6b71d4, "\xeb", 1}, // PS5 PKG Installer Patch 4
+    {0x6ba660, "\x48\x31\xc0\xc3", 4}, // PKG Installer
+};
 
 extern char _start[];
 
@@ -1190,7 +1222,8 @@ static const struct shellcore_patch* get_shellcore_patches(size_t* n_patches)
     FW(740);
     FW(760);
     FW(761);
-    FW(800);	
+    FW(800);
+    FW(820);
     default:
         *n_patches = 1;
         return 0;
@@ -1806,6 +1839,31 @@ static struct PARASITES(14) parasites_800 = {
     }
 };
 
+static struct PARASITES(14) parasites_820 = {
+    .lim_syscall = 3,
+    .lim_fself = 12,
+    .lim_total = 14,
+    .parasites = {
+        /* syscall parasites */
+        {-0x85747E, R13},
+        {-0x3ACFBC, RSI},
+        {-0x3ACF7C, RSI},
+        /* fself parasites */
+        {-0x2EB6E6, RAX},
+        {-0x2EC238, RAX},
+        {-0x2EC100, RAX},
+        {-0x2EBE6B, RAX},
+        {-0x2EBB9D, RAX},
+        {-0x2EB866, RAX},
+        {-0x2EB85A, RAX},
+        {-0x9ED0EC, RDI},
+        {-0x2EBCD7, RAX},
+        /* unsorted parasites */
+        {-0x49C69F, RAX},
+        {-0x49C69F, R15},
+    }
+};
+
 static struct parasite_desc* get_parasites(size_t* desc_size)
 {
     uint32_t ver = r0gdb_get_fw_version() >> 16;
@@ -1880,7 +1938,10 @@ static struct parasite_desc* get_parasites(size_t* desc_size)
         return (void*)&parasites_761;	
     case 0x800:
         *desc_size = sizeof(parasites_800);
-        return (void*)&parasites_800;		
+        return (void*)&parasites_800;
+    case 0x820:
+        *desc_size = sizeof(parasites_820);
+        return (void*)&parasites_820;
     default:
         return 0;
 #else