VFPU: fix rounding in VF2IN

Core/MIPS/ARM/ArmCompVFPU.cpp

@@ -885,7 +885,9 @@ namespace MIPSComp
 	}
 
 	void Jit::Comp_VScl(u32 op) {
-		// Darn, still breaks Tekken 6. Bug could be elsewhere though.
+		// Darn, still breaks stuff. Bug could be elsewhere though.
+		DISABLE;
+
 		fpr.FlushAll();
 		CONDITIONAL_DISABLE;
 		if (js.HasUnknownPrefix())

Core/MIPS/MIPSInt.cpp

@@ -51,25 +51,6 @@
 #define LO currentMIPS->lo
 
 
-inline int is_even(float d) {
-	float int_part;
-	modff(d / 2.0f, &int_part);
-	return 2.0f * int_part == d;
-}
-
-// Rounds *.5 to closest even number
-float round_ieee_754(float d) {
-	float i = floorf(d);
-	d -= i;
-	if(d < 0.5f)
-		return i;
-	if(d > 0.5f)
-		return i + 1.0f;
-	if(is_even(i))
-		return i;
-	return i + 1.0f;
-}
-
 static inline void DelayBranchTo(u32 where)
 {
 	PC += 4;

Core/MIPS/MIPSIntVFPU.cpp

@@ -106,12 +106,6 @@ inline float nanclamp(float f, float lower, float upper)
 }
 
 
-#ifndef BLACKBERRY
-double rint(double x){
-return floor(x+.5);
-}
-#endif
-
 void ApplyPrefixST(float *v, u32 data, VectorSize size)
 {
 	// Possible optimization shortcut:
@@ -604,6 +598,11 @@ namespace MIPSInt
 		EatPrefixes();
 	}
 
+	inline int round_vfpu_n(float param) {
+		// return floorf(param);
+		return (int)round_ieee_754(param);
+	}
+
 	void Int_Vf2i(u32 op)
 	{
 		float s[4];
@@ -627,7 +626,7 @@ namespace MIPSInt
 			if (sv < (int)0x80000000) sv = (int)0x80000000;
 			switch ((op >> 21) & 0x1f)
 			{
-			case 16: d[i] = (int)rint(sv); break; //n
+			case 16: d[i] = (int)round_vfpu_n(sv); break; //n
 			case 17: d[i] = s[i]>=0 ? (int)floor(sv) : (int)ceil(sv); break; //z
 			case 18: d[i] = (int)ceil(sv); break; //u
 			case 19: d[i] = (int)floor(sv); break; //d