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

Savestates: Fix zombie PPU threads saving

Browse source
This commit is contained in:
Eladash 2022-07-04 20:42:15 +03:00 • committed by Megamouse
parent 72c14994f0
commit 3fc2194fd5
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
rpcs3/Emu/Cell/lv2/sys_ppu_thread.cpp
View file

@ -43,9 +43,9 @@ void ppu_thread_exit(ppu_thread& ppu, ppu_opcode_t, be_t<u32>*, struct ppu_intrp
// Deallocate Stack Area // Deallocate Stack Area
ensure(vm::dealloc(ppu.stack_addr, vm::stack) == ppu.stack_size); ensure(vm::dealloc(ppu.stack_addr, vm::stack) == ppu.stack_size);
if (auto& dct = g_fxo->get<lv2_memory_container>(); !Emu.IsStopped()) if (auto dct = g_fxo->try_get<lv2_memory_container>())
{ {
dct.free(ppu.stack_size); dct->free(ppu.stack_size);
} }
if (ppu.call_history.index) if (ppu.call_history.index)
@ -110,8 +110,15 @@ void _sys_ppu_thread_exit(ppu_thread& ppu, u64 errorcode)
ppu.state -= cpu_flag::suspend; ppu.state -= cpu_flag::suspend;
} }
while (ppu.joiner == ppu_join_status::zombie && !ppu.is_stopped()) while (ppu.joiner == ppu_join_status::zombie)
{ {
if (ppu.is_stopped() && ppu.joiner.compare_and_swap_test(ppu_join_status::zombie, ppu_join_status::joinable))
{
// Abort
ppu.state += cpu_flag::again;
return;
}
// Wait for termination // Wait for termination
thread_ctrl::wait_on(ppu.joiner, ppu_join_status::zombie); thread_ctrl::wait_on(ppu.joiner, ppu_join_status::zombie);
} }