ShuriZma
/
rpcs3
mirror of https://github.com/RPCS3/rpcs3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SPU/PPU debugger: use ':' instead of '='

This commit is contained in:
Eladash 2020-05-05 07:23:12 +03:00 committed by Ivan
parent 142a1da0e0
commit 1bd6cb2105
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -376,7 +376,7 @@ std::string ppu_thread::dump_regs() const
{ {
auto reg = gpr[i]; auto reg = gpr[i];
fmt::append(ret, "r%d%s = 0x%-8llx", i, i <= 9 ? " " : "", reg); fmt::append(ret, "r%d%s: 0x%-8llx", i, i <= 9 ? " " : "", reg);
const u32 max_str_len = 32; const u32 max_str_len = 32;
const u32 hex_count = 8; const u32 hex_count = 8;
@ -441,25 +441,25 @@ std::string ppu_thread::dump_regs() const
for (uint i = 0; i < 32; ++i) for (uint i = 0; i < 32; ++i)
{ {
fmt::append(ret, "f%d%s = %.6G\n", i, i <= 9 ? " " : "", fpr[i]); fmt::append(ret, "f%d%s: %.6G\n", i, i <= 9 ? " " : "", fpr[i]);
} }
for (uint i = 0; i < 32; ++i) for (uint i = 0; i < 32; ++i)
{ {
fmt::append(ret, "v%d%s = %s [x: %g y: %g z: %g w: %g]\n", i, i <= 9 ? " " : "", vr[i], vr[i]._f[3], vr[i]._f[2], vr[i]._f[1], vr[i]._f[0]); fmt::append(ret, "v%d%s: %s [x: %g y: %g z: %g w: %g]\n", i, i <= 9 ? " " : "", vr[i], vr[i]._f[3], vr[i]._f[2], vr[i]._f[1], vr[i]._f[0]);
} }
fmt::append(ret, "CR = 0x%08x\n", cr.pack()); fmt::append(ret, "CR: 0x%08x\n", cr.pack());
fmt::append(ret, "LR = 0x%llx\n", lr); fmt::append(ret, "LR: 0x%llx\n", lr);
fmt::append(ret, "CTR = 0x%llx\n", ctr); fmt::append(ret, "CTR: 0x%llx\n", ctr);
fmt::append(ret, "VRSAVE = 0x%08x\n", vrsave); fmt::append(ret, "VRSAVE: 0x%08x\n", vrsave);
fmt::append(ret, "XER = [CA=%u | OV=%u | SO=%u | CNT=%u]\n", xer.ca, xer.ov, xer.so, xer.cnt); fmt::append(ret, "XER: [CA=%u | OV=%u | SO=%u | CNT=%u]\n", xer.ca, xer.ov, xer.so, xer.cnt);
fmt::append(ret, "VSCR = [SAT=%u | NJ=%u]\n", sat, nj); fmt::append(ret, "VSCR: [SAT=%u | NJ=%u]\n", sat, nj);
fmt::append(ret, "FPSCR = [FL=%u | FG=%u | FE=%u | FU=%u]\n", fpscr.fl, fpscr.fg, fpscr.fe, fpscr.fu); fmt::append(ret, "FPSCR: [FL=%u | FG=%u | FE=%u | FU=%u]\n", fpscr.fl, fpscr.fg, fpscr.fe, fpscr.fu);
if (const u32 addr = raddr) if (const u32 addr = raddr)
fmt::append(ret, "Reservation Addr = 0x%x", addr); fmt::append(ret, "Reservation Addr: 0x%x", addr);
else else
fmt::append(ret, "Reservation Addr = none"); fmt::append(ret, "Reservation Addr: none");
return ret; return ret;
} }
@ -541,7 +541,7 @@ std::string ppu_thread::dump_misc() const
for (u32 i = 3; i <= 6; i++) for (u32 i = 3; i <= 6; i++)
if (gpr[i] != syscall_args[i - 3]) if (gpr[i] != syscall_args[i - 3])
fmt::append(ret, " ** r%d = 0x%llx\n", i, syscall_args[i - 3]); fmt::append(ret, " ** r%d: 0x%llx\n", i, syscall_args[i - 3]);
} }
else if (is_paused()) else if (is_paused())
{ {

2
rpcs3/Emu/Cell/SPUThread.cpp
View File

@ -806,7 +806,7 @@ std::string spu_thread::dump_regs() const
for (u32 i = 0; i < 128; i++) for (u32 i = 0; i < 128; i++)
{ {
fmt::append(ret, "r%d = %s\n", i, gpr[i]); fmt::append(ret, "r%d: %s\n", i, gpr[i]);
} }
fmt::append(ret, "\nEvent Stat: 0x%x\n", +ch_event_stat); fmt::append(ret, "\nEvent Stat: 0x%x\n", +ch_event_stat);