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

Log a snippet of guest thread code at crash

Browse source
This commit is contained in:
Eladash 2022-03-25 18:19:02 +03:00 • committed by Ivan
parent 1d51f3af0c
commit 6783bcd273
3 changed files with 36 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

20
rpcs3/Emu/CPU/CPUThread.cpp
View file

@ -892,6 +892,8 @@ u32* cpu_thread::get_pc2()
return nullptr; return nullptr;
} }
std::shared_ptr<CPUDisAsm> make_disasm(const cpu_thread* cpu);
std::string cpu_thread::dump_all() const std::string cpu_thread::dump_all() const
{ {
std::string ret = cpu_thread::dump_misc(); std::string ret = cpu_thread::dump_misc();
@ -901,6 +903,24 @@ std::string cpu_thread::dump_all() const
ret += dump_regs(); ret += dump_regs();
ret += '\n'; ret += '\n';
ret += dump_callstack(); ret += dump_callstack();
ret += '\n';
if (u32 cur_pc = get_pc(); cur_pc != umax)
{
// Dump a snippet of currently executed code (may be unreliable with non-static-interpreter decoders)
auto disasm = make_disasm(this);
const auto rsx = try_get<rsx::thread>();
for (u32 i = (rsx ? rsx->try_get_pc_of_x_cmds_backwards(20, cur_pc).second : cur_pc - 4 * 20), count = 0; count < 30; count++)
{
u32 advance = disasm->disasm(i);
ret += disasm->last_opcode;
i += std::max(advance, 4u);
disasm->dump_pc = i;
ret += '\n';
}
}
return ret; return ret;
} }

4
rpcs3/Emu/RSX/RSXThread.cpp
View file

@ -2674,13 +2674,13 @@ namespace rsx
} }
else else
{ {
return {0, umax}; return {0, get};
} }
} }
if (pcs_of_valid_cmds.size() == 1u || pcs_of_valid_cmds.back() != get) if (pcs_of_valid_cmds.size() == 1u || pcs_of_valid_cmds.back() != get)
{ {
return {0, umax}; return {0, get};
} }
u32 found_cmds_count = std::min(count, ::size32(pcs_of_valid_cmds) - 1); u32 found_cmds_count = std::min(count, ::size32(pcs_of_valid_cmds) - 1);

17
rpcs3/rpcs3qt/debugger_frame.cpp
View file

@ -50,6 +50,17 @@ extern bool is_using_interpreter(u32 id_type)
} }
} }
extern std::shared_ptr<CPUDisAsm> make_disasm(const cpu_thread* cpu)
{
switch (cpu->id_type())
{
case 1: return std::make_shared<PPUDisAsm>(cpu_disasm_mode::interpreter, vm::g_sudo_addr);
case 2: return std::make_shared<SPUDisAsm>(cpu_disasm_mode::interpreter, static_cast<const spu_thread*>(cpu)->ls);
case 0x55: return std::make_shared<RSXDisAsm>(cpu_disasm_mode::interpreter, vm::g_sudo_addr, 0, cpu);
default: return nullptr;
}
}
debugger_frame::debugger_frame(std::shared_ptr<gui_settings> gui_settings, QWidget *parent) debugger_frame::debugger_frame(std::shared_ptr<gui_settings> gui_settings, QWidget *parent)
: custom_dock_widget(tr("Debugger"), parent) : custom_dock_widget(tr("Debugger"), parent)
, m_gui_settings(std::move(gui_settings)) , m_gui_settings(std::move(gui_settings))
@ -895,7 +906,7 @@ void debugger_frame::OnSelectUnit()
if (selected == m_cpu.get()) if (selected == m_cpu.get())
{ {
m_disasm = std::make_shared<PPUDisAsm>(cpu_disasm_mode::interpreter, vm::g_sudo_addr); m_disasm = make_disasm(selected);
} }
else else
{ {
@ -911,7 +922,7 @@ void debugger_frame::OnSelectUnit()
if (selected == m_cpu.get()) if (selected == m_cpu.get())
{ {
m_disasm = std::make_shared<SPUDisAsm>(cpu_disasm_mode::interpreter, static_cast<const spu_thread*>(m_cpu.get())->ls); m_disasm = make_disasm(selected);
} }
else else
{ {
@ -927,7 +938,7 @@ void debugger_frame::OnSelectUnit()
if (get_cpu()) if (get_cpu())
{ {
m_disasm = std::make_shared<RSXDisAsm>(cpu_disasm_mode::interpreter, vm::g_sudo_addr, 0, m_rsx); m_disasm = make_disasm(m_rsx);
} }
break; break;