diff --git a/Core/MIPS/MIPSAnalyst.cpp b/Core/MIPS/MIPSAnalyst.cpp index 5f16b37c37..1f0cf6ff57 100644 --- a/Core/MIPS/MIPSAnalyst.cpp +++ b/Core/MIPS/MIPSAnalyst.cpp @@ -141,7 +141,7 @@ namespace MIPSAnalyst int rd = MIPS_GET_RD(op); if ( - ((info & IN_RS) && !(info & IN_RS_ADDR) && (rs == reg)) || + ((info & IN_RS) && (info & IN_RS_ADDR) == IN_RS && (rs == reg)) || ((info & IN_RT) && (rt == reg))) { if (regAnal[reg].firstRead == -1) diff --git a/Core/MIPS/MIPSCodeUtils.cpp b/Core/MIPS/MIPSCodeUtils.cpp index 91a344e8e6..fad4dddb63 100644 --- a/Core/MIPS/MIPSCodeUtils.cpp +++ b/Core/MIPS/MIPSCodeUtils.cpp @@ -114,6 +114,9 @@ namespace MIPSCodeUtils sure = _RS == 0; takeBranch = false; break; + + default: + sure = false; } if (sure && takeBranch) diff --git a/GPU/GPUCommon.cpp b/GPU/GPUCommon.cpp index b4001a338f..d013a08256 100644 --- a/GPU/GPUCommon.cpp +++ b/GPU/GPUCommon.cpp @@ -558,7 +558,7 @@ void GPUCommon::ProcessEvent(GPUEvent ev) { break; default: - ERROR_LOG(G3D, "Unexpected GPU event type: %d", ev); + ERROR_LOG(G3D, "Unexpected GPU event type: %d", (int)ev); } } diff --git a/GPU/GPUCommon.h b/GPU/GPUCommon.h index bec3605760..43ae9a5530 100644 --- a/GPU/GPUCommon.h +++ b/GPU/GPUCommon.h @@ -4,7 +4,9 @@ #include "Core/ThreadEventQueue.h" #include "GPU/GPUInterface.h" -#ifdef _M_SSE +#if defined(ANDROID) +#include +#elif defined(_M_SSE) #include #pragma warning(disable:4799) #endif @@ -43,7 +45,7 @@ public: virtual void ReapplyGfxState(); virtual u64 GetTickEstimate() { -#if defined(_M_X64) +#if defined(_M_X64) || defined(ANDROID) return curTickEst_; #elif defined(_M_SSE) __m64 result = *(__m64 *)&curTickEst_; @@ -105,11 +107,15 @@ protected: bool interruptsEnabled_; // For CPU/GPU sync. +#ifdef ANDROID + std::atomic curTickEst_; +#else volatile MEMORY_ALIGNED16(u64) curTickEst_; recursive_mutex curTickEstLock_; +#endif virtual void UpdateTickEstimate(u64 value) { -#if defined(_M_X64) +#if defined(_M_X64) || defined(ANDROID) curTickEst_ = value; #elif defined(_M_SSE) __m64 result = *(__m64 *)&value; diff --git a/ext/disarm.cpp b/ext/disarm.cpp index cada7c3ef0..4c0f192272 100644 --- a/ext/disarm.cpp +++ b/ext/disarm.cpp @@ -142,7 +142,7 @@ bool DisasmVFP(uint32_t op, char *text) { if ((op & 0xFFF) != 0xA10) break; if (op == 0xEEF1FA10) { - sprintf(text, "VMRS APSR", cond); + sprintf(text, "VMRS%s APSR", cond); } else { sprintf(text, "VMRS%s r%i", cond, (op >> 12) & 0xF); }