diff --git a/rpcs3/Emu/Cell/MFC.cpp b/rpcs3/Emu/Cell/MFC.cpp index a8826e6793..4d36a18980 100644 --- a/rpcs3/Emu/Cell/MFC.cpp +++ b/rpcs3/Emu/Cell/MFC.cpp @@ -61,3 +61,11 @@ void fmt_class_string::format(std::string& out, u64 arg) return unknown; }); } + +template <> +void fmt_class_string::format(std::string& out, u64 arg) +{ + const auto& cmd = get_object(arg); + + fmt::append(out, "%s #%02u 0x%05x:0x%08x 0x%x", cmd.cmd, cmd.tag, cmd.lsa, cmd.eah * 0x100000000ull + cmd.eal, cmd.size); +} diff --git a/rpcs3/Emu/Cell/SPUThread.cpp b/rpcs3/Emu/Cell/SPUThread.cpp index 362175c0a1..92d6e70ec4 100644 --- a/rpcs3/Emu/Cell/SPUThread.cpp +++ b/rpcs3/Emu/Cell/SPUThread.cpp @@ -499,8 +499,8 @@ std::string SPUThread::dump() const std::string ret = cpu_thread::dump(); // Print some transaction statistics - fmt::append(ret, "\nTX: %u; Fail: %u (0x%x)", tx_success, tx_failure, tx_status); fmt::append(ret, "\nBlocks: %u; Fail: %u", block_counter, block_failure); + fmt::append(ret, "\n[%s]", ch_mfc_cmd); fmt::append(ret, "\nTag Mask: 0x%08x", ch_tag_mask); fmt::append(ret, "\nMFC Stall: 0x%08x", ch_stall_mask); fmt::append(ret, "\nMFC Queue Size: %u", mfc_size); @@ -509,9 +509,7 @@ std::string SPUThread::dump() const { if (i < mfc_size) { - fmt::append(ret, "\n[%s #%02u 0x%05x:0x%08x 0x%x]", - mfc_queue[i].cmd, mfc_queue[i].tag, mfc_queue[i].lsa, - mfc_queue[i].eah * 0x100000000ull + mfc_queue[i].eal, mfc_queue[i].size); + fmt::append(ret, "\n%s", mfc_queue[i]); } else { diff --git a/rpcs3/Emu/Cell/SPUThread.h b/rpcs3/Emu/Cell/SPUThread.h index 40d4568f9c..5ea86c7764 100644 --- a/rpcs3/Emu/Cell/SPUThread.h +++ b/rpcs3/Emu/Cell/SPUThread.h @@ -584,10 +584,6 @@ public: const std::string m_name; // Thread name - u64 tx_success = 0; - u64 tx_failure = 0; - uint tx_status = 0; - std::unique_ptr jit; // Recompiler instance u64 block_counter = 0;