mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-01-27 03:35:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

PPU Debug fix

Browse Source
This commit is contained in:
Nekotekina 2017-04-22 16:00:23 +03:00
parent 0f95736c36
commit a626bbf635
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -137,12 +137,12 @@ static bool ppu_fallback(ppu_thread& ppu, ppu_opcode_t op)
return false; return false;
} }
static std::unordered_map<u32, u32> s_ppu_toc; static std::unordered_map<u32, u32>* s_ppu_toc;
static bool ppu_check_toc(ppu_thread& ppu, ppu_opcode_t op) static bool ppu_check_toc(ppu_thread& ppu, ppu_opcode_t op)
{ {
// Compare TOC with expected value // Compare TOC with expected value
const auto found = s_ppu_toc.find(ppu.cia); const auto found = s_ppu_toc->find(ppu.cia);
if (ppu.gpr[2] != found->second) if (ppu.gpr[2] != found->second)
{ {
@ -878,19 +878,29 @@ extern void ppu_initialize()
} }
} }
idm::select<lv2_obj, lv2_prx>([](u32, lv2_prx& prx) std::vector<lv2_prx*> prx_list;
idm::select<lv2_obj, lv2_prx>([&](u32, lv2_prx& prx)
{
prx_list.emplace_back(&prx);
});
for (auto ptr : prx_list)
{ {
if (!Emu.IsStopped()) if (!Emu.IsStopped())
{ {
ppu_initialize(prx); ppu_initialize(*ptr);
} }
}); }
} }
extern void ppu_initialize(const ppu_module& info) extern void ppu_initialize(const ppu_module& info)
{ {
if (g_cfg_ppu_decoder.get() != ppu_decoder_type::llvm) if (g_cfg_ppu_decoder.get() != ppu_decoder_type::llvm)
{ {
// Temporarily
s_ppu_toc = fxm::get_always<std::unordered_map<u32, u32>>().get();
for (const auto& func : info.funcs) for (const auto& func : info.funcs)
{ {
for (auto& block : func.blocks) for (auto& block : func.blocks)
@ -900,7 +910,7 @@ extern void ppu_initialize(const ppu_module& info)
if (g_cfg_ppu_debug && func.size && func.toc != -1) if (g_cfg_ppu_debug && func.size && func.toc != -1)
{ {
s_ppu_toc.emplace(func.addr, func.toc); s_ppu_toc->emplace(func.addr, func.toc);
ppu_ref(func.addr) = ::narrow<u32>(reinterpret_cast<std::uintptr_t>(&ppu_check_toc)); ppu_ref(func.addr) = ::narrow<u32>(reinterpret_cast<std::uintptr_t>(&ppu_check_toc));
} }
} }