mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-03-14 10:21:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

PPU LLVM: Patch unregistered BLRs

Browse Source 
Fixes "Unregistered PPU Function" in "Jak and Daxter Collection"
This commit is contained in:
Eladash 2023-09-04 22:20:23 +03:00 committed by Elad Ashkenazi
parent eacfa36fe6
commit ff4485d8ae
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
rpcs3/Emu/Cell/PPUThread.cpp
View File

@ -4662,6 +4662,9 @@ bool ppu_initialize(const ppu_module& info, bool check_only)
#ifdef __APPLE__
pthread_jit_write_protect_np(false);
#endif
// Try to patch all single and unregistered BLRs with the same function (TODO: Maybe generalize it into PIC code detection and patching)
ppu_intrp_func_t BLR_func = nullptr;
if (jit && !jit_mod.init)
{
jit->fin();
@ -4675,6 +4678,11 @@ bool ppu_initialize(const ppu_module& info, bool check_only)
const auto addr = ensure(reinterpret_cast<ppu_intrp_func_t>(jit->get(name)));
jit_mod.funcs.emplace_back(addr);
if (func.size == 4 & !BLR_func && *info.get_ptr<u32>(func.addr) == ppu_instructions::BLR())
{
BLR_func = addr;
}
ppu_register_function_at(func.addr, 4, addr);
if (g_cfg.core.ppu_debug)
@ -4694,6 +4702,11 @@ bool ppu_initialize(const ppu_module& info, bool check_only)
const u64 addr = reinterpret_cast<uptr>(ensure(jit_mod.funcs[index++]));
if (func.size == 4 & !BLR_func && *info.get_ptr<u32>(func.addr) == ppu_instructions::BLR())
{
BLR_func = reinterpret_cast<ppu_intrp_func_t>(addr);
}
ppu_register_function_at(func.addr, 4, addr);
if (g_cfg.core.ppu_debug)
@ -4703,6 +4716,19 @@ bool ppu_initialize(const ppu_module& info, bool check_only)
index = 0;
}
if (BLR_func)
{
auto inst_ptr = info.get_ptr<u32>(info.segs[0].addr);
for (u32 addr = info.segs[0].addr; addr < info.segs[0].addr + info.segs[0].size; addr += 4, inst_ptr++)
{
if (*inst_ptr == ppu_instructions::BLR() && (reinterpret_cast<uptr>(ppu_ref(addr)) << 16 >> 16) == reinterpret_cast<uptr>(ppu_recompiler_fallback_ghc))
{
ppu_register_function_at(addr, 4, BLR_func);
}
}
}
return compiled_new;
#else
fmt::throw_exception("LLVM is not available in this build.");