Merge pull request #18629 from unknownbrackets/unbreak-jithacks

Core: Revert save state breakage
This commit is contained in:
Henrik Rydgård
2023-12-29 07:38:15 +01:00
committed by GitHub
+2 -1
View File
@@ -367,6 +367,8 @@ namespace SaveState
}
// Memory is a bit tricky when jit is enabled, since there's emuhacks in it.
// These must be saved before copying out memory and restored after.
auto savedReplacements = SaveAndClearReplacements();
if (MIPSComp::jit && p.mode == p.MODE_WRITE) {
std::lock_guard<std::recursive_mutex> guard(MIPSComp::jitLock);
if (MIPSComp::jit) {
@@ -388,7 +390,6 @@ namespace SaveState
// Don't bother restoring if reading, we'll deal with that in KernelModuleDoState.
// In theory, different functions might have been runtime loaded in the state.
if (p.mode != p.MODE_READ) {
auto savedReplacements = SaveAndClearReplacements();
RestoreSavedReplacements(savedReplacements);
}