ShuriZma
/
rpcs3
mirror of https://github.com/RPCS3/rpcs3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PPU: Fix access violation on logging

This commit is contained in:
Elad Ashkenazi 2024-06-23 18:34:18 +03:00
parent 945bfaf0ea
commit 87f5368d3c
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rpcs3/Emu/Cell/PPUFunction.h
View File

@ -305,6 +305,16 @@ public:
return addr + index * 8 + (is_code_addr ? 4 : 0);
}
bool is_func(u32 cia) const
{
if (cia % 4 || !addr || cia < addr)
{
return false;
}
return (cia - addr) / 8 < access().size();
}
// Allocation address
u32 addr = 0;

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

@ -2760,7 +2760,7 @@ void ppu_thread::fast_call(u32 addr, u64 rtoc, bool is_thread_entry)
const auto cia = _this->cia;
if (_this->current_function && vm::read32(cia) != ppu_instructions::SC(0))
if (_this->current_function && g_fxo->get<ppu_function_manager>().is_func(cia))
{
return fmt::format("PPU[0x%x] Thread (%s) [HLE:0x%08x, LR:0x%08x]", _this->id, *name_cache.get(), cia, _this->lr);
}