* *\r
***************************************************************************/\r
\r
+#include <assert.h>\r
#include "stdafx.h"\r
\r
#define _IN_FREEZE\r
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
unsigned short decode_pos;\r
uint32_t pSpuIrq;\r
uint32_t spuAddr;\r
- uint32_t dummy1;\r
- uint32_t dummy2;\r
- uint32_t dummy3;\r
+ uint32_t rvb_cur;\r
+ uint16_t xa_left;\r
+ uint16_t cdda_left;\r
+ uint32_t cycles_played;\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
\r
-void LoadStateV5(SPUFreeze_t * pF); // newest version\r
-void LoadStateUnknown(SPUFreeze_t * pF, uint32_t cycles); // unknown format\r
+static SPUOSSFreeze_t * LoadStateV5(SPUFreeze_t * pF, uint32_t cycles);\r
+static void LoadStateUnknown(SPUFreeze_t * pF, uint32_t cycles); // unknown format\r
\r
// we want to retain compatibility between versions,\r
// so use original channel struct\r
d->iSBPos = s->iSBPos;\r
d->spos = s->spos;\r
d->sinc = s->sinc;\r
- memcpy(d->SB, spu.SB + ch * SB_SIZE, sizeof(d->SB[0]) * SB_SIZE);\r
+ assert(sizeof(d->SB) >= sizeof(spu.sb[ch]));\r
+ memcpy(d->SB, &spu.sb[ch], sizeof(spu.sb[ch]));\r
d->iStart = (regAreaGetCh(ch, 6) & ~1) << 3;\r
d->iCurr = 0; // set by the caller\r
d->iLoop = 0; // set by the caller\r
d->bIgnoreLoop = (s->prevflags ^ 2) << 1;\r
d->iRightVolume = s->iRightVolume;\r
d->iRawPitch = s->iRawPitch;\r
- d->s_1 = spu.SB[ch * SB_SIZE + 27]; // yes it's reversed\r
- d->s_2 = spu.SB[ch * SB_SIZE + 26];\r
+ d->s_1 = spu.sb[ch].SB[27]; // yes it's reversed\r
+ d->s_2 = spu.sb[ch].SB[26];\r
d->bRVBActive = s->bRVBActive;\r
d->bNoise = s->bNoise;\r
d->bFMod = s->bFMod;\r
d->spos = s->spos;\r
d->sinc = s->sinc;\r
d->sinc_inv = 0;\r
- memcpy(spu.SB + ch * SB_SIZE, s->SB, sizeof(spu.SB[0]) * SB_SIZE);\r
+ memcpy(&spu.sb[ch], s->SB, sizeof(spu.sb[ch]));\r
d->pCurr = (void *)((uintptr_t)s->iCurr & 0x7fff0);\r
d->pLoop = (void *)((uintptr_t)s->iLoop & 0x7fff0);\r
d->bReverb = s->bReverb;\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
- int i;SPUOSSFreeze_t * pFO;\r
+ SPUOSSFreeze_t * pFO = NULL;\r
+ int i;\r
\r
if(!pF) return 0; // first check\r
\r
- do_samples(cycles, 1);\r
-\r
if(ulFreezeMode) // info or save?\r
{//--------------------------------------------------//\r
+ int xa_left = 0, cdda_left = 0;\r
+ do_samples(cycles, 1);\r
+\r
if(ulFreezeMode==1) \r
memset(pF,0,sizeof(SPUFreeze_t)+sizeof(SPUOSSFreeze_t));\r
\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
if(spu.xapGlobal && spu.XAPlay!=spu.XAFeed) // some xa\r
{\r
- pF->xaS=*spu.xapGlobal;\r
+ xa_left = spu.XAFeed - spu.XAPlay;\r
+ if (xa_left < 0)\r
+ xa_left = spu.XAEnd - spu.XAPlay + spu.XAFeed - spu.XAStart;\r
+ pF->xaS = *spu.xapGlobal;\r
+ }\r
+ else if (spu.CDDAPlay != spu.CDDAFeed)\r
+ {\r
+ // abuse the xa struct to store leftover cdda samples\r
+ unsigned int *p = spu.CDDAPlay;\r
+ cdda_left = spu.CDDAFeed - spu.CDDAPlay;\r
+ if (cdda_left < 0)\r
+ cdda_left = spu.CDDAEnd - spu.CDDAPlay + spu.CDDAFeed - spu.CDDAStart;\r
+ if (cdda_left > sizeof(pF->xaS.pcm) / 4)\r
+ cdda_left = sizeof(pF->xaS.pcm) / 4;\r
+ if (p + cdda_left <= spu.CDDAEnd)\r
+ memcpy(pF->xaS.pcm, p, cdda_left * 4);\r
+ else {\r
+ memcpy(pF->xaS.pcm, p, (spu.CDDAEnd - p) * 4);\r
+ memcpy((char *)pF->xaS.pcm + (spu.CDDAEnd - p) * 4, spu.CDDAStart,\r
+ (cdda_left - (spu.CDDAEnd - p)) * 4);\r
+ }\r
+ pF->xaS.nsamples = 0;\r
}\r
- else \r
- memset(&pF->xaS,0,sizeof(xa_decode_t)); // or clean xa\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
pFO->spuAddr=spu.spuAddr;\r
if(pFO->spuAddr==0) pFO->spuAddr=0xbaadf00d;\r
pFO->decode_pos = spu.decode_pos;\r
+ pFO->rvb_cur = spu.rvb->CurrAddr;\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(pF->xaS.nsamples<=4032) // start xa again\r
- SPUplayADPCMchannel(&pF->xaS, spu.cycles_played, 0);\r
-\r
- spu.xapGlobal=0;\r
-\r
- if(!strcmp(pF->szSPUName,"PBOSS") && pF->ulFreezeVersion==5)\r
- LoadStateV5(pF);\r
+ if (!strcmp(pF->szSPUName,"PBOSS") && pF->ulFreezeVersion==5)\r
+ pFO = LoadStateV5(pF, cycles);\r
else LoadStateUnknown(pF, cycles);\r
\r
+ spu.XAPlay = spu.XAFeed = spu.XAStart;\r
+ spu.CDDAPlay = spu.CDDAFeed = spu.CDDAStart;\r
+ if (pFO && pFO->xa_left && pF->xaS.nsamples) { // start xa again\r
+ FeedXA(&pF->xaS);\r
+ spu.XAPlay = spu.XAFeed - pFO->xa_left;\r
+ if (spu.XAPlay < spu.XAStart)\r
+ spu.XAPlay = spu.XAStart;\r
+ }\r
+ else if (pFO && pFO->cdda_left) { // start cdda again\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
- for(i=0;i<MAXCHAN;i++) spu.SB[i * SB_SIZE + 28]=0;\r
+ spu.interpolation = -1;\r
\r
ClearWorkingState();\r
- spu.cycles_played = cycles;\r
\r
if (spu.spuCtrl & CTRL_IRQ)\r
schedule_next_irq();\r
\r
////////////////////////////////////////////////////////////////////////\r
\r
-void LoadStateV5(SPUFreeze_t * pF)\r
+static SPUOSSFreeze_t * LoadStateV5(SPUFreeze_t * pF, uint32_t cycles)\r
{\r
int i;SPUOSSFreeze_t * pFO;\r
\r
else spu.spuAddr = pFO->spuAddr & 0x7fffe;\r
}\r
spu.decode_pos = pFO->decode_pos & 0x1ff;\r
+ spu.rvb->CurrAddr = pFO->rvb_cur;\r
+ spu.cycles_played = pFO->cycles_played ? pFO->cycles_played : cycles;\r
\r
spu.dwNewChannel=0;\r
spu.dwChannelsAudible=0;\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
////////////////////////////////////////////////////////////////////////\r
\r
-void LoadStateUnknown(SPUFreeze_t * pF, uint32_t cycles)\r
+static void LoadStateUnknown(SPUFreeze_t * pF, uint32_t cycles)\r
{\r
int i;\r
\r
spu.dwChannelsAudible=0;\r
spu.dwChannelDead=0;\r
spu.pSpuIrq=spu.spuMemC;\r
+ spu.cycles_played = cycles;\r
\r
for(i=0;i<0xc0;i++)\r
{\r
}\r
\r
////////////////////////////////////////////////////////////////////////\r
+// vim:shiftwidth=1:expandtab\r