////////////////////////////////////////////////////////////////////////\r
\r
void LoadStateV5(SPUFreeze_t * pF); // newest version\r
////////////////////////////////////////////////////////////////////////\r
\r
void LoadStateV5(SPUFreeze_t * pF); // newest version\r
\r
// we want to retain compatibility between versions,\r
// so use original channel struct\r
static void save_channel(SPUCHAN_orig *d, const SPUCHAN *s, int ch)\r
{\r
memset(d, 0, sizeof(*d));\r
\r
// we want to retain compatibility between versions,\r
// so use original channel struct\r
static void save_channel(SPUCHAN_orig *d, const SPUCHAN *s, int ch)\r
{\r
memset(d, 0, sizeof(*d));\r
d->iStart = (regAreaGet(ch,6)&~1)<<3;\r
d->iCurr = 0; // set by the caller\r
d->iLoop = 0; // set by the caller\r
d->iStart = (regAreaGet(ch,6)&~1)<<3;\r
d->iCurr = 0; // set by the caller\r
d->iLoop = 0; // set by the caller\r
static void load_channel(SPUCHAN *d, const SPUCHAN_orig *s, int ch)\r
{\r
memset(d, 0, sizeof(*d));\r
static void load_channel(SPUCHAN *d, const SPUCHAN_orig *s, int ch)\r
{\r
memset(d, 0, sizeof(*d));\r
memcpy(d->SB, s->SB, sizeof(d->SB));\r
d->pCurr = (void *)((long)s->iCurr & 0x7fff0);\r
d->pLoop = (void *)((long)s->iLoop & 0x7fff0);\r
memcpy(d->SB, s->SB, sizeof(d->SB));\r
d->pCurr = (void *)((long)s->iCurr & 0x7fff0);\r
d->pLoop = (void *)((long)s->iLoop & 0x7fff0);\r
d->bReverb = s->bReverb;\r
d->iLeftVolume = s->iLeftVolume;\r
d->iRightVolume = s->iRightVolume;\r
d->bReverb = s->bReverb;\r
d->iLeftVolume = s->iLeftVolume;\r
d->iRightVolume = s->iRightVolume;\r
d->ADSRX.AttackModeExp = s->ADSRX.AttackModeExp;\r
d->ADSRX.AttackRate = s->ADSRX.AttackRate;\r
d->ADSRX.DecayRate = s->ADSRX.DecayRate;\r
d->ADSRX.AttackModeExp = s->ADSRX.AttackModeExp;\r
d->ADSRX.AttackRate = s->ADSRX.AttackRate;\r
d->ADSRX.DecayRate = s->ADSRX.DecayRate;\r
d->ADSRX.ReleaseModeExp = s->ADSRX.ReleaseModeExp;\r
d->ADSRX.ReleaseRate = s->ADSRX.ReleaseRate;\r
d->ADSRX.EnvelopeVol = s->ADSRX.EnvelopeVol;\r
d->ADSRX.ReleaseModeExp = s->ADSRX.ReleaseModeExp;\r
d->ADSRX.ReleaseRate = s->ADSRX.ReleaseRate;\r
d->ADSRX.EnvelopeVol = s->ADSRX.EnvelopeVol;\r
+// force load from regArea to variables\r
+static void load_register(unsigned long reg, unsigned int cycles)\r
+{\r
+ unsigned short *r = &spu.regArea[((reg & 0xfff) - 0xc00) >> 1];\r
+ *r ^= 1;\r
+ SPUwriteRegister(reg, *r ^ 1, cycles);\r
+}\r
+\r
////////////////////////////////////////////////////////////////////////\r
// SPUFREEZE: called by main emu on savestate load/save\r
////////////////////////////////////////////////////////////////////////\r
\r
////////////////////////////////////////////////////////////////////////\r
// SPUFREEZE: called by main emu on savestate load/save\r
////////////////////////////////////////////////////////////////////////\r
\r
- memcpy(pF->cSPURam,spuMem,0x80000); // copy common infos\r
- memcpy(pF->cSPUPort,regArea,0x200);\r
+ do_samples(cycles, 1);\r
- if(xapGlobal && XAPlay!=XAFeed) // some xa\r
+ memcpy(pF->cSPURam,spu.spuMem,0x80000); // copy common infos\r
+ memcpy(pF->cSPUPort,spu.regArea,0x200);\r
+\r
+ if(spu.xapGlobal && spu.XAPlay!=spu.XAFeed) // some xa\r
}\r
else \r
memset(&pF->xaS,0,sizeof(xa_decode_t)); // or clean xa\r
\r
pFO=(SPUOSSFreeze_t *)(pF+1); // store special stuff\r
\r
}\r
else \r
memset(&pF->xaS,0,sizeof(xa_decode_t)); // or clean xa\r
\r
pFO=(SPUOSSFreeze_t *)(pF+1); // store special stuff\r
\r
if(pFO->spuAddr==0) pFO->spuAddr=0xbaadf00d;\r
\r
for(i=0;i<MAXCHAN;i++)\r
{\r
save_channel(&pFO->s_chan[i],&s_chan[i],i);\r
if(s_chan[i].pCurr)\r
if(pFO->spuAddr==0) pFO->spuAddr=0xbaadf00d;\r
\r
for(i=0;i<MAXCHAN;i++)\r
{\r
save_channel(&pFO->s_chan[i],&s_chan[i],i);\r
if(s_chan[i].pCurr)\r
- memcpy(spuMem,pF->cSPURam,0x80000); // get ram\r
- memcpy(regArea,pF->cSPUPort,0x200);\r
+ memcpy(spu.spuMem,pF->cSPURam,0x80000); // get ram\r
+ memcpy(spu.regArea,pF->cSPUPort,0x200);\r
- SPUwriteRegister(H_Reverb+i,regArea[(H_Reverb+i-0xc00)>>1]);\r
- SPUwriteRegister(H_SPUReverbAddr,regArea[(H_SPUReverbAddr-0xc00)>>1]);\r
- SPUwriteRegister(H_SPUrvolL,regArea[(H_SPUrvolL-0xc00)>>1]);\r
- SPUwriteRegister(H_SPUrvolR,regArea[(H_SPUrvolR-0xc00)>>1]);\r
+ load_register(H_Reverb+i, cycles);\r
+ load_register(H_SPUReverbAddr, cycles);\r
+ load_register(H_SPUrvolL, cycles);\r
+ load_register(H_SPUrvolR, cycles);\r
- SPUwriteRegister(H_SPUctrl,(unsigned short)(regArea[(H_SPUctrl-0xc00)>>1]|0x4000));\r
- SPUwriteRegister(H_SPUstat,regArea[(H_SPUstat-0xc00)>>1]);\r
- SPUwriteRegister(H_CDLeft,regArea[(H_CDLeft-0xc00)>>1]);\r
- SPUwriteRegister(H_CDRight,regArea[(H_CDRight-0xc00)>>1]);\r
+ load_register(H_SPUctrl, cycles);\r
+ load_register(H_SPUstat, cycles);\r
+ load_register(H_CDLeft, cycles);\r
+ load_register(H_CDRight, cycles);\r