ADSRInfoEx_orig ADSRX; // next ADSR settings (will be moved to active on sample start)\r
} SPUCHAN_orig;\r
\r
-typedef struct\r
+typedef struct SPUFreeze\r
{\r
char szSPUName[8];\r
uint32_t ulFreezeVersion;\r
\r
SPUCHAN_orig s_chan[MAXCHAN]; \r
\r
+ uint32_t cycles_dma_end;\r
+ uint32_t decode_dirty_ch;\r
+ uint32_t dwNoiseVal;\r
+ uint32_t dwNoiseCount;\r
+ uint32_t XARepeat;\r
+ uint32_t XALastVal;\r
+ uint32_t last_keyon_cycles;\r
+\r
} SPUOSSFreeze_t;\r
\r
////////////////////////////////////////////////////////////////////////\r
// SPUFREEZE: called by main emu on savestate load/save\r
////////////////////////////////////////////////////////////////////////\r
\r
-long CALLBACK SPUfreeze(uint32_t ulFreezeMode, SPUFreeze_t * pF,\r
- uint32_t cycles)\r
+long CALLBACK SPUfreeze(unsigned int ulFreezeMode, SPUFreeze_t * pF,\r
+ unsigned int cycles)\r
{\r
SPUOSSFreeze_t * pFO = NULL;\r
int i;\r
\r
if(ulFreezeMode==2) return 1; // info mode? ok, bye\r
// save mode:\r
+ regAreaGet(H_SPUctrl) = spu.spuCtrl;\r
+ regAreaGet(H_SPUstat) = spu.spuStat;\r
memcpy(pF->cSPURam,spu.spuMem,0x80000); // copy common infos\r
memcpy(pF->cSPUPort,spu.regArea,0x200);\r
\r
pFO->xa_left = xa_left;\r
pFO->cdda_left = cdda_left;\r
pFO->cycles_played = spu.cycles_played;\r
+ pFO->cycles_dma_end = spu.cycles_dma_end;\r
+ pFO->decode_dirty_ch = spu.decode_dirty_ch;\r
+ pFO->dwNoiseVal = spu.dwNoiseVal;\r
+ pFO->dwNoiseCount = spu.dwNoiseCount;\r
+ pFO->XARepeat = spu.XARepeat;\r
+ pFO->XALastVal = spu.XALastVal;\r
+ pFO->last_keyon_cycles = spu.last_keyon_cycles;\r
\r
for(i=0;i<MAXCHAN;i++)\r
{\r
memcpy(spu.spuMem,pF->cSPURam,0x80000); // get ram\r
memcpy(spu.regArea,pF->cSPUPort,0x200);\r
spu.bMemDirty = 1;\r
+ spu.spuCtrl = regAreaGet(H_SPUctrl);\r
+ spu.spuStat = regAreaGet(H_SPUstat);\r
\r
if (!strcmp(pF->szSPUName,"PBOSS") && pF->ulFreezeVersion==5)\r
pFO = LoadStateV5(pF, cycles);\r
FeedCDDA((void *)pF->xaS.pcm, pFO->cdda_left * 4);\r
}\r
\r
+ // not in old savestates\r
+ spu.cycles_dma_end = 0;\r
+ spu.decode_dirty_ch = spu.dwChannelsAudible & 0x0a;\r
+ spu.dwNoiseVal = 0;\r
+ spu.dwNoiseCount = 0;\r
+ spu.XARepeat = 0;\r
+ spu.XALastVal = 0;\r
+ spu.last_keyon_cycles = cycles - 16*786u;\r
+ if (pFO && pF->ulFreezeSize >= sizeof(*pF) + sizeof(*pFO)) {\r
+ spu.cycles_dma_end = pFO->cycles_dma_end;\r
+ spu.decode_dirty_ch = pFO->decode_dirty_ch;\r
+ spu.dwNoiseVal = pFO->dwNoiseVal;\r
+ spu.dwNoiseCount = pFO->dwNoiseCount;\r
+ spu.XARepeat = pFO->XARepeat;\r
+ spu.XALastVal = pFO->XALastVal;\r
+ spu.last_keyon_cycles = pFO->last_keyon_cycles;\r
+ }\r
+\r
// repair some globals\r
for(i=0;i<=62;i+=2)\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
-\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
\r
+ // reverb\r
+ spu.rvb->StartAddr = regAreaGet(H_SPUReverbAddr) << 2;\r
if (spu.rvb->CurrAddr < spu.rvb->StartAddr)\r
spu.rvb->CurrAddr = spu.rvb->StartAddr;\r
// fix to prevent new interpolations from crashing\r
spu.s_chan[i].pCurr+=(uintptr_t)spu.spuMemC;\r
spu.s_chan[i].pLoop+=(uintptr_t)spu.spuMemC;\r
}\r
+\r
return pFO;\r
}\r
\r