archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-03 21:41:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix PPU debug setting with PPU interpreter

Browse source
This commit is contained in:
Eladash 2023-06-19 18:05:50 +03:00 • committed by Ivan
parent 073b723c09
commit 441fbd63bb
1 changed files with 32 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

47
rpcs3/Emu/Cell/PPUThread.cpp
View file

@ -484,16 +484,37 @@ void ppu_reservation_fallback(ppu_thread& ppu)
} }
} }
static std::unordered_map<u32, u32>* s_ppu_toc; struct ppu_toc_manager
{
std::unordered_map<u32, u32> toc_map;
shared_mutex mutex;
};
static void ppu_check_toc(ppu_thread& ppu, ppu_opcode_t op, be_t<u32>* this_op, ppu_intrp_func* next_fn) static void ppu_check_toc(ppu_thread& ppu, ppu_opcode_t op, be_t<u32>* this_op, ppu_intrp_func* next_fn)
{ {
// Compare TOC with expected value ppu.cia = vm::get_addr(this_op);
const auto found = s_ppu_toc->find(ppu.cia);
if (ppu.gpr[2] != found->second)
{ {
ppu_log.error("Unexpected TOC (0x%x, expected 0x%x)", ppu.gpr[2], found->second); auto& toc_manager = g_fxo->get<ppu_toc_manager>();
reader_lock lock(toc_manager.mutex);
auto& ppu_toc = toc_manager.toc_map;
const auto found = ppu_toc.find(ppu.cia);
if (found != ppu_toc.end())
{
const u32 toc = atomic_storage<u32>::load(found->second);
// Compare TOC with expected value
if (toc != umax && ppu.gpr[2] != toc)
{
ppu_log.error("Unexpected TOC (0x%x, expected 0x%x)", ppu.gpr[2], toc);
atomic_storage<u32>::exchange(found->second, u32{umax});
}
}
} }
// Fallback to the interpreter function // Fallback to the interpreter function
@ -3385,13 +3406,6 @@ extern void ppu_initialize()
} }
} }
struct ppu_toc_manager
{
std::unordered_map<u32, u32> toc_map;
shared_mutex mutex;
};
bool ppu_initialize(const ppu_module& info, bool check_only) bool ppu_initialize(const ppu_module& info, bool check_only)
{ {
if (g_cfg.core.ppu_decoder != ppu_decoder_type::llvm) if (g_cfg.core.ppu_decoder != ppu_decoder_type::llvm)
@ -3401,8 +3415,11 @@ bool ppu_initialize(const ppu_module& info, bool check_only)
return false; return false;
} }
// Temporarily auto& toc_manager = g_fxo->get<ppu_toc_manager>();
s_ppu_toc = &g_fxo->get<ppu_toc_manager>().toc_map;
std::lock_guard lock(toc_manager.mutex);
auto& ppu_toc = toc_manager.toc_map;
for (const auto& func : info.funcs) for (const auto& func : info.funcs)
{ {
@ -3413,7 +3430,7 @@ bool ppu_initialize(const ppu_module& info, bool check_only)
if (g_cfg.core.ppu_debug && func.size && func.toc != umax) if (g_cfg.core.ppu_debug && func.size && func.toc != umax)
{ {
s_ppu_toc->emplace(func.addr, func.toc); ppu_toc.emplace(func.addr, func.toc);
ppu_ref(func.addr) = &ppu_check_toc; ppu_ref(func.addr) = &ppu_check_toc;
} }
} }