ShuriZma
/
rpcs3
mirror of https://github.com/RPCS3/rpcs3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SPU LLVM: Fix Forwarding GPR stores savestate safety

This commit is contained in:
Eladash 2024-03-27 13:19:41 +02:00 committed by Elad Ashkenazi
parent 316b3a8851
commit 9c9ece3d95
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rpcs3/Emu/Cell/SPULLVMRecompiler.cpp
View File

@ -1050,7 +1050,7 @@ class spu_llvm_recompiler : public spu_recompiler_base, public cpu_translator
m_ir->SetInsertPoint(check);
update_pc(addr);
if (may_be_unsafe_for_savestate && std::none_of(std::begin(m_block->phi), std::end(m_block->phi), FN(!!x)))
if (may_be_unsafe_for_savestate && m_block && m_block->bb->preds.empty())
{
may_be_unsafe_for_savestate = false;
}
@ -1904,8 +1904,10 @@ public:
auto si = llvm::cast<StoreInst>(m_ir->Insert(bs->clone()));
if (b2->store[i] == nullptr)
{
// Protect against backwards ordering now
b2->store[i] = si;
b2->store_context_last_id[i] = 0;
b2->store_context_first_id[i] = b2->store_context_ctr[i] + 1;
if (!std::count(block_q.begin() + bi, block_q.end(), b2))
{