#include "externals.h"\r
#include "registers.h"\r
#include "spu.h"\r
-#include "regs.h"\r
\r
////////////////////////////////////////////////////////////////////////\r
// freeze structs\r
////////////////////////////////////////////////////////////////////////\r
\r
+typedef struct\r
+{\r
+ int AttackModeExp;\r
+ int AttackTime;\r
+ int DecayTime;\r
+ int SustainLevel;\r
+ int SustainModeExp;\r
+ int SustainModeDec;\r
+ int SustainTime;\r
+ int ReleaseModeExp;\r
+ unsigned int ReleaseVal;\r
+ int ReleaseTime;\r
+ int ReleaseStartTime; \r
+ int ReleaseVol; \r
+ int lTime;\r
+ int lVolume;\r
+} ADSRInfo;\r
+\r
+typedef struct\r
+{\r
+ int State;\r
+ int AttackModeExp;\r
+ int AttackRate;\r
+ int DecayRate;\r
+ int SustainLevel;\r
+ int SustainModeExp;\r
+ int SustainIncrease;\r
+ int SustainRate;\r
+ int ReleaseModeExp;\r
+ int ReleaseRate;\r
+ int EnvelopeVol;\r
+ int lVolume;\r
+ int lDummy1;\r
+ int lDummy2;\r
+} ADSRInfoEx_orig;\r
+\r
+typedef struct\r
+{\r
+ // no mutexes used anymore... don't need them to sync access\r
+ //HANDLE hMutex;\r
+\r
+ int bNew; // start flag\r
+\r
+ int iSBPos; // mixing stuff\r
+ int spos;\r
+ int sinc;\r
+ int SB[32+32]; // Pete added another 32 dwords in 1.6 ... prevents overflow issues with gaussian/cubic interpolation (thanx xodnizel!), and can be used for even better interpolations, eh? :)\r
+ int sval;\r
+\r
+ int iStart; // start ptr into sound mem\r
+ int iCurr; // current pos in sound mem\r
+ int iLoop; // loop ptr in sound mem\r
+\r
+ int bOn; // is channel active (sample playing?)\r
+ int bStop; // is channel stopped (sample _can_ still be playing, ADSR Release phase)\r
+ int bReverb; // can we do reverb on this channel? must have ctrl register bit, to get active\r
+ int iActFreq; // current psx pitch\r
+ int iUsedFreq; // current pc pitch\r
+ int iLeftVolume; // left volume\r
+ int iLeftVolRaw; // left psx volume value\r
+ int bIgnoreLoop; // ignore loop bit, if an external loop address is used\r
+ int iMute; // mute mode\r
+ int iRightVolume; // right volume\r
+ int iRightVolRaw; // right psx volume value\r
+ int iRawPitch; // raw pitch (0...3fff)\r
+ int iIrqDone; // debug irq done flag\r
+ int s_1; // last decoding infos\r
+ int s_2;\r
+ int bRVBActive; // reverb active flag\r
+ int iRVBOffset; // reverb offset\r
+ int iRVBRepeat; // reverb repeat\r
+ int bNoise; // noise active flag\r
+ int bFMod; // freq mod (0=off, 1=sound channel, 2=freq channel)\r
+ int iRVBNum; // another reverb helper\r
+ int iOldNoise; // old noise val for this channel \r
+ ADSRInfo ADSR; // active ADSR settings\r
+ ADSRInfoEx_orig ADSRX; // next ADSR settings (will be moved to active on sample start)\r
+} SPUCHAN_orig;\r
+\r
typedef struct\r
{\r
char szSPUName[8];\r
uint32_t dummy2;\r
uint32_t dummy3;\r
\r
- SPUCHAN s_chan[MAXCHAN]; \r
+ SPUCHAN_orig s_chan[MAXCHAN]; \r
\r
} SPUOSSFreeze_t;\r
\r
////////////////////////////////////////////////////////////////////////\r
\r
void LoadStateV5(SPUFreeze_t * pF); // newest version\r
-void LoadStateUnknown(SPUFreeze_t * pF); // unknown format\r
+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
+static void save_channel(SPUCHAN_orig *d, const SPUCHAN *s, int ch)\r
+{\r
+ memset(d, 0, sizeof(*d));\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
+ 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 = !!(spu.dwChannelOn & (1<<ch));\r
+ d->bStop = s->bStop;\r
+ d->bReverb = s->bReverb;\r
+ d->iActFreq = 1;\r
+ d->iUsedFreq = 2;\r
+ d->iLeftVolume = s->iLeftVolume;\r
+ // this one is nasty but safe, save compat is important\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->bRVBActive = s->bRVBActive;\r
+ d->bNoise = s->bNoise;\r
+ d->bFMod = s->bFMod;\r
+ d->ADSRX.State = s->ADSRX.State;\r
+ d->ADSRX.AttackModeExp = s->ADSRX.AttackModeExp;\r
+ d->ADSRX.AttackRate = s->ADSRX.AttackRate;\r
+ d->ADSRX.DecayRate = s->ADSRX.DecayRate;\r
+ d->ADSRX.SustainLevel = s->ADSRX.SustainLevel;\r
+ d->ADSRX.SustainModeExp = s->ADSRX.SustainModeExp;\r
+ d->ADSRX.SustainIncrease = s->ADSRX.SustainIncrease;\r
+ d->ADSRX.SustainRate = s->ADSRX.SustainRate;\r
+ d->ADSRX.ReleaseModeExp = s->ADSRX.ReleaseModeExp;\r
+ d->ADSRX.ReleaseRate = s->ADSRX.ReleaseRate;\r
+ d->ADSRX.EnvelopeVol = s->ADSRX.EnvelopeVol;\r
+ d->ADSRX.lVolume = d->bOn; // hmh\r
+}\r
+\r
+static void load_channel(SPUCHAN *d, const SPUCHAN_orig *s, int ch)\r
+{\r
+ memset(d, 0, sizeof(*d));\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
+ 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->iRawPitch = s->iRawPitch;\r
+ d->bRVBActive = s->bRVBActive;\r
+ d->bNoise = s->bNoise;\r
+ d->bFMod = s->bFMod;\r
+ d->prevflags = (s->bIgnoreLoop >> 1) ^ 2;\r
+ d->ADSRX.State = s->ADSRX.State;\r
+ d->ADSRX.AttackModeExp = s->ADSRX.AttackModeExp;\r
+ d->ADSRX.AttackRate = s->ADSRX.AttackRate;\r
+ d->ADSRX.DecayRate = s->ADSRX.DecayRate;\r
+ d->ADSRX.SustainLevel = s->ADSRX.SustainLevel;\r
+ d->ADSRX.SustainModeExp = s->ADSRX.SustainModeExp;\r
+ d->ADSRX.SustainIncrease = s->ADSRX.SustainIncrease;\r
+ d->ADSRX.SustainRate = s->ADSRX.SustainRate;\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) spu.dwChannelOn |= 1<<ch;\r
+ else d->ADSRX.EnvelopeVol = 0;\r
+}\r
\r
-extern int lastch;\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
-long CALLBACK SPUfreeze(uint32_t ulFreezeMode,SPUFreeze_t * pF)\r
+long CALLBACK SPUfreeze(uint32_t ulFreezeMode, SPUFreeze_t * pF,\r
+ uint32_t cycles)\r
{\r
int i;SPUOSSFreeze_t * pFO;\r
\r
\r
if(ulFreezeMode==2) return 1; // info mode? ok, bye\r
// save mode:\r
- RemoveTimer(); // stop timer\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
\r
for(i=0;i<MAXCHAN;i++)\r
{\r
- memcpy((void *)&pFO->s_chan[i],(void *)&s_chan[i],sizeof(SPUCHAN));\r
- if(pFO->s_chan[i].pStart)\r
- pFO->s_chan[i].pStart-=(unsigned long)spuMemC;\r
- if(pFO->s_chan[i].pCurr)\r
- pFO->s_chan[i].pCurr-=(unsigned long)spuMemC;\r
- if(pFO->s_chan[i].pLoop)\r
- pFO->s_chan[i].pLoop-=(unsigned long)spuMemC;\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-spu.spuMemC;\r
+ if(s_chan[i].pLoop)\r
+ pFO->s_chan[i].iLoop=s_chan[i].pLoop-spu.spuMemC;\r
}\r
\r
- SetupTimer(); // sound processing on again\r
-\r
return 1;\r
//--------------------------------------------------//\r
}\r
\r
if(ulFreezeMode!=0) return 0; // bad mode? bye\r
\r
- RemoveTimer(); // we stop processing while doing the save!\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
\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
- else LoadStateUnknown(pF);\r
-\r
- lastch = -1;\r
+ else LoadStateUnknown(pF, cycles);\r
\r
// repair some globals\r
for(i=0;i<=62;i+=2)\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
\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
\r
// fix to prevent new interpolations from crashing\r
for(i=0;i<MAXCHAN;i++) s_chan[i].SB[28]=0;\r
\r
- SetupTimer(); // start sound processing again\r
+ ClearWorkingState();\r
+ spu.cycles_played = cycles;\r
\r
return 1;\r
}\r
\r
pFO=(SPUOSSFreeze_t *)(pF+1);\r
\r
- spuIrq = pFO->spuIrq;\r
- if(pFO->pSpuIrq) pSpuIrq = pFO->pSpuIrq+spuMemC; else pSpuIrq=NULL;\r
+ if(pFO->pSpuIrq) spu.pSpuIrq = spu.spuMemC+((long)pFO->pSpuIrq&0x7fff0); else spu.pSpuIrq=NULL;\r
\r
if(pFO->spuAddr)\r
{\r
- spuAddr = pFO->spuAddr;\r
- if (spuAddr == 0xbaadf00d) spuAddr = 0;\r
+ spu.spuAddr = pFO->spuAddr;\r
+ if (spu.spuAddr == 0xbaadf00d) spu.spuAddr = 0;\r
}\r
\r
+ spu.dwNewChannel=0;\r
+ spu.dwChannelOn=0;\r
+ spu.dwChannelDead=0;\r
for(i=0;i<MAXCHAN;i++)\r
{\r
- memcpy((void *)&s_chan[i],(void *)&pFO->s_chan[i],sizeof(SPUCHAN));\r
+ load_channel(&s_chan[i],&pFO->s_chan[i],i);\r
\r
- s_chan[i].pStart+=(unsigned long)spuMemC;\r
- s_chan[i].pCurr+=(unsigned long)spuMemC;\r
- s_chan[i].pLoop+=(unsigned long)spuMemC;\r
- s_chan[i].iMute=0;\r
- s_chan[i].iIrqDone=0;\r
+ s_chan[i].pCurr+=(unsigned long)spu.spuMemC;\r
+ s_chan[i].pLoop+=(unsigned long)spu.spuMemC;\r
}\r
}\r
\r
////////////////////////////////////////////////////////////////////////\r
\r
-void LoadStateUnknown(SPUFreeze_t * pF)\r
+void LoadStateUnknown(SPUFreeze_t * pF, uint32_t cycles)\r
{\r
int i;\r
\r
for(i=0;i<MAXCHAN;i++)\r
{\r
- s_chan[i].bOn=0;\r
- s_chan[i].bNew=0;\r
s_chan[i].bStop=0;\r
- s_chan[i].ADSR.lVolume=0;\r
- s_chan[i].pLoop=spuMemC;\r
- s_chan[i].pStart=spuMemC;\r
- s_chan[i].pLoop=spuMemC;\r
- s_chan[i].iMute=0;\r
- s_chan[i].iIrqDone=0;\r
+ s_chan[i].pLoop=spu.spuMemC;\r
}\r
\r
- dwNewChannel=0;\r
- pSpuIrq=0;\r
+ spu.dwNewChannel=0;\r
+ spu.dwChannelOn=0;\r
+ spu.dwChannelDead=0;\r
+ spu.pSpuIrq=0;\r
\r
for(i=0;i<0xc0;i++)\r
{\r
- SPUwriteRegister(0x1f801c00+i*2,regArea[i]);\r
+ load_register(0x1f801c00 + i*2, cycles);\r
}\r
}\r
\r