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

Savestates/SPU: Extend RCHCNT safe returns

Browse source
This commit is contained in:
Eladash 2024-03-26 15:32:21 +02:00 • committed by Elad Ashkenazi
parent 68349e48cd
commit fb4e64d15e
1 changed files with 23 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

35
rpcs3/Emu/Cell/SPULLVMRecompiler.cpp
View file

@ -2921,6 +2921,29 @@ public:
return; return;
} }
switch (op.ra)
{
case SPU_WrOutMbox:
case SPU_WrOutIntrMbox:
case SPU_RdSigNotify1:
case SPU_RdSigNotify2:
case SPU_RdInMbox:
case SPU_RdEventStat:
{
if (g_cfg.savestate.compatible_mode)
{
ensure_gpr_stores();
check_state(m_pos, false);
}
break;
}
default:
{
break;
}
}
switch (op.ra) switch (op.ra)
{ {
case SPU_WrOutMbox: case SPU_WrOutMbox:
@ -2971,12 +2994,6 @@ public:
} }
case SPU_RdInMbox: case SPU_RdInMbox:
{ {
if (g_cfg.savestate.compatible_mode)
{
ensure_gpr_stores();
check_state(m_pos, false);
}
const auto value = m_ir->CreateLoad(get_type<u32>(), spu_ptr<u32>(&spu_thread::ch_in_mbox)); const auto value = m_ir->CreateLoad(get_type<u32>(), spu_ptr<u32>(&spu_thread::ch_in_mbox));
value->setAtomic(llvm::AtomicOrdering::Acquire); value->setAtomic(llvm::AtomicOrdering::Acquire);
res.value = value; res.value = value;
@ -2986,12 +3003,6 @@ public:
} }
case SPU_RdEventStat: case SPU_RdEventStat:
{ {
if (g_cfg.savestate.compatible_mode)
{
ensure_gpr_stores();
check_state(m_pos, false);
}
const auto mask = m_ir->CreateTrunc(m_ir->CreateLShr(m_ir->CreateLoad(get_type<u64>(), spu_ptr<u64>(&spu_thread::ch_events)), 32), get_type<u32>()); const auto mask = m_ir->CreateTrunc(m_ir->CreateLShr(m_ir->CreateLoad(get_type<u64>(), spu_ptr<u64>(&spu_thread::ch_events)), 32), get_type<u32>());
res.value = call("spu_get_events", &exec_get_events, m_thread, mask); res.value = call("spu_get_events", &exec_get_events, m_thread, mask);
break; break;