From db072e1986b3cec84a3bcd4314fa617e449f697b Mon Sep 17 00:00:00 2001 From: Soren Jorvang Date: Tue, 10 Aug 2010 08:29:15 +0000 Subject: [PATCH] Add Common::AtomicDecrement for gcc to match win32. Use the debug option for conf.CheckWXConfig on OS X as on Unix. Take care of a few compiler warnings. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6084 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/Common/Src/Atomic_GCC.h | 4 ++++ Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp | 1 + Source/Plugins/Plugin_VideoOGL/Src/main.cpp | 2 +- Source/Plugins/Plugin_VideoSoftware/Src/main.cpp | 2 +- .../Plugins/Plugin_WiimoteNew/Src/WiimoteEmu/WiimoteEmu.cpp | 2 -- .../Plugin_WiimoteNew/Src/WiimoteReal/WiimoteReal.cpp | 6 +++--- 6 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Source/Core/Common/Src/Atomic_GCC.h b/Source/Core/Common/Src/Atomic_GCC.h index 8171926fb1..363cf7a4f7 100644 --- a/Source/Core/Common/Src/Atomic_GCC.h +++ b/Source/Core/Common/Src/Atomic_GCC.h @@ -45,6 +45,10 @@ inline void AtomicAnd(volatile u32& target, u32 value) { __sync_and_and_fetch(&target, value); } +inline void AtomicDecrement(volatile u32& target) { + __sync_add_and_fetch(&target, -1); +} + inline void AtomicIncrement(volatile u32& target) { __sync_add_and_fetch(&target, 1); } diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp index 81f7d388f5..a44d1c6663 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp @@ -231,6 +231,7 @@ void Jit64::cmpXX(UGeckoInstruction inst) comparand = Imm32((u32)(s32)(s16)inst.UIMM); signedCompare = true; } else { + signedCompare = false; // silence compiler warning PanicAlert("cmpXX"); } } diff --git a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp index f886e1111b..ecba5f0a8f 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp @@ -514,4 +514,4 @@ bool Video_IsFifoBusy(void) void Video_AbortFrame(void) { CommandProcessor::AbortFrame(); -} \ No newline at end of file +} diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/main.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/main.cpp index 9cd89d1787..1c4715e9f3 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/main.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/main.cpp @@ -223,4 +223,4 @@ bool Video_IsFifoBusy(void) void Video_AbortFrame(void) { -} \ No newline at end of file +} diff --git a/Source/Plugins/Plugin_WiimoteNew/Src/WiimoteEmu/WiimoteEmu.cpp b/Source/Plugins/Plugin_WiimoteNew/Src/WiimoteEmu/WiimoteEmu.cpp index 8d13cca323..15460c3d42 100644 --- a/Source/Plugins/Plugin_WiimoteNew/Src/WiimoteEmu/WiimoteEmu.cpp +++ b/Source/Plugins/Plugin_WiimoteNew/Src/WiimoteEmu/WiimoteEmu.cpp @@ -510,8 +510,6 @@ void Wiimote::GetIRData(u8* const data) void Wiimote::GetExtData(u8* const data) { - const bool has_focus = HAS_FOCUS; - m_extension->GetState(data, HAS_FOCUS); // i dont think anything accesses the extension data like this, but ill support it. Indeed, commercial games don't do this. diff --git a/Source/Plugins/Plugin_WiimoteNew/Src/WiimoteReal/WiimoteReal.cpp b/Source/Plugins/Plugin_WiimoteNew/Src/WiimoteReal/WiimoteReal.cpp index 74c8753f76..12a613b050 100644 --- a/Source/Plugins/Plugin_WiimoteNew/Src/WiimoteReal/WiimoteReal.cpp +++ b/Source/Plugins/Plugin_WiimoteNew/Src/WiimoteReal/WiimoteReal.cpp @@ -47,10 +47,10 @@ THREAD_RETURN WiimoteThreadFunc(void* arg); Wiimote *g_wiimotes[4]; Wiimote::Wiimote(wiimote_t* const wm, const unsigned int index) - : m_wiimote(wm) - , m_index(index) + : m_last_data_report(NULL) , m_channel(0) - , m_last_data_report(NULL) + , m_wiimote(wm) + , m_index(index) { // disable reporting DisableDataReporting();