mirrors/rpcs3
0
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-08-13 03:29:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

SPU: Simplify logging of MFC commands (#9004)

Browse source
This commit is contained in:
Eladash 2020-10-01 19:52:39 +03:00 • committed by GitHub
commit 56cebd99c2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

20
rpcs3/Emu/Cell/SPUThread.cpp
View file

@ -1249,14 +1249,12 @@ void spu_thread::do_dma_transfer(const spu_mfc_cmd& args)
if (!thread) if (!thread)
{ {
fmt::throw_exception("RawSPU not found (cmd=0x%x, lsa=0x%x, ea=0x%llx, tag=0x%x, size=0x%x)" HERE, args.cmd, args.lsa, args.eal, args.tag, args.size); // Access Violation
} }
else if ((eal - RAW_SPU_BASE_ADDR) % RAW_SPU_OFFSET + args.size - 1 < SPU_LS_SIZE) // LS access
u32 value;
if ((eal - RAW_SPU_BASE_ADDR) % RAW_SPU_OFFSET + args.size - 1 < SPU_LS_SIZE) // LS access
{ {
} }
else if (args.size == 4 && is_get && thread->read_reg(eal, value)) else if (u32 value; args.size == 4 && is_get && thread->read_reg(eal, value))
{ {
_ref<u32>(lsa) = value; _ref<u32>(lsa) = value;
return; return;
@ -1267,12 +1265,12 @@ void spu_thread::do_dma_transfer(const spu_mfc_cmd& args)
} }
else else
{ {
fmt::throw_exception("Invalid RawSPU MMIO offset (cmd=0x%x, lsa=0x%x, ea=0x%llx, tag=0x%x, size=0x%x)" HERE, args.cmd, args.lsa, args.eal, args.tag, args.size); fmt::throw_exception("Invalid RawSPU MMIO offset (cmd=[%s])" HERE, args);
} }
} }
else if (get_type() >= spu_type::raw) else if (get_type() >= spu_type::raw)
{ {
fmt::throw_exception("SPU MMIO used for RawSPU (cmd=0x%x, lsa=0x%x, ea=0x%llx, tag=0x%x, size=0x%x)" HERE, args.cmd, args.lsa, args.eal, args.tag, args.size); // Access Violation
} }
else if (group && group->threads_map[index] != -1) else if (group && group->threads_map[index] != -1)
{ {
@ -1289,12 +1287,12 @@ void spu_thread::do_dma_transfer(const spu_mfc_cmd& args)
} }
else else
{ {
fmt::throw_exception("Invalid MMIO offset (cmd=0x%x, lsa=0x%x, ea=0x%llx, tag=0x%x, size=0x%x)" HERE, args.cmd, args.lsa, args.eal, args.tag, args.size); fmt::throw_exception("Invalid MMIO offset (cmd=[%s])" HERE, args);
} }
} }
else else
{ {
fmt::throw_exception("Invalid thread type (cmd=0x%x, lsa=0x%x, ea=0x%llx, tag=0x%x, size=0x%x)" HERE, args.cmd, args.lsa, args.eal, args.tag, args.size); // Access Violation
} }
} }
@ -1765,7 +1763,7 @@ bool spu_thread::do_list_transfer(spu_mfc_cmd& args)
const u32 size = items[index].ts & 0x7fff; const u32 size = items[index].ts & 0x7fff;
const u32 addr = items[index].ea; const u32 addr = items[index].ea;
spu_log.trace("LIST: addr=0x%x, size=0x%x, lsa=0x%05x, sb=0x%x", addr, size, args.lsa | (addr & 0xf), items[index].sb); spu_log.trace("LIST: item=0x%016x, lsa=0x%05x", std::bit_cast<be_t<u64>>(items[index]), args.lsa | (addr & 0xf));
if (size) if (size)
{ {
@ -2163,7 +2161,7 @@ bool spu_thread::process_mfc_cmd()
} }
spu::scheduler::concurrent_execution_watchdog watchdog(*this); spu::scheduler::concurrent_execution_watchdog watchdog(*this);
spu_log.trace("DMAC: cmd=%s, lsa=0x%x, ea=0x%llx, tag=0x%x, size=0x%x", ch_mfc_cmd.cmd, ch_mfc_cmd.lsa, ch_mfc_cmd.eal, ch_mfc_cmd.tag, ch_mfc_cmd.size); spu_log.trace("DMAC: [%s]", ch_mfc_cmd);
switch (ch_mfc_cmd.cmd) switch (ch_mfc_cmd.cmd)
{ {