archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-08 07:51:28 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

SPU: Implement spu_channel_(4_)t::try_read

Browse source
This commit is contained in:
Eladash 2020-05-12 19:17:50 +03:00 • committed by Ivan
parent 8cca113ef4
commit 9266507e4c
3 changed files with 42 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -995,8 +995,8 @@ void spu_thread::cpu_stop()
if (thread && thread.get() != this && thread->status_npc.load().status >> 16 == SYS_SPU_THREAD_STOP_THREAD_EXIT)
{
// Wait for all threads to have error codes if exited by sys_spu_thread_exit
for (u64 status; ((status = thread->exit_status.data) & spu_channel::bit_count) == 0
|| static_cast<u32>(status) != thread->last_exit_status;)
for (u32 status; !thread->exit_status.try_read(status)
|| status != thread->last_exit_status;)
{
_mm_pause();
}
@ -3288,11 +3288,11 @@ void fmt_class_string<spu_channel>::format(std::string& out, u64 arg)
{
const auto& ch = get_object(arg);
const u64 raw = ch.data.load();
u32 data = 0;
if (raw & spu_channel::bit_count)
if (ch.try_read(data))
{
fmt::append(out, "0x%08x", static_cast<u32>(raw));
fmt::append(out, "0x%08x", data);
}
else
{
@ -3305,7 +3305,7 @@ void fmt_class_string<spu_channel_4_t>::format(std::string& out, u64 arg)
{
const auto& ch = get_object(arg);
// TODO
// TODO (use try_read)
fmt::append(out, "count = %d", ch.get_count());
}