typedef struct\r
{\r
unsigned short spuIrq;\r
+ unsigned short decode_pos;\r
uint32_t pSpuIrq;\r
uint32_t spuAddr;\r
uint32_t dummy1;\r
static void save_channel(SPUCHAN_orig *d, const SPUCHAN *s, int ch)\r
{\r
memset(d, 0, sizeof(*d));\r
- d->bNew = !!(dwNewChannel & (1<<ch));\r
+ d->bNew = !!(spu.dwNewChannel & (1<<ch));\r
d->iSBPos = s->iSBPos;\r
d->spos = s->spos;\r
d->sinc = s->sinc;\r
- memcpy(d->SB, s->SB, sizeof(d->SB));\r
+ memcpy(d->SB, spu.SB + ch * SB_SIZE, sizeof(d->SB[0]) * SB_SIZE);\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->bOn = !!(dwChannelOn & (1<<ch));\r
- d->bStop = s->bStop;\r
+ d->bOn = !!(spu.dwChannelOn & (1<<ch));\r
+ d->bStop = s->ADSRX.State == ADSR_RELEASE;\r
d->bReverb = s->bReverb;\r
d->iActFreq = 1;\r
d->iUsedFreq = 2;\r
d->bIgnoreLoop = (s->prevflags ^ 2) << 1;\r
d->iRightVolume = s->iRightVolume;\r
d->iRawPitch = s->iRawPitch;\r
- d->s_1 = s->SB[27]; // yes it's reversed\r
- d->s_2 = s->SB[26];\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->bRVBActive = s->bRVBActive;\r
d->bNoise = s->bNoise;\r
d->bFMod = s->bFMod;\r
static void load_channel(SPUCHAN *d, const SPUCHAN_orig *s, int ch)\r
{\r
memset(d, 0, sizeof(*d));\r
- if (s->bNew) dwNewChannel |= 1<<ch;\r
+ if (s->bNew) spu.dwNewChannel |= 1<<ch;\r
d->iSBPos = s->iSBPos;\r
if ((uint32_t)d->iSBPos >= 28) d->iSBPos = 27;\r
d->spos = s->spos;\r
d->sinc = s->sinc;\r
d->sinc_inv = 0;\r
- memcpy(d->SB, s->SB, sizeof(d->SB));\r
+ memcpy(spu.SB + ch * SB_SIZE, s->SB, sizeof(spu.SB[0]) * SB_SIZE);\r
d->pCurr = (void *)((long)s->iCurr & 0x7fff0);\r
d->pLoop = (void *)((long)s->iLoop & 0x7fff0);\r
- d->bStop = s->bStop;\r
d->bReverb = s->bReverb;\r
d->iLeftVolume = s->iLeftVolume;\r
d->iRightVolume = s->iRightVolume;\r
d->bFMod = s->bFMod;\r
d->prevflags = (s->bIgnoreLoop >> 1) ^ 2;\r
d->ADSRX.State = s->ADSRX.State;\r
+ if (s->bStop) d->ADSRX.State = ADSR_RELEASE;\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
- if (s->bOn) dwChannelOn |= 1<<ch;\r
+ if (s->bOn) spu.dwChannelOn |= 1<<ch;\r
else d->ADSRX.EnvelopeVol = 0;\r
}\r
\r
// force load from regArea to variables\r
static void load_register(unsigned long reg, unsigned int cycles)\r
{\r
- unsigned short *r = ®Area[((reg & 0xfff) - 0xc00) >> 1];\r
+ unsigned short *r = &spu.regArea[((reg & 0xfff) - 0xc00) >> 1];\r
*r ^= 1;\r
SPUwriteRegister(reg, *r ^ 1, cycles);\r
}\r
\r
if(!pF) return 0; // first check\r
\r
+ do_samples(cycles, 1);\r
+\r
if(ulFreezeMode) // info or save?\r
{//--------------------------------------------------//\r
if(ulFreezeMode==1) \r
\r
if(ulFreezeMode==2) return 1; // info mode? ok, bye\r
// save mode:\r
- do_samples(cycles);\r
-\r
- memcpy(pF->cSPURam,spuMem,0x80000); // copy common infos\r
- memcpy(pF->cSPUPort,regArea,0x200);\r
+ memcpy(pF->cSPURam,spu.spuMem,0x80000); // copy common infos\r
+ memcpy(pF->cSPUPort,spu.regArea,0x200);\r
\r
- if(xapGlobal && XAPlay!=XAFeed) // some xa\r
+ if(spu.xapGlobal && spu.XAPlay!=spu.XAFeed) // some xa\r
{\r
- pF->xaS=*xapGlobal; \r
+ pF->xaS=*spu.xapGlobal;\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
- pFO->spuIrq=spuIrq;\r
- if(pSpuIrq) pFO->pSpuIrq = (unsigned long)pSpuIrq-(unsigned long)spuMemC;\r
+ pFO->spuIrq = spu.regArea[(H_SPUirqAddr - 0x0c00) / 2];\r
+ if(spu.pSpuIrq) pFO->pSpuIrq = (unsigned long)spu.pSpuIrq-(unsigned long)spu.spuMemC;\r
\r
- pFO->spuAddr=spuAddr;\r
+ pFO->spuAddr=spu.spuAddr;\r
if(pFO->spuAddr==0) pFO->spuAddr=0xbaadf00d;\r
+ pFO->decode_pos = spu.decode_pos;\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
- pFO->s_chan[i].iCurr=s_chan[i].pCurr-spuMemC;\r
- if(s_chan[i].pLoop)\r
- pFO->s_chan[i].iLoop=s_chan[i].pLoop-spuMemC;\r
+ save_channel(&pFO->s_chan[i],&spu.s_chan[i],i);\r
+ if(spu.s_chan[i].pCurr)\r
+ pFO->s_chan[i].iCurr=spu.s_chan[i].pCurr-spu.spuMemC;\r
+ if(spu.s_chan[i].pLoop)\r
+ pFO->s_chan[i].iLoop=spu.s_chan[i].pLoop-spu.spuMemC;\r
}\r
\r
return 1;\r
\r
if(ulFreezeMode!=0) return 0; // bad mode? bye\r
\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
+ spu.bMemDirty = 1;\r
\r
if(pF->xaS.nsamples<=4032) // start xa again\r
SPUplayADPCMchannel(&pF->xaS);\r
\r
- xapGlobal=0;\r
+ spu.xapGlobal=0;\r
\r
if(!strcmp(pF->szSPUName,"PBOSS") && pF->ulFreezeVersion==5)\r
LoadStateV5(pF);\r
load_register(H_CDRight, cycles);\r
\r
// fix to prevent new interpolations from crashing\r
- for(i=0;i<MAXCHAN;i++) s_chan[i].SB[28]=0;\r
+ for(i=0;i<MAXCHAN;i++) spu.SB[i * SB_SIZE + 28]=0;\r
\r
ClearWorkingState();\r
- cycles_played = cycles;\r
+ spu.cycles_played = cycles;\r
+\r
+ if (spu.spuCtrl & CTRL_IRQ)\r
+ schedule_next_irq();\r
\r
return 1;\r
}\r
\r
pFO=(SPUOSSFreeze_t *)(pF+1);\r
\r
- spuIrq = pFO->spuIrq;\r
- if(pFO->pSpuIrq) pSpuIrq = spuMemC+((long)pFO->pSpuIrq&0x7fff0); else pSpuIrq=NULL;\r
+ spu.pSpuIrq = spu.spuMemC + ((spu.regArea[(H_SPUirqAddr - 0x0c00) / 2] << 3) & ~0xf);\r
\r
if(pFO->spuAddr)\r
{\r
- spuAddr = pFO->spuAddr;\r
- if (spuAddr == 0xbaadf00d) spuAddr = 0;\r
+ if (pFO->spuAddr == 0xbaadf00d) spu.spuAddr = 0;\r
+ else spu.spuAddr = pFO->spuAddr & 0x7fffe;\r
}\r
+ spu.decode_pos = pFO->decode_pos & 0x1ff;\r
\r
- dwNewChannel=0;\r
- dwChannelOn=0;\r
- dwChannelDead=0;\r
+ spu.dwNewChannel=0;\r
+ spu.dwChannelOn=0;\r
+ spu.dwChannelDead=0;\r
for(i=0;i<MAXCHAN;i++)\r
{\r
- load_channel(&s_chan[i],&pFO->s_chan[i],i);\r
+ load_channel(&spu.s_chan[i],&pFO->s_chan[i],i);\r
\r
- s_chan[i].pCurr+=(unsigned long)spuMemC;\r
- s_chan[i].pLoop+=(unsigned long)spuMemC;\r
+ spu.s_chan[i].pCurr+=(unsigned long)spu.spuMemC;\r
+ spu.s_chan[i].pLoop+=(unsigned long)spu.spuMemC;\r
}\r
}\r
\r
\r
for(i=0;i<MAXCHAN;i++)\r
{\r
- s_chan[i].bStop=0;\r
- s_chan[i].pLoop=spuMemC;\r
+ spu.s_chan[i].pLoop=spu.spuMemC;\r
}\r
\r
- dwNewChannel=0;\r
- dwChannelOn=0;\r
- dwChannelDead=0;\r
- pSpuIrq=0;\r
+ spu.dwNewChannel=0;\r
+ spu.dwChannelOn=0;\r
+ spu.dwChannelDead=0;\r
+ spu.pSpuIrq=spu.spuMemC;\r
\r
for(i=0;i<0xc0;i++)\r
{\r
notaz.gp2x.de / pcsx_rearmed.git / blobdiff