Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SPU: Simplify logging of MFC commands #9004

Merged
merged 2 commits into from Oct 1, 2020
Merged

SPU: Simplify logging of MFC commands #9004

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
403d127
SPU: Simplify logging of MFC commands
elad335 Sep 30, 2020
ad104c3
scope
elad335 Sep 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 9 additions & 11 deletions rpcs3/Emu/Cell/SPUThread.cpp
View file
Open in desktop
Expand Up @@ -1249,14 +1249,12 @@ void spu_thread::do_dma_transfer(const spu_mfc_cmd& args)

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
elad335 marked this conversation as resolved.
Show resolved Hide resolved
}

u32 value;
if ((eal - RAW_SPU_BASE_ADDR) % RAW_SPU_OFFSET + args.size - 1 < SPU_LS_SIZE) // LS access
else 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;
return;
Expand All @@ -1267,12 +1265,12 @@ void spu_thread::do_dma_transfer(const spu_mfc_cmd& args)
}
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)
{
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)
{
Expand All @@ -1289,12 +1287,12 @@ void spu_thread::do_dma_transfer(const spu_mfc_cmd& args)
}
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
{
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
}
}

Expand Down Expand Up @@ -1765,7 +1763,7 @@ bool spu_thread::do_list_transfer(spu_mfc_cmd& args)
const u32 size = items[index].ts & 0x7fff;
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)
{
Expand Down Expand Up @@ -2163,7 +2161,7 @@ bool spu_thread::process_mfc_cmd()
}

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)
{
Expand Down