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

Savestates: Move variable to sif struct, bump savestate version

This commit is contained in:
refractionpcsx2 2020-10-03 00:28:01 +01:00
parent b916ce6d30
commit dcbb05982a
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcsx2/SaveState.h
View File

@ -24,7 +24,7 @@
// the lower 16 bit value. IF the change is breaking of all compatibility with old // the lower 16 bit value. IF the change is breaking of all compatibility with old
// states, increment the upper 16 bit value, and clear the lower 16 bits to 0. // states, increment the upper 16 bit value, and clear the lower 16 bits to 0.
static const u32 g_SaveVersion = (0x9A0E << 16) | 0x0000; static const u32 g_SaveVersion = (0x9A0F << 16) | 0x0000;
// this function is meant to be used in the place of GSfreeze, and provides a safe layer // this function is meant to be used in the place of GSfreeze, and provides a safe layer
// between the GS saving function and the MTGS's needs. :) // between the GS saving function and the MTGS's needs. :)

1
pcsx2/Sif.h
View File

@ -130,6 +130,7 @@ struct sif_iop
bool busy; bool busy;
s32 cycles; s32 cycles;
u32 writeJunk;
s32 counter; // Used to keep track of how much is left in IOP. s32 counter; // Used to keep track of how much is left in IOP.
struct sifData data; // Only used in IOP. struct sifData data; // Only used in IOP.

13
pcsx2/Sif0.cpp
View File

@ -23,7 +23,6 @@
_sif sif0; _sif sif0;
static bool done = false; static bool done = false;
static int writeJunk = 0;
static __fi void Sif0Init() static __fi void Sif0Init()
{ {
@ -84,11 +83,11 @@ static __fi bool WriteIOPtoFifo()
sif0.iop.cycles += (writeSize >> 2)/* * BIAS*/; // fixme : should be >> 4 sif0.iop.cycles += (writeSize >> 2)/* * BIAS*/; // fixme : should be >> 4
sif0.iop.counter -= writeSize; sif0.iop.counter -= writeSize;
if (sif0.iop.counter == 0 && writeJunk) if (sif0.iop.counter == 0 && sif0.iop.writeJunk)
{ {
SIF_LOG("Writing Junk %d", writeJunk); SIF_LOG("Writing Junk %d", sif0.iop.writeJunk);
sif0.fifo.writeJunk(writeJunk); sif0.fifo.writeJunk(sif0.iop.writeJunk);
writeJunk = 0; sif0.iop.writeJunk = 0;
} }
return true; return true;
} }
@ -152,10 +151,10 @@ static __fi bool ProcessIOPTag()
//Maximum transfer amount 1mb-16 also masking out top part which is a "Mode" cache stuff, we don't care :) //Maximum transfer amount 1mb-16 also masking out top part which is a "Mode" cache stuff, we don't care :)
sif0.iop.counter = sif0words & 0xFFFFF; sif0.iop.counter = sif0words & 0xFFFFF;
writeJunk = (sif0.iop.counter & 0x3) ? (4 - sif0.iop.counter & 0x3) : 0; sif0.iop.writeJunk = (sif0.iop.counter & 0x3) ? (4 - sif0.iop.counter & 0x3) : 0;
// IOP tags have an IRQ bit and an End of Transfer bit: // IOP tags have an IRQ bit and an End of Transfer bit:
if (sif0tag.IRQ || (sif0tag.ID & 4)) sif0.iop.end = true; if (sif0tag.IRQ || (sif0tag.ID & 4)) sif0.iop.end = true;
SIF_LOG("SIF0 IOP Tag: madr=%lx, tadr=%lx, counter=%lx (%08X_%08X) Junk %d", hw_dma9.madr, hw_dma9.tadr, sif0.iop.counter, sif0words, sif0data, writeJunk); SIF_LOG("SIF0 IOP Tag: madr=%lx, tadr=%lx, counter=%lx (%08X_%08X) Junk %d", hw_dma9.madr, hw_dma9.tadr, sif0.iop.counter, sif0words, sif0data, sif0.iop.writeJunk);
return true; return true;
} }