#include "registers.h"
#include "cfg.h"
#include "dsoundoss.h"
-#include "regs.h"
#ifdef ENABLE_NLS
#include <libintl.h>
#define N_(x) (x)
#endif
-#ifdef __arm__
+#ifdef __ARM_ARCH_7A__
#define ssat32_to_16(v) \
asm("ssat %0,#16,%1" : "=r" (v) : "r" (v))
#else
SPUCHAN s_chan[MAXCHAN+1]; // channel + 1 infos (1 is security for fmod handling)
REVERBInfo rvb;
-unsigned long dwNoiseVal=1; // global noise generator
+unsigned int dwNoiseVal; // global noise generator
+unsigned int dwNoiseCount;
int iSpuAsyncWait=0;
unsigned short spuCtrl=0; // some vars to store psx reg infos
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;
+unsigned int dwNewChannel=0; // flags for faster testing, if new channel starts
+unsigned int dwChannelOn=0; // not silent channels
+unsigned int dwPendingChanOff=0;
+unsigned int dwChannelDead=0; // silent+not useful channels
void (CALLBACK *irqCallback)(void)=0; // func of main emu, called on spu irq
void (CALLBACK *cddavCallback)(unsigned short,unsigned short)=0;
{ 115, -52 },
{ 98, -55 },
{ 122, -60 } };
-int ChanBuf[NSSIZE];
-int SSumLR[NSSIZE*2];
+int ChanBuf[NSSIZE+3];
+int SSumLR[(NSSIZE+3)*2];
int iFMod[NSSIZE];
int iCycle = 0;
short * pS;
static int lastns=0; // last ns pos
static int iSecureStart=0; // secure start counter
+#define CDDA_BUFFER_SIZE (16384 * sizeof(uint32_t)) // must be power of 2
+
////////////////////////////////////////////////////////////////////////
// CODE AREA
////////////////////////////////////////////////////////////////////////
s_chan[ch].SB[32]=0;
s_chan[ch].SB[28]=(s_chan[ch].SB[28]*s_chan[ch].sinc)/0x20000L;
- if(s_chan[ch].sinc<=0x8000)
- s_chan[ch].SB[29]=s_chan[ch].SB[30]-(s_chan[ch].SB[28]*((0x10000/s_chan[ch].sinc)-1));
- else s_chan[ch].SB[29]+=s_chan[ch].SB[28];
+ //if(s_chan[ch].sinc<=0x8000)
+ // s_chan[ch].SB[29]=s_chan[ch].SB[30]-(s_chan[ch].SB[28]*((0x10000/s_chan[ch].sinc)-1));
+ //else
+ s_chan[ch].SB[29]+=s_chan[ch].SB[28];
}
else // no flags? add bigger val (if possible), calc smaller step, set flag1
s_chan[ch].SB[29]+=s_chan[ch].SB[28];
// ALL KIND OF HELPERS
////////////////////////////////////////////////////////////////////////
-INLINE void VoiceChangeFrequency(int ch)
-{
- s_chan[ch].iUsedFreq=s_chan[ch].iActFreq; // -> take it and calc steps
- s_chan[ch].sinc=s_chan[ch].iRawPitch<<4;
- if(!s_chan[ch].sinc) s_chan[ch].sinc=1;
- if(iUseInterpolation==1) s_chan[ch].SB[32]=1; // -> freq change in simle imterpolation mode: set flag
-}
-
-////////////////////////////////////////////////////////////////////////
-
INLINE int FModChangeFrequency(int ch,int ns)
{
- int NP=s_chan[ch].iRawPitch;
+ unsigned int NP=s_chan[ch].iRawPitch;
int sinc;
NP=((32768L+iFMod[ns])*NP)/32768L;
if(NP>0x3fff) NP=0x3fff;
if(NP<0x1) NP=0x1;
- NP=(44100L*NP)/(4096L); // calc frequency
-
- s_chan[ch].iActFreq=NP;
- s_chan[ch].iUsedFreq=NP;
- sinc=(((NP/10)<<16)/4410);
- if(!sinc) sinc=1;
+ sinc=NP<<4; // calc frequency
if(iUseInterpolation==1) // freq change in simple interpolation mode
s_chan[ch].SB[32]=1;
iFMod[ns]=0;
////////////////////////////////////////////////////////////////////////
-// noise handler... just produces some noise data
-// surely wrong... and no noise frequency (spuCtrl&0x3f00) will be used...
-// and sometimes the noise will be used as fmod modulation... pfff
-
-INLINE int iGetNoiseVal(int ch)
-{
- int fa;
-
- if((dwNoiseVal<<=1)&0x80000000L)
- {
- dwNoiseVal^=0x0040001L;
- fa=((dwNoiseVal>>2)&0x7fff);
- fa=-fa;
- }
- else fa=(dwNoiseVal>>2)&0x7fff;
-
- // mmm... depending on the noise freq we allow bigger/smaller changes to the previous val
- fa=s_chan[ch].iOldNoise+((fa-s_chan[ch].iOldNoise)/((0x001f-((spuCtrl&0x3f00)>>9))+1));
- if(fa>32767L) fa=32767L;
- if(fa<-32767L) fa=-32767L;
- s_chan[ch].iOldNoise=fa;
-
- if(iUseInterpolation<2) // no gauss/cubic interpolation?
- s_chan[ch].SB[29] = fa; // -> store noise val in "current sample" slot
- return fa;
-}
-
-////////////////////////////////////////////////////////////////////////
-
INLINE void StoreInterpolationVal(int ch,int fa)
{
if(s_chan[ch].bFMod==2) // fmod freq channel
////////////////////////////////////////////////////////////////////////
-INLINE int iGetInterpolationVal(int ch)
+INLINE int iGetInterpolationVal(int ch, int spos)
{
int fa;
case 3: // cubic interpolation
{
long xd;int gpos;
- xd = ((s_chan[ch].spos) >> 1)+1;
+ xd = (spos >> 1)+1;
gpos = s_chan[ch].SB[28];
fa = gval(3) - 3*gval(2) + 3*gval(1) - gval0;
case 2: // gauss interpolation
{
int vl, vr;int gpos;
- vl = (s_chan[ch].spos >> 6) & ~3;
+ vl = (spos >> 6) & ~3;
gpos = s_chan[ch].SB[28];
vr=(gauss[vl]*gval0)&~2047;
vr+=(gauss[vl+1]*gval(1))&~2047;
int ret = 0;
start=s_chan[ch].pCurr; // set up the current pos
- if(start == (unsigned char*)-1 || // special "stop" sign
- (dwPendingChanOff&(1<<ch)))
+ if(dwPendingChanOff&(1<<ch))
{
dwChannelOn&=~(1<<ch); // -> turn everything off
dwPendingChanOff&=~(1<<ch);
s_chan[ch].bStop=1;
s_chan[ch].ADSRX.EnvelopeVol=0;
- return 0; // -> and done for this channel
}
//////////////////////////////////////////// irq check
start = s_chan[ch].pLoop;
}
- if (start - spuMemC >= 0x80000)
- start = (unsigned char*)-1;
+ if (start - spuMemC >= 0x80000) {
+ // most likely wrong
+ start = spuMemC;
+ printf("ch%d oflow\n", ch);
+ }
s_chan[ch].pCurr = start; // store values for next cycle
+ s_chan[ch].bJump = flags & 1;
return ret;
}
int flags = start[1];
int ret = 0;
- // Tron Bonne hack, probably wrong (could be wrong memory contents..)
- if(flags & ~7) flags = 0;
-
if(start == pSpuIrq)
{
do_irq();
}
if(flags & 4)
- s_chan[ch].pLoop=start;
+ s_chan[ch].pLoop = start;
s_chan[ch].pCurr += 16;
if(flags & 1)
s_chan[ch].pCurr = s_chan[ch].pLoop;
+ s_chan[ch].bJump = flags & 1;
return ret;
}
make_do_samples(default, fmod_recv_check, ,
StoreInterpolationVal(ch, fa),
- ChanBuf[ns] = iGetInterpolationVal(ch), )
+ ChanBuf[ns] = iGetInterpolationVal(ch, spos), )
make_do_samples(noint, , fa = s_chan[ch].SB[29], , ChanBuf[ns] = fa, s_chan[ch].SB[29] = fa)
#define simple_interp_store \
static int do_samples_noise(int ch, int ns, int ns_to)
{
+ int level, shift, bit;
+
s_chan[ch].spos += s_chan[ch].sinc * (ns_to - ns);
while (s_chan[ch].spos >= 28*0x10000)
{
s_chan[ch].spos -= 28*0x10000;
}
+ // modified from DrHell/shalma, no fraction
+ level = (spuCtrl >> 10) & 0x0f;
+ level = 0x8000 >> level;
+
for (; ns < ns_to; ns++)
- ChanBuf[ns] = iGetNoiseVal(ch);
+ {
+ dwNoiseCount += 2;
+ if (dwNoiseCount >= level)
+ {
+ dwNoiseCount -= level;
+ shift = (dwNoiseVal >> 10) & 0x1f;
+ bit = (0x69696969 >> shift) & 1;
+ if (dwNoiseVal & 0x8000)
+ bit ^= 1;
+ dwNoiseVal = (dwNoiseVal << 1) | bit;
+ }
+
+ ChanBuf[ns] = (signed short)dwNoiseVal;
+ }
return -1;
}
+#ifdef __arm__
+// asm code; lv and rv must be 0-3fff
+extern void mix_chan(int start, int count, int lv, int rv);
+extern void mix_chan_rvb(int start, int count, int lv, int rv);
+#else
+static void mix_chan(int start, int count, int lv, int rv)
+{
+ int *dst = SSumLR + start * 2;
+ const int *src = ChanBuf + start;
+ int l, r;
+
+ while (count--)
+ {
+ int sval = *src++;
+
+ l = (sval * lv) >> 14;
+ r = (sval * rv) >> 14;
+ *dst++ += l;
+ *dst++ += r;
+ }
+}
+
+static void mix_chan_rvb(int start, int count, int lv, int rv)
+{
+ int *dst = SSumLR + start * 2;
+ int *drvb = sRVBStart + start * 2;
+ const int *src = ChanBuf + start;
+ int l, r;
+
+ while (count--)
+ {
+ int sval = *src++;
+
+ l = (sval * lv) >> 14;
+ r = (sval * rv) >> 14;
+ *dst++ += l;
+ *dst++ += r;
+ *drvb++ += l;
+ *drvb++ += r;
+ }
+}
+#endif
+
////////////////////////////////////////////////////////////////////////
// MAIN SPU FUNCTION
// here is the main job handler... thread, timer or direct func call
{
int volmult = iVolume;
int ns,ns_from,ns_to;
- int ch,d;
+ int ch,d,silentch;
int bIRQReturn=0;
while(!bEndThread) // until we are shutting down
ch=lastch; ns_from=lastns; lastch=-1; // -> setup all kind of vars to continue
}
+ silentch=~(dwChannelOn|dwNewChannel);
+
//--------------------------------------------------//
//- main channel loop -//
//--------------------------------------------------//
if(dwNewChannel&(1<<ch)) StartSound(ch); // start new sound
if(!(dwChannelOn&(1<<ch))) continue; // channel not playing? next
- if(s_chan[ch].iActFreq!=s_chan[ch].iUsedFreq) // new psx frequency?
- VoiceChangeFrequency(ch);
-
if(s_chan[ch].bNoise)
d=do_samples_noise(ch, ns_from, ns_to);
else if(s_chan[ch].bFMod==2 || (s_chan[ch].bFMod==0 && iUseInterpolation==0))
bIRQReturn=1;
lastch=ch;
lastns=ns_to=d;
+ if(d==0)
+ break;
}
MixADSR(ch, ns_from, ns_to);
if(s_chan[ch].bFMod==2) // fmod freq channel
memcpy(iFMod, ChanBuf, sizeof(iFMod));
+ else if(s_chan[ch].bRVBActive)
+ mix_chan_rvb(ns_from,ns_to-ns_from,s_chan[ch].iLeftVolume,s_chan[ch].iRightVolume);
else
- {
- int lv=s_chan[ch].iLeftVolume;
- int rv=s_chan[ch].iRightVolume;
-
- for(ns=ns_from;ns<ns_to;ns++)
- {
- int sval = ChanBuf[ns];
- int l, r;
-
- //////////////////////////////////////////////
- // ok, left/right sound volume (psx volume goes from 0 ... 0x3fff)
-
- l=(sval*lv)>>14;
- r=(sval*rv)>>14;
- SSumLR[ns*2] +=l;
- SSumLR[ns*2+1]+=r;
-
- //////////////////////////////////////////////
- // now let us store sound data for reverb
-
- if(s_chan[ch].bRVBActive) StoreREVERB(ch,ns,l,r);
- }
- }
+ mix_chan(ns_from,ns_to-ns_from,s_chan[ch].iLeftVolume,s_chan[ch].iRightVolume);
}
}
if(!bIRQReturn && (spuCtrl&CTRL_IRQ))
for(ch=0;ch<MAXCHAN;ch++)
{
- if(dwChannelOn&(1<<ch)) continue; // already handled
- if(s_chan[ch].pCurr == (unsigned char *)-1)
- continue;
+ if(!(silentch&(1<<ch))) continue; // already handled
+ if(dwChannelDead&(1<<ch)) continue;
if(s_chan[ch].pCurr > pSpuIrq && s_chan[ch].pLoop > pSpuIrq)
continue;
- 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;
+ unsigned char *start = s_chan[ch].pCurr;
- bIRQReturn |= skip_block(ch);
+ // no need for bIRQReturn since the channel is silent
+ iSpuAsyncWait |= skip_block(ch);
if(start == s_chan[ch].pCurr)
{
// looping on self
- s_chan[ch].pCurr=(unsigned char *)-1;
+ dwChannelDead |= 1<<ch;
+ s_chan[ch].spos = 0;
break;
}
// SPU ASYNC... even newer epsxe func
// 1 time every 'cycle' cycles... harhar
+// rearmed: called every 2ms now
+
void CALLBACK SPUasync(unsigned long cycle)
{
if(iSpuAsyncWait)
{
iSpuAsyncWait++;
- if(iSpuAsyncWait<=16/FRAG_MSECS) return;
+ if(iSpuAsyncWait<=16/2) return;
iSpuAsyncWait=0;
}
}
// CDDA AUDIO
-void CALLBACK SPUplayCDDAchannel(short *pcm, int nbytes)
+int CALLBACK SPUplayCDDAchannel(short *pcm, int nbytes)
{
- if (!pcm) return;
- if (nbytes<=0) return;
+ if (!pcm) return -1;
+ if (nbytes<=0) return -1;
- FeedCDDA((unsigned char *)pcm, nbytes);
+ return FeedCDDA((unsigned char *)pcm, nbytes);
}
// SETUPTIMER: init of certain buffers and threads/timers
XAFeed = XAStart;
CDDAStart = // alloc cdda buffer
- (uint32_t *)malloc(16384 * sizeof(uint32_t));
+ (uint32_t *)malloc(CDDA_BUFFER_SIZE);
CDDAEnd = CDDAStart + 16384;
CDDAPlay = CDDAStart;
CDDAFeed = CDDAStart;
// s_chan[i].hMutex=CreateMutex(NULL,FALSE,NULL);
s_chan[i].ADSRX.SustainLevel = 0xf; // -> init sustain
s_chan[i].pLoop=spuMemC;
- s_chan[i].pStart=spuMemC;
s_chan[i].pCurr=spuMemC;
}
*/
// debug
-void spu_get_debug_info(int *chans_out, int *fmod_chans_out, int *noise_chans_out)
+void spu_get_debug_info(int *chans_out, int *run_chans, int *fmod_chans_out, int *noise_chans_out)
{
- int ch = 0, fmod_chans = 0, noise_chans = 0;
+ int ch = 0, fmod_chans = 0, noise_chans = 0, irq_chans = 0;
for(;ch<MAXCHAN;ch++)
{
fmod_chans |= 1 << ch;
if (s_chan[ch].bNoise)
noise_chans |= 1 << ch;
+ if((spuCtrl&CTRL_IRQ) && s_chan[ch].pCurr <= pSpuIrq && s_chan[ch].pLoop <= pSpuIrq)
+ irq_chans |= 1 << ch;
}
*chans_out = dwChannelOn;
+ *run_chans = ~dwChannelOn & ~dwChannelDead & irq_chans;
*fmod_chans_out = fmod_chans;
*noise_chans_out = noise_chans;
}