X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=plugins%2Fdfsound%2Fspu.c;h=79e534cd5da246976935acfa9e7d6642a51dbfc8;hp=0f952fbb5e657d53a9e682352a87b876df9ed3c4;hb=1ab7621a76d1ef82fde77322c12d4076889bed01;hpb=5238f6f8fcf43fb8506467b358ee976a8c5fdf6b diff --git a/plugins/dfsound/spu.c b/plugins/dfsound/spu.c index 0f952fbb..79e534cd 100644 --- a/plugins/dfsound/spu.c +++ b/plugins/dfsound/spu.c @@ -20,6 +20,7 @@ #define _IN_SPU #include "externals.h" +#include "registers.h" #include "cfg.h" #include "dsoundoss.h" #include "regs.h" @@ -95,6 +96,7 @@ static pthread_t thread = (pthread_t)-1; // thread id (linux) unsigned long dwNewChannel=0; // flags for faster testing, if new channel starts unsigned long dwChannelOn=0; +unsigned long dwPendingChanOff=0; void (CALLBACK *irqCallback)(void)=0; // func of main emu, called on spu irq void (CALLBACK *cddavCallback)(unsigned short,unsigned short)=0; @@ -106,6 +108,7 @@ static const int f[8][2] = { { 0, 0 }, { 115, -52 }, { 98, -55 }, { 122, -60 } }; +int ChanBuf[NSSIZE]; int SSumLR[NSSIZE*2]; int iFMod[NSSIZE]; int iCycle = 0; @@ -423,6 +426,101 @@ INLINE int iGetInterpolationVal(int ch) return fa; } +static void do_irq(void) +{ + if(!(spuStat & STAT_IRQ)) + { + spuStat |= STAT_IRQ; + if(irqCallback) irqCallback(); + } +} + +static int decode_block(int ch) +{ + unsigned char *start; + unsigned int nSample; + int predict_nr,shift_factor,flags,d,s; + int fa,s_1,s_2; + int ret = 0; + + s_chan[ch].iSBPos=0; + + start=s_chan[ch].pCurr; // set up the current pos + if(start == (unsigned char*)-1 || // special "stop" sign + (dwPendingChanOff&(1< turn everything off + dwPendingChanOff&=~(1< and done for this channel + } + + //////////////////////////////////////////// irq check + + if(spuCtrl&CTRL_IRQ) + { + if(pSpuIrq == start) // irq address reached? + { + do_irq(); // -> call main emu + ret = 1; + } + } + + s_1=s_chan[ch].s_1; + s_2=s_chan[ch].s_2; + + predict_nr=(int)*start;start++; + shift_factor=predict_nr&0xf; + predict_nr >>= 4; + flags=(int)*start;start++; + + // -------------------------------------- // + + for (nSample=0;nSample<28;start++) + { + d=(int)*start; + s=((d&0xf)<<12); + if(s&0x8000) s|=0xffff0000; + + fa=(s >> shift_factor); + fa=fa + ((s_1 * f[predict_nr][0])>>6) + ((s_2 * f[predict_nr][1])>>6); + s_2=s_1;s_1=fa; + s=((d & 0xf0) << 8); + + s_chan[ch].SB[nSample++]=fa; + + if(s&0x8000) s|=0xffff0000; + fa=(s>>shift_factor); + fa=fa + ((s_1 * f[predict_nr][0])>>6) + ((s_2 * f[predict_nr][1])>>6); + s_2=s_1;s_1=fa; + + s_chan[ch].SB[nSample++]=fa; + } + + //////////////////////////////////////////// flag handler + + if((flags&4) && (!s_chan[ch].bIgnoreLoop)) + s_chan[ch].pLoop=start-16; // loop adress + + if(flags&1) // 1: stop/loop + { + if(!(flags&2)) + dwPendingChanOff|=1<= 0x80000) + start = (unsigned char*)-1; + + s_chan[ch].pCurr=start; // store values for next cycle + s_chan[ch].s_1=s_1; + s_chan[ch].s_2=s_2; + + return ret; +} + //////////////////////////////////////////////////////////////////////// // MAIN SPU FUNCTION // here is the main job handler... thread, timer or direct func call @@ -440,14 +538,13 @@ INLINE int iGetInterpolationVal(int ch) static void *MAINThread(void *arg) { - int s_1,s_2,fa,ns,ns_from,ns_to; + int fa,ns,ns_from,ns_to; #if !defined(_MACOSX) && !defined(__arm__) int voldiv = iVolume; #else const int voldiv = 2; #endif - unsigned char * start;unsigned int nSample; - int ch,predict_nr,shift_factor,flags,d,s; + int ch,d; int bIRQReturn=0; while(!bEndThread) // until we are shutting down @@ -484,7 +581,7 @@ static void *MAINThread(void *arg) ch=0; if(lastch>=0) // will be -1 if no continue is pending { - ch=lastch; ns_from=lastns+1; lastch=-1; // -> setup all kind of vars to continue + ch=lastch; ns_from=lastns; lastch=-1; // -> setup all kind of vars to continue } //--------------------------------------------------// @@ -501,7 +598,7 @@ static void *MAINThread(void *arg) for(ns=ns_from;ns turn everything off - s_chan[ch].ADSRX.EnvelopeVol=0; - goto ENDX; // -> and done for this channel - } - - s_chan[ch].iSBPos=0; - - //////////////////////////////////////////// spu irq handler here? mmm... do it later - - s_1=s_chan[ch].s_1; - s_2=s_chan[ch].s_2; - - predict_nr=(int)*start;start++; - shift_factor=predict_nr&0xf; - predict_nr >>= 4; - flags=(int)*start;start++; - - // -------------------------------------- // - - for (nSample=0;nSample<28;start++) - { - d=(int)*start; - s=((d&0xf)<<12); - if(s&0x8000) s|=0xffff0000; - - fa=(s >> shift_factor); - fa=fa + ((s_1 * f[predict_nr][0])>>6) + ((s_2 * f[predict_nr][1])>>6); - s_2=s_1;s_1=fa; - s=((d & 0xf0) << 8); - - s_chan[ch].SB[nSample++]=fa; - - if(s&0x8000) s|=0xffff0000; - fa=(s>>shift_factor); - fa=fa + ((s_1 * f[predict_nr][0])>>6) + ((s_2 * f[predict_nr][1])>>6); - s_2=s_1;s_1=fa; - - s_chan[ch].SB[nSample++]=fa; - } - - //////////////////////////////////////////// irq check - - if(irqCallback && (spuCtrl&0x40)) // some callback and irq active? + d = decode_block(ch); + if(d && iSPUIRQWait) // -> option: wait after irq for main emu { - if((pSpuIrq > start-16 && // irq address reached? - pSpuIrq <= start) || - ((flags&1) && // special: irq on looping addr, when stop/loop flag is set - (pSpuIrq > s_chan[ch].pLoop-16 && - pSpuIrq <= s_chan[ch].pLoop))) - { - irqCallback(); // -> call main emu - - if(iSPUIRQWait) // -> option: wait after irq for main emu - { - iSpuAsyncWait=1; - bIRQReturn=1; - lastch=ch; - lastns=ns; - ns_to=ns+1; - } - } + bIRQReturn=1; + lastch=ch; + lastns=ns_to=ns; + goto ENDX; // do remaining chans unil this ns } - - //////////////////////////////////////////// flag handler - - if((flags&4) && (!s_chan[ch].bIgnoreLoop)) - s_chan[ch].pLoop=start-16; // loop adress - - if(flags&1) // 1: stop/loop - { - // We play this block out first... - //if(!(flags&2)) // 1+2: do loop... otherwise: stop - if((flags!=3 && flags!=7) // PETE: if we don't check exactly for 3, loop hang ups will happen (DQ4, for example) - || s_chan[ch].pLoop==NULL) // and checking if pLoop is set avoids crashes, yeah - { - start = (unsigned char*)-1; - // Actua Soccer 2, Jungle Book, other games that check for this condition - s_chan[ch].ADSRX.EnvelopeVol = 0; - } - else - { - start = s_chan[ch].pLoop; - } - } - - if (start - spuMemC >= 0x80000) - start = (unsigned char*)-1; - - s_chan[ch].pCurr=start; // store values for next cycle - s_chan[ch].s_1=s_1; - s_chan[ch].s_2=s_2; } fa=s_chan[ch].SB[s_chan[ch].iSBPos++]; // get sample data @@ -617,12 +627,23 @@ static void *MAINThread(void *arg) if(s_chan[ch].bNoise) fa=iGetNoiseVal(ch); // get noise val else fa=iGetInterpolationVal(ch); // get sample val + ChanBuf[ns]=fa; + + //////////////////////////////////////////////// + // ok, go on until 1 ms data of this channel is collected + + s_chan[ch].spos += s_chan[ch].sinc; +ENDX: ; + } - sval = (MixADSR(ch) * fa) / 1023; // mix adsr + MixADSR(ch, ns_from, ns_to); + + if(s_chan[ch].bFMod==2) // fmod freq channel + memcpy(iFMod, ChanBuf, sizeof(iFMod)); + else for(ns=ns_from;ns store 1T sample data, use that to do fmod on next channel - else // no fmod freq channel { ////////////////////////////////////////////// // ok, left/right sound volume (psx volume goes from 0 ... 0x3fff) @@ -635,18 +656,60 @@ static void *MAINThread(void *arg) if(s_chan[ch].bRVBActive) StoreREVERB(ch,ns,sval); } + } + } + } - //////////////////////////////////////////////// - // ok, go on until 1 ms data of this channel is collected + // advance "stopped" channels that can cause irqs + // (all chans are always playing on the real thing..) + if(!bIRQReturn && (spuCtrl&CTRL_IRQ)) + for(ch=0;ch pSpuIrq && s_chan[ch].pLoop > pSpuIrq) + continue; - s_chan[ch].spos += s_chan[ch].sinc; + if(s_chan[ch].iActFreq!=s_chan[ch].iUsedFreq) // new psx frequency? + VoiceChangeFrequency(ch); + + s_chan[ch].spos += s_chan[ch].sinc * NSSIZE; + while(s_chan[ch].spos >= 28 * 0x10000) + { + unsigned char *start=s_chan[ch].pCurr; + int flags = start[1]; + + // Tron Bonne hack, probably wrong (could be wrong memory contents..) + if(flags & ~7) flags = 0; + + if(start == pSpuIrq) + { + do_irq(); + bIRQReturn = 1; + } + else if((flags & 1) && start == s_chan[ch].pLoop) + { + // looping on self + s_chan[ch].pCurr=(unsigned char *)-1; + break; + } + + if((flags&4) && !s_chan[ch].bIgnoreLoop) + s_chan[ch].pLoop=start; + + s_chan[ch].pCurr += 16; + + if(flags & 1) + s_chan[ch].pCurr = s_chan[ch].pLoop; + + s_chan[ch].spos -= 28 * 0x10000; } -ENDX: ; } - } - if(bIRQReturn) // special return for "spu irq - wait for cpu action" + if(bIRQReturn && iSPUIRQWait) // special return for "spu irq - wait for cpu action" { + iSpuAsyncWait=1; bIRQReturn=0; if(iUseTimer!=2) { @@ -709,7 +772,7 @@ ENDX: ; // an IRQ. Only problem: the "wait for cpu" option is kinda hard to do here // in some of Peops timer modes. So: we ignore this option here (for now). - if(pMixIrq && irqCallback) + if(pMixIrq) { for(ns=0;ns=pMixIrq+(ch*0x400) && pSpuIrqspuMemC+0x3ff) pMixIrq=spuMemC; @@ -1016,4 +1079,24 @@ char * SPUgetLibInfos(void) } */ +// debug +void spu_get_debug_info(int *chans_out, int *fmod_chans_out, int *noise_chans_out) +{ + int ch = 0, fmod_chans = 0, noise_chans = 0; + + for(;ch