ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2889 from lioncash/interp 

Interpreter: Use std::isnan instead of IsNAN
This commit is contained in:
flacs 2015-08-21 21:43:08 +02:00
parent bb7f3d1822 caec42135d
commit 95d958c03d
3 changed files with 2 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Core/Common/MathUtil.h
View File

@ -56,19 +56,6 @@ union IntFloat {
explicit IntFloat(float _f) : f(_f) {}
};
inline bool IsINF(double d)
{
IntDouble x(d);
return (x.i & ~DOUBLE_SIGN) == DOUBLE_EXP;
}
inline bool IsNAN(double d)
{
IntDouble x(d);
return ((x.i & DOUBLE_EXP) == DOUBLE_EXP) &&
((x.i & DOUBLE_FRAC) != DOUBLE_ZERO);
}
inline bool IsQNAN(double d)
{
IntDouble x(d);

4
Source/Core/Core/PowerPC/Interpreter/Interpreter_FloatingPoint.cpp
View File

@ -22,7 +22,7 @@ void Interpreter::Helper_FloatCompareOrdered(UGeckoInstruction _inst, double fa,
{
int compareResult;
if (IsNAN(fa) || IsNAN(fb))
if (std::isnan(fa) || std::isnan(fb))
{
FPSCR.FX = 1;
compareResult = FPCC::FU;
@ -62,7 +62,7 @@ void Interpreter::Helper_FloatCompareUnordered(UGeckoInstruction _inst, double f
{
int compareResult;
if (IsNAN(fa) || IsNAN(fb))
if (std::isnan(fa) || std::isnan(fb))
{
compareResult = FPCC::FU;

12
Source/UnitTests/Common/MathUtilTest.cpp
View File

@ -20,18 +20,6 @@ TEST(MathUtil, Clamp)
EXPECT_EQ(0.0, MathUtil::Clamp(-1.0, 0.0, 2.0));
}
TEST(MathUtil, IsINF)
{
EXPECT_TRUE(MathUtil::IsINF(+std::numeric_limits<double>::infinity()));
EXPECT_TRUE(MathUtil::IsINF(-std::numeric_limits<double>::infinity()));
}
TEST(MathUtil, IsNAN)
{
EXPECT_TRUE(MathUtil::IsNAN(std::numeric_limits<double>::quiet_NaN()));
EXPECT_TRUE(MathUtil::IsNAN(std::numeric_limits<double>::signaling_NaN()));
}
TEST(MathUtil, IsQNAN)
{
EXPECT_TRUE(MathUtil::IsQNAN(std::numeric_limits<double>::quiet_NaN()));