From c4ab0855b4dce793f2c6aa3eef23218292369b28 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Fri, 8 Mar 2013 08:49:21 -0800 Subject: [PATCH] Make sure interpreter and jit savestates match. --- Core/MIPS/ARM/ArmJit.cpp | 9 ++++++++- Core/MIPS/ARM/ArmJit.h | 1 + Core/MIPS/MIPS.cpp | 2 ++ Core/MIPS/x86/Jit.cpp | 8 ++++++++ Core/MIPS/x86/Jit.h | 1 + 5 files changed, 20 insertions(+), 1 deletion(-) diff --git a/Core/MIPS/ARM/ArmJit.cpp b/Core/MIPS/ARM/ArmJit.cpp index 6cd8220ddb..f2e57473b9 100644 --- a/Core/MIPS/ARM/ArmJit.cpp +++ b/Core/MIPS/ARM/ArmJit.cpp @@ -71,7 +71,14 @@ void Jit::DoState(PointerWrap &p) { p.Do(js.startDefaultPrefix); p.DoMarker("Jit"); - FlushPrefixV(); +} + +// This is here so the savestate matches between jit and non-jit. +void Jit::DoDummyState(PointerWrap &p) +{ + bool dummy = false; + p.Do(dummy); + p.DoMarker("Jit"); } void Jit::FlushAll() diff --git a/Core/MIPS/ARM/ArmJit.h b/Core/MIPS/ARM/ArmJit.h index 0d8618c507..626e770b90 100644 --- a/Core/MIPS/ARM/ArmJit.h +++ b/Core/MIPS/ARM/ArmJit.h @@ -134,6 +134,7 @@ class Jit : public ArmGen::ARMXCodeBlock public: Jit(MIPSState *mips); void DoState(PointerWrap &p); + static void DoDummyState(PointerWrap &p); // Compiled ops should ignore delay slots // the compiler will take care of them by itself diff --git a/Core/MIPS/MIPS.cpp b/Core/MIPS/MIPS.cpp index f7fc64a752..706b95f1e9 100644 --- a/Core/MIPS/MIPS.cpp +++ b/Core/MIPS/MIPS.cpp @@ -112,6 +112,8 @@ void MIPSState::DoState(PointerWrap &p) Reset(); if (MIPSComp::jit) MIPSComp::jit->DoState(p); + else + MIPSComp::Jit::DoDummyState(p); p.DoArray(r, sizeof(r) / sizeof(r[0])); p.DoArray(f, sizeof(f) / sizeof(f[0])); diff --git a/Core/MIPS/x86/Jit.cpp b/Core/MIPS/x86/Jit.cpp index 6a5bb0ac54..f2a7e0666d 100644 --- a/Core/MIPS/x86/Jit.cpp +++ b/Core/MIPS/x86/Jit.cpp @@ -115,6 +115,14 @@ void Jit::DoState(PointerWrap &p) p.DoMarker("Jit"); } +// This is here so the savestate matches between jit and non-jit. +void Jit::DoDummyState(PointerWrap &p) +{ + bool dummy = false; + p.Do(dummy); + p.DoMarker("Jit"); +} + void Jit::FlushAll() { gpr.Flush(); diff --git a/Core/MIPS/x86/Jit.h b/Core/MIPS/x86/Jit.h index f5bf0bdf53..8cbfda4f82 100644 --- a/Core/MIPS/x86/Jit.h +++ b/Core/MIPS/x86/Jit.h @@ -143,6 +143,7 @@ class Jit : public Gen::XCodeBlock public: Jit(MIPSState *mips); void DoState(PointerWrap &p); + static void DoDummyState(PointerWrap &p); // Compiled ops should ignore delay slots // the compiler will take care of them by itself