// generic defines\r
/////////////////////////////////////////////////////////\r
\r
+#ifdef __GNUC__\r
+#define noinline __attribute__((noinline))\r
+#define unlikely(x) __builtin_expect((x), 0)\r
+#else\r
+#define noinline\r
+#define unlikely(x) x\r
+#endif\r
+\r
#define PSE_LT_SPU 4\r
#define PSE_SPU_ERR_SUCCESS 0\r
#define PSE_SPU_ERR -60\r
// spu defines\r
////////////////////////////////////////////////////////////////////////\r
\r
-// sound buffer sizes\r
-// 400 ms complete sound buffer\r
-#define SOUNDSIZE 70560\r
-// 137 ms test buffer... if less than that is buffered, a new upload will happen\r
-#define TESTSIZE 24192\r
-\r
// num of channels\r
#define MAXCHAN 24\r
\r
-// ~ 1 ms of data\r
-#define NSSIZE 45\r
+// note: must be even due to the way reverb works now\r
+#define NSSIZE ((44100 / 50 + 16) & ~1)\r
\r
///////////////////////////////////////////////////////////\r
// struct defines\r
///////////////////////////////////////////////////////////\r
\r
-// ADSR INFOS PER CHANNEL\r
-typedef struct\r
-{\r
- int AttackModeExp;\r
- long AttackTime;\r
- long DecayTime;\r
- long SustainLevel;\r
- int SustainModeExp;\r
- long SustainModeDec;\r
- long SustainTime;\r
- int ReleaseModeExp;\r
- unsigned long ReleaseVal;\r
- long ReleaseTime;\r
- long ReleaseStartTime; \r
- long ReleaseVol; \r
- long lTime;\r
- long lVolume;\r
-} ADSRInfo;\r
+enum ADSR_State {\r
+ ADSR_ATTACK = 0,\r
+ ADSR_DECAY = 1,\r
+ ADSR_SUSTAIN = 2,\r
+ ADSR_RELEASE = 3,\r
+};\r
\r
+// ADSR INFOS PER CHANNEL\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
+ unsigned char State:2; // ADSR_State\r
+ unsigned char AttackModeExp:1;\r
+ unsigned char SustainModeExp:1;\r
+ unsigned char SustainIncrease:1;\r
+ unsigned char ReleaseModeExp:1;\r
+ unsigned char AttackRate;\r
+ unsigned char DecayRate;\r
+ unsigned char SustainLevel;\r
+ unsigned char SustainRate;\r
+ unsigned char ReleaseRate;\r
int EnvelopeVol;\r
- long lVolume;\r
- long lDummy1;\r
- long lDummy2;\r
} ADSRInfoEx;\r
\r
///////////////////////////////////////////////////////////\r
// MAIN CHANNEL STRUCT\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
+ int sinc_inv;\r
\r
- unsigned char * pStart; // start ptr into sound mem\r
unsigned char * pCurr; // current pos in sound mem\r
unsigned char * pLoop; // 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
+ unsigned int bReverb:1; // can we do reverb on this channel? must have ctrl register bit, to get active\r
+ unsigned int bRVBActive:1; // reverb active flag\r
+ unsigned int bNoise:1; // noise active flag\r
+ unsigned int bFMod:2; // freq mod (0=off, 1=sound channel, 2=freq channel)\r
+ unsigned int prevflags:3; // flags from previous block\r
+\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
+ ADSRInfoEx ADSRX;\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 ADSRX; // next ADSR settings (will be moved to active on sample start)\r
+\r
+ int SB[32+4];\r
} SPUCHAN;\r
\r
///////////////////////////////////////////////////////////\r
\r
int VolLeft;\r
int VolRight;\r
- int iLastRVBLeft;\r
- int iLastRVBRight;\r
int iRVBLeft;\r
int iRVBRight;\r
\r
int MIX_DEST_B1; // (offset)\r
int IN_COEF_L; // (coef.)\r
int IN_COEF_R; // (coef.)\r
+\r
+ int dirty; // registers changed\r
+\r
+ // normalized offsets\r
+ int nIIR_DEST_A0, nIIR_DEST_A1, nIIR_DEST_B0, nIIR_DEST_B1,\r
+ nACC_SRC_A0, nACC_SRC_A1, nACC_SRC_B0, nACC_SRC_B1, \r
+ nIIR_SRC_A0, nIIR_SRC_A1, nIIR_SRC_B0, nIIR_SRC_B1,\r
+ nACC_SRC_C0, nACC_SRC_C1, nACC_SRC_D0, nACC_SRC_D1,\r
+ nMIX_DEST_A0, nMIX_DEST_A1, nMIX_DEST_B0, nMIX_DEST_B1;\r
+ // MIX_DEST_xx - FB_SRC_x\r
+ int nFB_SRC_A0, nFB_SRC_A1, nFB_SRC_B0, nFB_SRC_B1;\r
} REVERBInfo;\r
\r
///////////////////////////////////////////////////////////\r
-// SPU.C globals\r
-///////////////////////////////////////////////////////////\r
-\r
-#ifndef _IN_SPU\r
\r
// psx buffers / addresses\r
\r
-extern unsigned short regArea[]; \r
-extern unsigned short spuMem[];\r
-extern unsigned char * spuMemC;\r
-extern unsigned char * pSpuIrq;\r
-extern unsigned char * pSpuBuffer;\r
-\r
-// user settings\r
+typedef struct\r
+{\r
+ unsigned short spuCtrl;\r
+ unsigned short spuStat;\r
\r
-extern int iVolume;\r
-extern int iXAPitch;\r
-extern int iUseTimer;\r
-extern int iSPUIRQWait;\r
-extern int iDebugMode;\r
-extern int iRecordMode;\r
-extern int iUseReverb;\r
-extern int iUseInterpolation;\r
-extern int iDisStereo;\r
-// MISC\r
+ unsigned int spuAddr;\r
+ unsigned char * spuMemC;\r
+ unsigned char * pSpuIrq;\r
\r
-extern int iSpuAsyncWait;\r
+ unsigned int cycles_played;\r
+ int decode_pos;\r
+ int decode_dirty_ch;\r
+ unsigned int bSpuInit:1;\r
+ unsigned int bSPUIsOpen:1;\r
\r
-extern SPUCHAN s_chan[];\r
-extern REVERBInfo rvb;\r
+ unsigned int dwNoiseVal; // global noise generator\r
+ unsigned int dwNoiseCount;\r
+ unsigned int dwNewChannel; // flags for faster testing, if new channel starts\r
+ unsigned int dwChannelOn; // not silent channels\r
+ unsigned int dwChannelDead; // silent+not useful channels\r
\r
-extern unsigned long dwNoiseVal;\r
-extern unsigned short spuCtrl;\r
-extern unsigned short spuStat;\r
-extern unsigned short spuIrq;\r
-extern unsigned long spuAddr;\r
-extern int bEndThread; \r
-extern int bThreadEnded;\r
-extern int bSpuInit;\r
-extern unsigned long dwNewChannel;\r
+ unsigned char * pSpuBuffer;\r
+ short * pS;\r
\r
-extern int SSumR[];\r
-extern int SSumL[];\r
-extern int iCycle;\r
-extern short * pS;\r
+ void (CALLBACK *irqCallback)(void); // func of main emu, called on spu irq\r
+ void (CALLBACK *cddavCallback)(unsigned short,unsigned short);\r
+ void (CALLBACK *scheduleCallback)(unsigned int);\r
\r
-extern void (CALLBACK *cddavCallback)(unsigned short,unsigned short);\r
+ int * sRVBStart;\r
\r
-#endif\r
+ xa_decode_t * xapGlobal;\r
+ unsigned int * XAFeed;\r
+ unsigned int * XAPlay;\r
+ unsigned int * XAStart;\r
+ unsigned int * XAEnd;\r
\r
-///////////////////////////////////////////////////////////\r
-// XA.C globals\r
-///////////////////////////////////////////////////////////\r
+ unsigned int * CDDAFeed;\r
+ unsigned int * CDDAPlay;\r
+ unsigned int * CDDAStart;\r
+ unsigned int * CDDAEnd;\r
\r
-#ifndef _IN_XA\r
+ unsigned int XARepeat;\r
+ unsigned int XALastVal;\r
\r
-extern xa_decode_t * xapGlobal;\r
+ int iLeftXAVol;\r
+ int iRightXAVol;\r
\r
-extern uint32_t * XAFeed;\r
-extern uint32_t * XAPlay;\r
-extern uint32_t * XAStart;\r
-extern uint32_t * XAEnd;\r
+ int pad[32];\r
+ unsigned short regArea[0x400];\r
+ unsigned short spuMem[256*1024];\r
+} SPUInfo;\r
\r
-extern uint32_t XARepeat;\r
-extern uint32_t XALastVal;\r
-\r
-extern uint32_t * CDDAFeed;\r
-extern uint32_t * CDDAPlay;\r
-extern uint32_t * CDDAStart;\r
-extern uint32_t * CDDAEnd;\r
+///////////////////////////////////////////////////////////\r
+// SPU.C globals\r
+///////////////////////////////////////////////////////////\r
\r
-extern int iLeftXAVol;\r
-extern int iRightXAVol;\r
+#ifndef _IN_SPU\r
\r
-#endif\r
+extern SPUInfo spu;\r
+extern SPUCHAN s_chan[];\r
+extern REVERBInfo rvb;\r
\r
-///////////////////////////////////////////////////////////\r
-// REVERB.C globals\r
-///////////////////////////////////////////////////////////\r
+void do_samples(unsigned int cycles_to, int do_sync);\r
+void schedule_next_irq(void);\r
\r
-#ifndef _IN_REVERB\r
+#define regAreaGet(ch,offset) \\r
+ spu.regArea[((ch<<4)|(offset))>>1]\r
\r
-extern int * sRVBPlay;\r
-extern int * sRVBEnd;\r
-extern int * sRVBStart;\r
-extern int iReverbOff;\r
-extern int iReverbRepeat;\r
-extern int iReverbNum; \r
+#define do_samples_if_needed(c, sync) \\r
+ do { \\r
+ if (sync || (int)((c) - spu.cycles_played) >= 16 * 768) \\r
+ do_samples(c, sync); \\r
+ } while (0)\r
\r
#endif\r
+\r
notaz.gp2x.de / pcsx_rearmed.git / blobdiff