diff --git a/common/src/x86emitter/jmp.cpp b/common/src/x86emitter/jmp.cpp index b067f3fe76..6dc6526f17 100644 --- a/common/src/x86emitter/jmp.cpp +++ b/common/src/x86emitter/jmp.cpp @@ -127,8 +127,10 @@ __emitinline void xJccKnownTarget( JccComparisonType comparison, const void* tar s32* bah = xJcc32( comparison ); sptr distance = (sptr)target - (sptr)xGetPtr(); +#ifdef __x86_64__ // This assert won't physically happen on x86 targets pxAssertDev(distance >= -0x80000000LL && distance < 0x80000000LL, "Jump target is too far away, needs an indirect register"); +#endif *bah = (s32)distance; } diff --git a/common/src/x86emitter/x86emitter.cpp b/common/src/x86emitter/x86emitter.cpp index fc14e30707..e8a85a576f 100644 --- a/common/src/x86emitter/x86emitter.cpp +++ b/common/src/x86emitter/x86emitter.cpp @@ -251,7 +251,9 @@ void EmitSibMagic( uint regfield, const void* address ) // We must make sure that the displacement is within the 32bit range // Else we will fail out in a spectacular fashion sptr displacement = (sptr)address; +#ifdef __x86_64__ pxAssertDev(displacement >= -0x80000000LL && displacement < 0x80000000LL, "SIB target is too far away, needs an indirect register"); +#endif xWrite( (s32)displacement ); } diff --git a/plugins/onepad/controller.h b/plugins/onepad/controller.h index 268090904d..3fc9c87e58 100644 --- a/plugins/onepad/controller.h +++ b/plugins/onepad/controller.h @@ -115,7 +115,7 @@ class PADconf **/ void set_ff_intensity(u32 new_intensity) { - if(new_intensity <= 0x7FFF && new_intensity >= 0) + if(new_intensity <= 0x7FFF) { ff_intensity = new_intensity; }