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

PPU debugger: Make calling history detect common LLE functions trampolines

Browse source
This commit is contained in:
Eladash 2021-07-18 17:02:34 +03:00 • committed by Megamouse
parent a5c3c7d2e5
commit 83a2f06e3a
2 changed files with 27 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

33
rpcs3/Emu/Cell/PPUInterpreter.cpp
View file

@ -141,16 +141,33 @@ FORCE_INLINE auto ppu_feed_data(ppu_thread& ppu, u64 addr)
} }
// Push called address to custom call history for debugging // Push called address to custom call history for debugging
inline u32 ppu_record_call(ppu_thread& ppu, u32 new_cia, ppu_opcode_t op) inline u32 ppu_record_call(ppu_thread& ppu, u32 new_cia, ppu_opcode_t op, bool indirect = false)
{ {
if (!op.lk)
{
return new_cia;
}
if (auto& history = ppu.call_history; !history.data.empty()) if (auto& history = ppu.call_history; !history.data.empty())
{ {
if (!op.lk)
{
if (indirect)
{
// Register LLE exported function trampolines
// Trampolines do not change the stack pointer, and ones to exported functions change RTOC
if (ppu.gpr[1] == history.last_r1 && ppu.gpr[2] != history.last_r2)
{
// Cancel condition
history.last_r1 = umax;
history.last_r2 = ppu.gpr[2];
// Register trampolie with TOC
history.data[history.index++ % ppu.call_history_max_size] = new_cia;
}
}
return new_cia;
}
history.data[history.index++ % ppu.call_history_max_size] = new_cia; history.data[history.index++ % ppu.call_history_max_size] = new_cia;
history.last_r1 = ppu.gpr[1];
history.last_r2 = ppu.gpr[2];
} }
return new_cia; return new_cia;
@ -3161,7 +3178,7 @@ bool ppu_interpreter::BCLR(ppu_thread& ppu, ppu_opcode_t op)
if (ctr_ok && cond_ok) if (ctr_ok && cond_ok)
{ {
ppu.cia = ppu_record_call(ppu, target, op); ppu.cia = ppu_record_call(ppu, target, op, true);
return false; return false;
} }
else else
@ -3230,7 +3247,7 @@ bool ppu_interpreter::BCCTR(ppu_thread& ppu, ppu_opcode_t op)
if (op.bo & 0x10 || ppu.cr[op.bi] == ((op.bo & 0x8) != 0)) if (op.bo & 0x10 || ppu.cr[op.bi] == ((op.bo & 0x8) != 0))
{ {
ppu.cia = ppu_record_call(ppu, static_cast<u32>(ppu.ctr) & ~3, op); ppu.cia = ppu_record_call(ppu, static_cast<u32>(ppu.ctr) & ~3, op, true);
return false; return false;
} }

2
rpcs3/Emu/Cell/PPUThread.h
View file

@ -301,6 +301,8 @@ public:
{ {
std::vector<u32> data; std::vector<u32> data;
u64 index = 0; u64 index = 0;
u64 last_r1 = umax;
u64 last_r2 = umax;
} call_history; } call_history;
static constexpr u32 call_history_max_size = 4096; static constexpr u32 call_history_max_size = 4096;