archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-08 16:01:42 +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) 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 // 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 for (u32 status; !thread->exit_status.try_read(status)
|| static_cast<u32>(status) != thread->last_exit_status;) || status != thread->last_exit_status;)
{ {
_mm_pause(); _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 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 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); const auto& ch = get_object(arg);
// TODO // TODO (use try_read)
fmt::append(out, "count = %d", ch.get_count()); fmt::append(out, "count = %d", ch.get_count());
} }

34
rpcs3/Emu/Cell/SPUThread.h
View file

@ -233,6 +233,20 @@ public:
return (old & bit_count) != 0; return (old & bit_count) != 0;
} }
// Reading without modification
bool try_read(u32& out) const
{
const u64 old = data.load();
if (old & bit_count) [[likely]]
{
out = static_cast<u32>(old);
return true;
}
return false;
}
// Pop unconditionally (loading last value), may require notification // Pop unconditionally (loading last value), may require notification
u32 pop(cpu_thread& spu) u32 pop(cpu_thread& spu)
{ {
@ -269,6 +283,7 @@ struct spu_channel_4_t
{ {
u8 waiting; u8 waiting;
u8 count; u8 count;
u8 _pad[2];
u32 value0; u32 value0;
u32 value1; u32 value1;
u32 value2; u32 value2;
@ -338,6 +353,23 @@ public:
}); });
} }
// returns current queue size without modification
uint try_read(u32 (&out)[4]) const
{
const sync_var_t data = values.load();
const uint result = data.count;
if (result != 0)
{
out[0] = data.value0;
out[1] = data.value1;
out[2] = data.value2;
out[3] = value3;
}
return result;
}
u32 get_count() const u32 get_count() const
{ {
return std::as_const(values).raw().count; return std::as_const(values).raw().count;
@ -345,7 +377,7 @@ public:
void set_values(u32 count, u32 value0, u32 value1 = 0, u32 value2 = 0, u32 value3 = 0) void set_values(u32 count, u32 value0, u32 value1 = 0, u32 value2 = 0, u32 value3 = 0)
{ {
this->values.raw() = { 0, static_cast<u8>(count), value0, value1, value2 }; this->values.raw() = { 0, static_cast<u8>(count), {}, value0, value1, value2 };
this->value3 = value3; this->value3 = value3;
} }
}; };

6
rpcs3/Emu/Cell/lv2/sys_spu.cpp
View file

@ -482,11 +482,11 @@ error_code sys_spu_thread_get_exit_status(ppu_thread& ppu, u32 id, vm::ptr<s32>
return CELL_ESRCH; return CELL_ESRCH;
} }
const u64 exit_status = thread->exit_status.data.load(); u32 data;
if (exit_status & spu_channel::bit_count) if (thread->exit_status.try_read(data))
{ {
*status = static_cast<s32>(exit_status); *status = static_cast<s32>(data);
return CELL_OK; return CELL_OK;
} }