diff --git a/Source/Core/Common/x64FPURoundMode.cpp b/Source/Core/Common/x64FPURoundMode.cpp index 5d5261346e..1dd2fd18f0 100644 --- a/Source/Core/Common/x64FPURoundMode.cpp +++ b/Source/Core/Common/x64FPURoundMode.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include + #include "Common/Common.h" #include "Common/CPUDetect.h" #include "Common/FPURoundMode.h" @@ -20,41 +22,18 @@ namespace FPURoundMode void SetRoundMode(int mode) { - // Set FPU rounding mode to mimic the PowerPC's - #ifdef _M_X86_32 - // This shouldn't really be needed anymore since we use SSE - #ifdef _WIN32 - const int table[4] = - { - _RC_NEAR, - _RC_CHOP, - _RC_UP, - _RC_DOWN - }; - _set_controlfp(_MCW_RC, table[mode]); - #else - const unsigned short X87_ROUND_MASK = 3 << 10; - const unsigned short x87_rounding_table[] = - { - 0 << 10, // nearest - 3 << 10, // zero - 2 << 10, // +inf - 1 << 10, // -inf - }; - unsigned short _mode; - asm ("fstcw %0" : "=m" (_mode)); - _mode = (_mode & ~X87_ROUND_MASK) | x87_rounding_table[mode]; - asm ("fldcw %0" : : "m" (_mode)); - #endif - #endif + // Convert PowerPC to native rounding mode. + const int rounding_mode_lut[] = { + FE_TONEAREST, + FE_TOWARDZERO, + FE_UPWARD, + FE_DOWNWARD + }; + fesetround(rounding_mode_lut[mode]); } void SetPrecisionMode(PrecisionMode mode) { - #ifdef _M_X86_32 - // sets the floating-point lib to 53-bit - // PowerPC has a 53bit floating pipeline only - // eg: sscanf is very sensitive #ifdef _WIN32 _control87(_PC_53, MCW_PC); #else @@ -64,14 +43,10 @@ namespace FPURoundMode 2 << 8, // 53 bits 3 << 8, // 64 bits }; - unsigned short _mode; - asm ("fstcw %0" : "=m" (_mode)); - _mode = (_mode & ~PRECISION_MASK) | precision_table[mode]; - asm ("fldcw %0" : : "m" (_mode)); - #endif - #else - //x64 doesn't need this - fpu is done with SSE - //but still - set any useful sse options here + unsigned short cw; + asm ("fnstcw %0" : "=m" (cw)); + cw = (cw & ~PRECISION_MASK) | precision_table[mode]; + asm ("fldcw %0" : : "m" (cw)); #endif }