ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SPU2-X: Remove antiquated use of __fastcall, from a time long ago when I was paranoid and overly in-love with fonction prototype red tape. (should fix linux/gcc compilation errors). 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3173 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2010-06-05 15:59:59 +00:00
parent 5b80fc6c68
commit 581d17e282
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/spu2-x/src/Mixer.cpp
View File

@ -16,6 +16,7 @@
*/
#include "Global.h"
//#include <float.h>
extern void spdif_update();
@ -131,7 +132,7 @@ int g_counter_cache_ignores = 0;
#define XAFLAG_LOOP (1ul<<1)
#define XAFLAG_LOOP_START (1ul<<2)
static __forceinline s32 __fastcall GetNextDataBuffered( V_Core& thiscore, uint voiceidx )
static __forceinline s32 GetNextDataBuffered( V_Core& thiscore, uint voiceidx )
{
V_Voice& vc( thiscore.Voices[voiceidx] );
@ -211,7 +212,7 @@ _Increment:
return vc.SBuffer[vc.SCurrent++];
}
static __forceinline void __fastcall GetNextDataDummy(V_Core& thiscore, uint voiceidx)
static __forceinline void GetNextDataDummy(V_Core& thiscore, uint voiceidx)
{
V_Voice& vc( thiscore.Voices[voiceidx] );
@ -467,7 +468,7 @@ static __forceinline s32 GetVoiceValues( V_Core& thiscore, uint voiceidx )
// Noise values need to be mixed without going through interpolation, since it
// can wreak havoc on the noise (causing muffling or popping). Not that this noise
// generator is accurate in its own right.. but eh, ah well :)
static s32 __forceinline __fastcall GetNoiseValues( V_Core& thiscore, uint voiceidx )
static __forceinline s32 GetNoiseValues( V_Core& thiscore, uint voiceidx )
{
V_Voice& vc( thiscore.Voices[voiceidx] );

8
plugins/spu2-x/src/defs.h
View File

@ -26,10 +26,10 @@
#define spu2Rs16(mmem) (*(s16 *)((s8 *)spu2regs + ((mmem) & 0x1fff)))
#define spu2Ru16(mmem) (*(u16 *)((s8 *)spu2regs + ((mmem) & 0x1fff)))
extern s16* __fastcall GetMemPtr(u32 addr);
extern s16 __fastcall spu2M_Read( u32 addr );
extern void __fastcall spu2M_Write( u32 addr, s16 value );
extern void __fastcall spu2M_Write( u32 addr, u16 value );
extern s16* GetMemPtr(u32 addr);
extern s16 spu2M_Read( u32 addr );
extern void spu2M_Write( u32 addr, s16 value );
extern void spu2M_Write( u32 addr, u16 value );
struct V_VolumeLR

8
plugins/spu2-x/src/spu2sys.cpp
View File

@ -47,7 +47,7 @@ void SetIrqCall()
has_to_call_irq=true;
}
__forceinline s16 * __fastcall GetMemPtr(u32 addr)
__forceinline s16* GetMemPtr(u32 addr)
{
#ifndef DEBUG_FAST
// In case you're wondering, this assert is the reason SPU2-X
@ -57,14 +57,14 @@ __forceinline s16 * __fastcall GetMemPtr(u32 addr)
return (_spu2mem+addr);
}
s16 __fastcall spu2M_Read( u32 addr )
__forceinline s16 spu2M_Read( u32 addr )
{
return *GetMemPtr( addr & 0xfffff );
}
// writes a signed value to the SPU2 ram
// Invalidates the ADPCM cache in the process.
__forceinline void __fastcall spu2M_Write( u32 addr, s16 value )
__forceinline void spu2M_Write( u32 addr, s16 value )
{
// Make sure the cache is invalidated:
// (note to self : addr address WORDs, not bytes)
@ -81,7 +81,7 @@ __forceinline void __fastcall spu2M_Write( u32 addr, s16 value )
}
// writes an unsigned value to the SPU2 ram
__inline void __fastcall spu2M_Write( u32 addr, u16 value )
__forceinline void spu2M_Write( u32 addr, u16 value )
{
spu2M_Write( addr, (s16)value );
}