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

Update SPU dump: print current MFC cmd

This commit is contained in:
Nekotekina 2018-05-18 18:53:01 +03:00
parent 33a1c743a4
commit 8d5bbfb850
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rpcs3/Emu/Cell/MFC.cpp
View File

@ -61,3 +61,11 @@ void fmt_class_string<MFC>::format(std::string& out, u64 arg)
return unknown;
});
}
template <>
void fmt_class_string<spu_mfc_cmd>::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);
}

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

@ -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
{

4
rpcs3/Emu/Cell/SPUThread.h
View File

@ -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<class spu_recompiler_base> jit; // Recompiler instance
u64 block_counter = 0;