X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=plugins%2Fdfsound%2Ffreeze.c;h=9fa29f04e5437555750df59097d61de9b5efafca;hp=d7e45b11d7d9f5df8ae3a77ef13fb3261cd44d6f;hb=54933c929d2e418e925ae823e3fa7607b2d5ac85;hpb=6d75977b13fede33db381324c610561c6e723a8b diff --git a/plugins/dfsound/freeze.c b/plugins/dfsound/freeze.c index d7e45b11..9fa29f04 100644 --- a/plugins/dfsound/freeze.c +++ b/plugins/dfsound/freeze.c @@ -27,6 +27,24 @@ // freeze structs //////////////////////////////////////////////////////////////////////// +typedef struct +{ + int AttackModeExp; + int AttackTime; + int DecayTime; + int SustainLevel; + int SustainModeExp; + int SustainModeDec; + int SustainTime; + int ReleaseModeExp; + unsigned int ReleaseVal; + int ReleaseTime; + int ReleaseStartTime; + int ReleaseVol; + int lTime; + int lVolume; +} ADSRInfo; + typedef struct { int State; @@ -40,9 +58,9 @@ typedef struct int ReleaseModeExp; int ReleaseRate; int EnvelopeVol; - long lVolume; - long lDummy1; - long lDummy2; + int lVolume; + int lDummy1; + int lDummy2; } ADSRInfoEx_orig; typedef struct @@ -58,9 +76,9 @@ typedef struct 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? :) int sval; - unsigned char * pStart; // start ptr into sound mem - unsigned char * pCurr; // current pos in sound mem - unsigned char * pLoop; // loop ptr in sound mem + int iStart; // start ptr into sound mem + int iCurr; // current pos in sound mem + int iLoop; // loop ptr in sound mem int bOn; // is channel active (sample playing?) int bStop; // is channel stopped (sample _can_ still be playing, ADSR Release phase) @@ -114,9 +132,7 @@ typedef struct //////////////////////////////////////////////////////////////////////// void LoadStateV5(SPUFreeze_t * pF); // newest version -void LoadStateUnknown(SPUFreeze_t * pF); // unknown format - -extern int lastch; +void LoadStateUnknown(SPUFreeze_t * pF, uint32_t cycles); // unknown format // we want to retain compatibility between versions, // so use original channel struct @@ -128,17 +144,17 @@ static void save_channel(SPUCHAN_orig *d, const SPUCHAN *s, int ch) d->spos = s->spos; d->sinc = s->sinc; memcpy(d->SB, s->SB, sizeof(d->SB)); - d->pStart = (unsigned char *)((regAreaGet(ch,6)&~1)<<3); - d->pCurr = s->pCurr; - d->pLoop = s->pLoop; + d->iStart = (regAreaGet(ch,6)&~1)<<3; + d->iCurr = 0; // set by the caller + d->iLoop = 0; // set by the caller d->bOn = !!(dwChannelOn & (1<bStop = s->bStop; d->bReverb = s->bReverb; - d->bIgnoreLoop = s->bJump; d->iActFreq = 1; d->iUsedFreq = 2; d->iLeftVolume = s->iLeftVolume; - d->bIgnoreLoop = 0; + // this one is nasty but safe, save compat is important + d->bIgnoreLoop = (s->prevflags ^ 2) << 1; d->iRightVolume = s->iRightVolume; d->iRawPitch = s->iRawPitch; d->s_1 = s->SB[27]; // yes it's reversed @@ -165,12 +181,13 @@ static void load_channel(SPUCHAN *d, const SPUCHAN_orig *s, int ch) memset(d, 0, sizeof(*d)); if (s->bNew) dwNewChannel |= 1<iSBPos = s->iSBPos; + if ((uint32_t)d->iSBPos >= 28) d->iSBPos = 27; d->spos = s->spos; d->sinc = s->sinc; + d->sinc_inv = 0; memcpy(d->SB, s->SB, sizeof(d->SB)); - d->pCurr = (void *)((long)s->pCurr & 0x7fff0); - d->pLoop = (void *)((long)s->pLoop & 0x7fff0); - if (s->bOn) dwChannelOn |= 1<pCurr = (void *)((long)s->iCurr & 0x7fff0); + d->pLoop = (void *)((long)s->iLoop & 0x7fff0); d->bStop = s->bStop; d->bReverb = s->bReverb; d->iLeftVolume = s->iLeftVolume; @@ -179,7 +196,7 @@ static void load_channel(SPUCHAN *d, const SPUCHAN_orig *s, int ch) d->bRVBActive = s->bRVBActive; d->bNoise = s->bNoise; d->bFMod = s->bFMod; - d->bJump = s->bIgnoreLoop; + d->prevflags = (s->bIgnoreLoop >> 1) ^ 2; d->ADSRX.State = s->ADSRX.State; d->ADSRX.AttackModeExp = s->ADSRX.AttackModeExp; d->ADSRX.AttackRate = s->ADSRX.AttackRate; @@ -191,13 +208,24 @@ static void load_channel(SPUCHAN *d, const SPUCHAN_orig *s, int ch) d->ADSRX.ReleaseModeExp = s->ADSRX.ReleaseModeExp; d->ADSRX.ReleaseRate = s->ADSRX.ReleaseRate; d->ADSRX.EnvelopeVol = s->ADSRX.EnvelopeVol; + if (s->bOn) dwChannelOn |= 1<ADSRX.EnvelopeVol = 0; +} + +// force load from regArea to variables +static void load_register(unsigned long reg, unsigned int cycles) +{ + unsigned short *r = ®Area[((reg & 0xfff) - 0xc00) >> 1]; + *r ^= 1; + SPUwriteRegister(reg, *r ^ 1, cycles); } //////////////////////////////////////////////////////////////////////// // SPUFREEZE: called by main emu on savestate load/save //////////////////////////////////////////////////////////////////////// -long CALLBACK SPUfreeze(uint32_t ulFreezeMode,SPUFreeze_t * pF) +long CALLBACK SPUfreeze(uint32_t ulFreezeMode, SPUFreeze_t * pF, + uint32_t cycles) { int i;SPUOSSFreeze_t * pFO; @@ -214,6 +242,8 @@ long CALLBACK SPUfreeze(uint32_t ulFreezeMode,SPUFreeze_t * pF) if(ulFreezeMode==2) return 1; // info mode? ok, bye // save mode: + do_samples(cycles); + memcpy(pF->cSPURam,spuMem,0x80000); // copy common infos memcpy(pF->cSPUPort,regArea,0x200); @@ -232,16 +262,13 @@ long CALLBACK SPUfreeze(uint32_t ulFreezeMode,SPUFreeze_t * pF) pFO->spuAddr=spuAddr; if(pFO->spuAddr==0) pFO->spuAddr=0xbaadf00d; - dwChannelOn&=~dwPendingChanOff; - dwPendingChanOff=0; - for(i=0;is_chan[i],&s_chan[i],i); - if(pFO->s_chan[i].pCurr) - pFO->s_chan[i].pCurr-=(unsigned long)spuMemC; - if(pFO->s_chan[i].pLoop) - pFO->s_chan[i].pLoop-=(unsigned long)spuMemC; + if(s_chan[i].pCurr) + pFO->s_chan[i].iCurr=s_chan[i].pCurr-spuMemC; + if(s_chan[i].pLoop) + pFO->s_chan[i].iLoop=s_chan[i].pLoop-spuMemC; } return 1; @@ -257,30 +284,28 @@ long CALLBACK SPUfreeze(uint32_t ulFreezeMode,SPUFreeze_t * pF) SPUplayADPCMchannel(&pF->xaS); xapGlobal=0; - dwPendingChanOff=0; if(!strcmp(pF->szSPUName,"PBOSS") && pF->ulFreezeVersion==5) LoadStateV5(pF); - else LoadStateUnknown(pF); - - lastch = -1; + else LoadStateUnknown(pF, cycles); // repair some globals for(i=0;i<=62;i+=2) - SPUwriteRegister(H_Reverb+i,regArea[(H_Reverb+i-0xc00)>>1]); - SPUwriteRegister(H_SPUReverbAddr,regArea[(H_SPUReverbAddr-0xc00)>>1]); - SPUwriteRegister(H_SPUrvolL,regArea[(H_SPUrvolL-0xc00)>>1]); - SPUwriteRegister(H_SPUrvolR,regArea[(H_SPUrvolR-0xc00)>>1]); + load_register(H_Reverb+i, cycles); + load_register(H_SPUReverbAddr, cycles); + load_register(H_SPUrvolL, cycles); + load_register(H_SPUrvolR, cycles); - SPUwriteRegister(H_SPUctrl,(unsigned short)(regArea[(H_SPUctrl-0xc00)>>1]|0x4000)); - SPUwriteRegister(H_SPUstat,regArea[(H_SPUstat-0xc00)>>1]); - SPUwriteRegister(H_CDLeft,regArea[(H_CDLeft-0xc00)>>1]); - SPUwriteRegister(H_CDRight,regArea[(H_CDRight-0xc00)>>1]); + load_register(H_SPUctrl, cycles); + load_register(H_SPUstat, cycles); + load_register(H_CDLeft, cycles); + load_register(H_CDRight, cycles); // fix to prevent new interpolations from crashing for(i=0;i