diff --git a/pcsx2/SingleRegisterTypes.h b/pcsx2/SingleRegisterTypes.h index 0a34dc5c62..4fb4b70c96 100644 --- a/pcsx2/SingleRegisterTypes.h +++ b/pcsx2/SingleRegisterTypes.h @@ -56,11 +56,7 @@ __forceinline static r64 r64_from_u32x2(u32 lo, u32 hi) __forceinline static r64 r64_from_u64(u64 val) { -#ifdef _M_X86_64 return _mm_cvtsi64_si128(val); -#else - return r64_from_u32x2(val, val >> 32); -#endif } __forceinline static r128 r128_load(const void* ptr) diff --git a/pcsx2/x86/BaseblockEx.h b/pcsx2/x86/BaseblockEx.h index 19bf691785..7c93c3ab1e 100644 --- a/pcsx2/x86/BaseblockEx.h +++ b/pcsx2/x86/BaseblockEx.h @@ -255,8 +255,4 @@ static inline void recLUT_SetPage(uptr reclut[0x10000], u32 hwlut[0x10000], hwlut[page] = 0u - (pagebase << 16); } -#if defined(_M_X86_64) static_assert(sizeof(BASEBLOCK) == 8, "BASEBLOCK is not 8 bytes"); -#else -static_assert(sizeof(BASEBLOCK) == 4, "BASEBLOCK is not 4 bytes"); -#endif diff --git a/pcsx2/x86/ix86-32/recVTLB.cpp b/pcsx2/x86/ix86-32/recVTLB.cpp index eebcaee3a9..f31427c4f8 100644 --- a/pcsx2/x86/ix86-32/recVTLB.cpp +++ b/pcsx2/x86/ix86-32/recVTLB.cpp @@ -140,9 +140,6 @@ static void iMOV64_Smart(const xIndirectVoid& destRm, const xIndirectVoid& srcRm _fullread: movzx eax,al; sub ecx,eax; - #ifndef __M_X86_64 // The x86-64 marker will be cleared by using 32-bit ops - sub ecx,0x80000000; - #endif call [eax+stuff]; cont: ........