mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-11-16 11:03:45 +01:00
Merge pull request #912 from unknownbrackets/savestates
Make sure interpreter and jit savestates match
This commit is contained in:
commit
e8ed179ca4
5 files changed
+20
-1
No files matched your search
@@ -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()
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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]));
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in new issue
Block a user