diff --git a/Common/ArmEmitter.cpp b/Common/ArmEmitter.cpp index ea793d6b7b..4cffba4226 100644 --- a/Common/ArmEmitter.cpp +++ b/Common/ArmEmitter.cpp @@ -38,7 +38,9 @@ // __FUNCTION__ is misused a lot below, it's no longer a string literal but a virtual // variable so this use fails in some compilers. Just define it away for now. +#ifndef _MSC_VER #define __FUNCTION__ "(n/a)" +#endif namespace ArmGen { @@ -166,8 +168,8 @@ void ARMXEmitter::ADDI2R(ARMReg rd, ARMReg rs, u32 val, ARMReg scratch) // Decompose into two additions. ADD(rd, rs, Operand2((u8)(val >> 8), 12)); // rotation right by 12*2 == rotation left by 8 ADD(rd, rd, Operand2((u8)(val), 0)); - } else if (((-(u32)(s32)val) & 0xFFFF0000) == 0) { - val = -(u32)(s32)val; + } else if ((((u32)-(s32)val) & 0xFFFF0000) == 0) { + val = (u32)-(s32)val; SUB(rd, rs, Operand2((u8)(val >> 8), 12)); SUB(rd, rd, Operand2((u8)(val), 0)); } else { diff --git a/Core/MIPS/MIPS.cpp b/Core/MIPS/MIPS.cpp index edc8d4f5ba..d8b76f4709 100644 --- a/Core/MIPS/MIPS.cpp +++ b/Core/MIPS/MIPS.cpp @@ -169,8 +169,8 @@ void MIPSState::DoState(PointerWrap &p) { p.Do(lo); p.Do(fpcond); if (s <= 1) { - u32 fcr0_unusued = 0; - p.Do(fcr0_unusued); + u32 fcr0_unused = 0; + p.Do(fcr0_unused); } p.Do(fcr31); p.Do(rng.m_w);