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

Make ESTAT consistent in sys_spu_thread_group_terminate

Browse source
This commit is contained in:
Eladash 2020-04-16 19:33:36 +03:00 • committed by Ivan
parent 9506676223
commit fe7933b0d2
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -668,6 +668,7 @@ error_code sys_spu_thread_group_start(ppu_thread& ppu, u32 id)
group->join_state = 0; group->join_state = 0;
group->running = max_threads; group->running = max_threads;
group->set_terminate = false;
for (auto& thread : group->threads) for (auto& thread : group->threads)
{ {
@ -859,11 +860,14 @@ error_code sys_spu_thread_group_terminate(ppu_thread& ppu, u32 id, s32 value)
if (group->run_state <= SPU_THREAD_GROUP_STATUS_INITIALIZED || if (group->run_state <= SPU_THREAD_GROUP_STATUS_INITIALIZED ||
group->run_state == SPU_THREAD_GROUP_STATUS_WAITING || group->run_state == SPU_THREAD_GROUP_STATUS_WAITING ||
group->run_state == SPU_THREAD_GROUP_STATUS_WAITING_AND_SUSPENDED) group->run_state == SPU_THREAD_GROUP_STATUS_WAITING_AND_SUSPENDED ||
group->set_terminate)
{ {
return CELL_ESTAT; return CELL_ESTAT;
} }
group->set_terminate = true;
for (auto& thread : group->threads) for (auto& thread : group->threads)
{ {
if (thread) if (thread)

1
rpcs3/Emu/Cell/lv2/sys_spu.h
View file

@ -270,6 +270,7 @@ struct lv2_spu_group
cond_variable cond; // used to signal waiting PPU thread cond_variable cond; // used to signal waiting PPU thread
atomic_t<u64> stop_count; atomic_t<u64> stop_count;
class ppu_thread* waiter = nullptr; class ppu_thread* waiter = nullptr;
bool set_terminate = false;
std::array<std::shared_ptr<named_thread<spu_thread>>, 8> threads; // SPU Threads std::array<std::shared_ptr<named_thread<spu_thread>>, 8> threads; // SPU Threads
std::array<s8, 256> threads_map; // SPU Threads map based number std::array<s8, 256> threads_map; // SPU Threads map based number