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

more porting 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1183 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee 2008-11-15 20:36:45 +00:00
parent 2a06f76f81
commit 06aff848e3
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Core/Common/Src/Thread.cpp
View File

@ -345,6 +345,20 @@ void Event::Wait()
pthread_mutex_unlock(&mutex_); pthread_mutex_unlock(&mutex_);
} }
int InterlockedIncrement(int *Addend)
{
#if defined(__GNUC__) && defined (__GNUC_MINOR__) && ((4 < __GNUC__) || (4 == __GNUC__ && 1 <= __GNUC_MINOR__))
return __sync_add_and_fetch(Addend, 1);
#else
register int result;
__asm__ __volatile__("lock; xadd %0,%1"
: "=r" (result), "=m" (1)
: "0" (Increment), "m" (1)
: "memory");
return result + 1;
#endif
}
int InterlockedExchangeAdd(int *Addend, int Increment) int InterlockedExchangeAdd(int *Addend, int Increment)
{ {
#if defined(__GNUC__) && defined (__GNUC_MINOR__) && ((4 < __GNUC__) || (4 == __GNUC__ && 1 <= __GNUC_MINOR__)) #if defined(__GNUC__) && defined (__GNUC_MINOR__) && ((4 < __GNUC__) || (4 == __GNUC__ && 1 <= __GNUC_MINOR__))

1
Source/Core/Common/Src/Thread.h
View File

@ -117,6 +117,7 @@ void SetCurrentThreadName(const char *name);
#ifndef _WIN32 #ifndef _WIN32
int InterlockedExchangeAdd(int *Addend, int Increment); int InterlockedExchangeAdd(int *Addend, int Increment);
int InterlockedExchange(int *Addend, int Increment); int InterlockedExchange(int *Addend, int Increment);
int InterlockedIncrement(int *Addend);
#endif #endif
} // end of namespace Common } // end of namespace Common

6
Source/Core/Core/Src/HW/CommandProcessor.cpp
View File

@ -173,10 +173,10 @@ int et_UpdateInterrupts;
// for GP watchdog hack // for GP watchdog hack
void IncrementGPWDToken() void IncrementGPWDToken()
{ {
#ifdef WIN32 #ifdef _WIN32
InterlockedIncrement((LONG*)&fifo.Fake_GPWDToken); InterlockedIncrement((LONG*)&fifo.Fake_GPWDToken);
#else #else
//TODO Common::InterlockedIncrement((int*)&fifo.Fake_GPWDToken);
#endif #endif
} }
@ -521,7 +521,7 @@ void GatherPipeBursted()
#ifdef _WIN32 #ifdef _WIN32
InterlockedExchangeAdd((LONG*)&fifo.CPReadWriteDistance, GPFifo::GATHER_PIPE_SIZE); InterlockedExchangeAdd((LONG*)&fifo.CPReadWriteDistance, GPFifo::GATHER_PIPE_SIZE);
#else #else
Common::InterlockedExchangeAdd((int*)&fifo.CPReadWriteDistance, GPFifo::GATHER_PIPE_SIZE); Common::InterlockedExchangeAdd((int*)&fifo.CPReadWriteDistance, GPFifo::GATHER_PIPE_SIZE);
#endif #endif
// High watermark overflow handling (hacked way) // High watermark overflow handling (hacked way)