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

Code cleanups for Linux builds (no functional changes) 

git-svn-id: http://pcsx2-playground.googlecode.com/svn/trunk@263 a6443dda-0b58-4228-96e9-037be469359c
This commit is contained in:
Jake.Stine 2008-11-01 06:47:55 +00:00 committed by Gregory Hainaut
parent 196b999379
commit 2b93aa0709
3 changed files with 6 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pcsx2/Counters.c
View File

@ -269,7 +269,7 @@ void vSyncDebugStuff() {
#endif #endif
} }
__forceinline void frameLimit() static __forceinline void frameLimit()
{ {
switch(CHECK_FRAMELIMIT) { switch(CHECK_FRAMELIMIT) {
case PCSX2_FRAMELIMIT_LIMIT: case PCSX2_FRAMELIMIT_LIMIT:
@ -336,7 +336,7 @@ __forceinline void frameLimit()
} }
} }
__forceinline void VSyncStart(u32 sCycle) // VSync Start static __forceinline void VSyncStart(u32 sCycle) // VSync Start
{ {
vSyncDebugStuff(); // EE Profiling and Debug code vSyncDebugStuff(); // EE Profiling and Debug code
if ((CSRw & 0x8)) GSCSRr|= 0x8; if ((CSRw & 0x8)) GSCSRr|= 0x8;
@ -349,7 +349,7 @@ __forceinline void VSyncStart(u32 sCycle) // VSync Start
if (Config.Patch) applypatch(1); // Apply patches (ToDo: clean up patch code) if (Config.Patch) applypatch(1); // Apply patches (ToDo: clean up patch code)
} }
__forceinline void VSyncEnd(u32 sCycle) // VSync End static __forceinline void VSyncEnd(u32 sCycle) // VSync End
{ {
iFrame++; iFrame++;
*(u32*)(PS2MEM_GS+0x1000) ^= 0x2000; // swap the vsync field *(u32*)(PS2MEM_GS+0x1000) ^= 0x2000; // swap the vsync field
@ -390,7 +390,7 @@ __forceinline void VSyncEnd(u32 sCycle) // VSync End
} \ } \
} }
__forceinline void hScanline() static __forceinline void hScanline()
{ {
u32 difference = (cpuRegs.cycle - counters[4].sCycle); u32 difference = (cpuRegs.cycle - counters[4].sCycle);

10
pcsx2/Hw.h
View File

@ -310,11 +310,9 @@ typedef struct tagDMACh{
#ifdef _WIN32 #ifdef _WIN32
extern PSMEMORYMAP* memLUT; extern PSMEMORYMAP* memLUT;
extern __forceinline u8* dmaGetAddr(u32 mem)
#else
static __forceinline u8* dmaGetAddr(u32 mem)
#endif #endif
static __forceinline u8* dmaGetAddr(u32 mem)
{ {
u8* p, *pbase; u8* p, *pbase;
mem &= ~0xf; mem &= ~0xf;
@ -348,11 +346,7 @@ extern u8 *psS; //0.015 mb, scratch pad
extern uptr *memLUTR; extern uptr *memLUTR;
#ifdef _WIN32
extern __forceinline void *dmaGetAddr(u32 addr) {
#else
static __forceinline void *dmaGetAddr(u32 addr) { static __forceinline void *dmaGetAddr(u32 addr) {
#endif
u8 *ptr; u8 *ptr;
/*#ifdef DMA_LOG /*#ifdef DMA_LOG

16
pcsx2/Misc.h
View File

@ -159,11 +159,7 @@ BOOL Save_Patch_Proc( char * filename );
#include <sys/timeb.h> #include <sys/timeb.h>
#ifdef _WIN32
extern __forceinline u32 timeGetTime()
#else
static __forceinline u32 timeGetTime() static __forceinline u32 timeGetTime()
#endif
{ {
struct timeb t; struct timeb t;
ftime(&t); ftime(&t);
@ -334,11 +330,7 @@ typedef void* PVOID;
return __test_and_set(__p, (unsigned long)__q); return __test_and_set(__p, (unsigned long)__q);
# endif # endif
}*/ }*/
#ifdef _WIN32
extern __forceinline void InterlockedExchangePointer(PVOID volatile* Target, void* Value)
#else
static __forceinline void InterlockedExchangePointer(PVOID volatile* Target, void* Value) static __forceinline void InterlockedExchangePointer(PVOID volatile* Target, void* Value)
#endif
{ {
#ifdef __x86_64__ #ifdef __x86_64__
__asm__ __volatile__(".intel_syntax\n" __asm__ __volatile__(".intel_syntax\n"
@ -351,11 +343,7 @@ static __forceinline void InterlockedExchangePointer(PVOID volatile* Target, voi
#endif #endif
} }
#ifdef _WIN32
extern __forceinline long InterlockedExchange(long volatile* Target, long Value)
#else
static __forceinline long InterlockedExchange(long volatile* Target, long Value) static __forceinline long InterlockedExchange(long volatile* Target, long Value)
#endif
{ {
__asm__ __volatile__(".intel_syntax\n" __asm__ __volatile__(".intel_syntax\n"
"lock xchg [%0], %%eax\n" "lock xchg [%0], %%eax\n"
@ -363,11 +351,7 @@ static __forceinline long InterlockedExchange(long volatile* Target, long Value)
return 0; // The only function that even looks at this is a debugging function return 0; // The only function that even looks at this is a debugging function
} }
#ifdef _WIN32
extern __forceinline long InterlockedExchangeAdd(long volatile* Addend, long Value)
#else
static __forceinline long InterlockedExchangeAdd(long volatile* Addend, long Value) static __forceinline long InterlockedExchangeAdd(long volatile* Addend, long Value)
#endif
{ {
__asm__ __volatile__(".intel_syntax\n" __asm__ __volatile__(".intel_syntax\n"
"lock xadd [%0], %%eax\n" "lock xadd [%0], %%eax\n"