From 1bd6cb21052e35b815261c2c9ca7005c72ac6659 Mon Sep 17 00:00:00 2001 From: Eladash Date: Tue, 5 May 2020 07:23:12 +0300 Subject: [PATCH] SPU/PPU debugger: use ':' instead of '=' --- rpcs3/Emu/Cell/PPUThread.cpp | 26 +++++++++++++------------- rpcs3/Emu/Cell/SPUThread.cpp | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/rpcs3/Emu/Cell/PPUThread.cpp b/rpcs3/Emu/Cell/PPUThread.cpp index 21d33955e5..1af45f05da 100644 --- a/rpcs3/Emu/Cell/PPUThread.cpp +++ b/rpcs3/Emu/Cell/PPUThread.cpp @@ -376,7 +376,7 @@ std::string ppu_thread::dump_regs() const { 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 hex_count = 8; @@ -441,25 +441,25 @@ std::string ppu_thread::dump_regs() const 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) { - 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, "LR = 0x%llx\n", lr); - fmt::append(ret, "CTR = 0x%llx\n", ctr); - 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, "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, "CR: 0x%08x\n", cr.pack()); + fmt::append(ret, "LR: 0x%llx\n", lr); + fmt::append(ret, "CTR: 0x%llx\n", ctr); + 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, "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); if (const u32 addr = raddr) - fmt::append(ret, "Reservation Addr = 0x%x", addr); + fmt::append(ret, "Reservation Addr: 0x%x", addr); else - fmt::append(ret, "Reservation Addr = none"); + fmt::append(ret, "Reservation Addr: none"); return ret; } @@ -541,7 +541,7 @@ std::string ppu_thread::dump_misc() const for (u32 i = 3; i <= 6; i++) 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()) { diff --git a/rpcs3/Emu/Cell/SPUThread.cpp b/rpcs3/Emu/Cell/SPUThread.cpp index cce4834273..c821f08f91 100644 --- a/rpcs3/Emu/Cell/SPUThread.cpp +++ b/rpcs3/Emu/Cell/SPUThread.cpp @@ -806,7 +806,7 @@ std::string spu_thread::dump_regs() const 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);