1
0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-25 20:22:30 +01:00

SPU: Log STOP full opcode (#9292)

Co-authored-by: Ani <ani-leo@outlook.com>
This commit is contained in:
Eladash 2020-11-20 12:53:16 +02:00 committed by GitHub
parent 5b207c3b95
commit 85880ffded
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -3884,14 +3884,7 @@ bool spu_thread::set_ch_value(u32 ch, u32 value)
} }
else else
{ {
if (ch_out_mbox.get_count()) fmt::throw_exception("SPU_WrOutIntrMbox: unknown data (value=0x%x, Out_MBox=%s)" HERE, value, ch_out_mbox);
{
fmt::throw_exception("SPU_WrOutIntrMbox: unknown data (value=0x%x); Out_MBox = 0x%x" HERE, value, ch_out_mbox.get_value());
}
else
{
fmt::throw_exception("SPU_WrOutIntrMbox: unknown data (value=0x%x)" HERE, value);
}
} }
} }
} }
@ -4467,12 +4460,13 @@ bool spu_thread::stop_and_signal(u32 code)
state += cpu_flag::wait; state += cpu_flag::wait;
if (!ch_out_mbox.get_count()) u32 value;
if (!ch_out_mbox.try_pop(value))
{ {
fmt::throw_exception("sys_spu_thread_exit(): Out_MBox is empty" HERE); fmt::throw_exception("sys_spu_thread_exit(): Out_MBox is empty" HERE);
} }
const u32 value = ch_out_mbox.get_value();
spu_log.trace("sys_spu_thread_exit(status=0x%x)", value); spu_log.trace("sys_spu_thread_exit(status=0x%x)", value);
last_exit_status.release(value); last_exit_status.release(value);
set_status_npc(); set_status_npc();
@ -4482,7 +4476,7 @@ bool spu_thread::stop_and_signal(u32 code)
} }
} }
fmt::throw_exception("Unknown STOP code: 0x%x (Out_MBox=%s)" HERE, code, ch_out_mbox); fmt::throw_exception("Unknown STOP code: 0x%x (op=0x%x, Out_MBox=%s)" HERE, code, _ref<u32>(pc), ch_out_mbox);
} }
void spu_thread::halt() void spu_thread::halt()