Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixup ppu/spu_thread::dump_all() #7987

Merged
merged 2 commits into from Apr 8, 2020
Merged

Fixup ppu/spu_thread::dump_all() #7987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ac9c7d
Fixup ppu/spu_thread::dump_all()
elad335 Apr 8, 2020
d88b8ce
SPU debugger: dump reservation address
elad335 Apr 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions rpcs3/Emu/Cell/PPUThread.cpp
View file
Open in desktop
Expand Up @@ -359,6 +359,8 @@ std::string ppu_thread::dump_all() const
{
std::string ret = cpu_thread::dump_misc();
ret += '\n';
ret += dump_misc();
ret += '\n';
ret += dump_regs();
ret += '\n';
ret += dump_callstack();
Expand Down
11 changes: 10 additions & 1 deletion rpcs3/Emu/Cell/SPUThread.cpp
View file
Open in desktop
Expand Up @@ -980,7 +980,10 @@ std::string spu_thread::dump_all() const
{
std::string ret = cpu_thread::dump_misc();
ret += '\n';
ret += dump_misc();
ret += '\n';
ret += dump_regs();
ret += '\n';

return ret;
}
Expand All @@ -996,13 +999,19 @@ std::string spu_thread::dump_regs() const

fmt::append(ret, "\nEvent Stat: 0x%x\n", +ch_event_stat);
fmt::append(ret, "Event Mask: 0x%x\n", +ch_event_mask);

if (const u32 addr = raddr)
fmt::append(ret, "Resrvation Addr: 0x%x\n", addr);
else
fmt::append(ret, "Resrvation Addr: none\n");

fmt::append(ret, "Interrupts Enabled: %s\n", interrupts_enabled.load());
fmt::append(ret, "Inbound Mailbox: %s\n", ch_in_mbox);
fmt::append(ret, "Out Mailbox: %s\n", ch_out_mbox);
fmt::append(ret, "Out Interrupts Mailbox: %s\n", ch_out_intr_mbox);
fmt::append(ret, "SNR config: 0x%llx\n", snr_config);
fmt::append(ret, "SNR1: %s\n", ch_snr1);
fmt::append(ret, "SNR2: %s\n", ch_snr2);
fmt::append(ret, "SNR2: %s", ch_snr2);

return ret;
}
Expand Down