Skip to content

Commit 31c417a

Browse files
rafaelubalrafaelubal
committed
Replaced <math.h> by <cmath>, added 'std::' prefix to math functions.
1 parent 3fa6db8 commit 31c417a

File tree

2 files changed

+63
-63
lines changed

2 files changed

+63
-63
lines changed

‎src/arch/kepler/emulator/ThreadIsa.cc

+14-14
Original file line numberDiff line numberDiff line change
@@ -4582,33 +4582,33 @@ void Thread::ExecuteInst_FSET_B(Instruction *inst)
45824582
if (cmp_op == 0)
45834583
cmp_result = false;
45844584
else if (cmp_op == 1)
4585-
cmp_result = ((src1 < src2) && (!isnan(src1)) && (!isnan(src2)));
4585+
cmp_result = ((src1 < src2) && (!std::isnan(src1)) && (!std::isnan(src2)));
45864586
else if (cmp_op == 2)
4587-
cmp_result = ((src1 == src2) && (!isnan(src1)) && (!isnan(src2)));
4587+
cmp_result = ((src1 == src2) && (!std::isnan(src1)) && (!std::isnan(src2)));
45884588
else if (cmp_op == 3)
4589-
cmp_result = ((src1 <= src2) && (!isnan(src1)) && (!isnan(src2)));
4589+
cmp_result = ((src1 <= src2) && (!std::isnan(src1)) && (!std::isnan(src2)));
45904590
else if (cmp_op == 4)
4591-
cmp_result = ((src1 > src2) && (!isnan(src1)) && (!isnan(src2)));
4591+
cmp_result = ((src1 > src2) && (!std::isnan(src1)) && (!std::isnan(src2)));
45924592
else if (cmp_op == 5)
4593-
cmp_result = ((src1 != src2) && (!isnan(src1)) && (!isnan(src2)));
4593+
cmp_result = ((src1 != src2) && (!std::isnan(src1)) && (!std::isnan(src2)));
45944594
else if (cmp_op == 6)
4595-
cmp_result = ((src1 >= src2) && (!isnan(src1)) && (!isnan(src2)));
4595+
cmp_result = ((src1 >= src2) && (!std::isnan(src1)) && (!std::isnan(src2)));
45964596
else if (cmp_op == 7)
4597-
cmp_result = ((!isnan(src1)) && (!isnan(src2)));
4597+
cmp_result = ((!std::isnan(src1)) && (!std::isnan(src2)));
45984598
else if (cmp_op == 8)
4599-
cmp_result = ((isnan(src1)) && (isnan(src2)));
4599+
cmp_result = ((std::isnan(src1)) && (std::isnan(src2)));
46004600
else if (cmp_op == 9)
4601-
cmp_result = ((src1 < src2) && (isnan(src1)) && (isnan(src2)));
4601+
cmp_result = ((src1 < src2) && (std::isnan(src1)) && (std::isnan(src2)));
46024602
else if (cmp_op == 10)
4603-
cmp_result = ((src1 == src2) && (isnan(src1)) && (isnan(src2)));
4603+
cmp_result = ((src1 == src2) && (std::isnan(src1)) && (std::isnan(src2)));
46044604
else if (cmp_op == 11)
4605-
cmp_result = ((src1 <= src2) && (isnan(src1)) && (isnan(src2)));
4605+
cmp_result = ((src1 <= src2) && (std::isnan(src1)) && (std::isnan(src2)));
46064606
else if (cmp_op == 12)
4607-
cmp_result = ((src1 > src2) && (isnan(src1)) && (isnan(src2)));
4607+
cmp_result = ((src1 > src2) && (std::isnan(src1)) && (std::isnan(src2)));
46084608
else if (cmp_op == 13)
4609-
cmp_result = ((src1 != src2) && (isnan(src1)) && (isnan(src2)));
4609+
cmp_result = ((src1 != src2) && (std::isnan(src1)) && (std::isnan(src2)));
46104610
else if (cmp_op == 14)
4611-
cmp_result = ((src1 >= src2) && (isnan(src1)) && (isnan(src2)));
4611+
cmp_result = ((src1 >= src2) && (std::isnan(src1)) && (std::isnan(src2)));
46124612
else if (cmp_op == 15)
46134613
cmp_result = true;
46144614

‎src/arch/southern-islands/emulator/WorkItemIsa.cc

+49-49
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
#include <cassert>
2121
#include <limits>
22-
#include <math.h>
22+
#include <cmath>
2323
#include <lib/cpp/Misc.h>
2424

2525
#include "Emulator.h"
@@ -2286,11 +2286,11 @@ void WorkItem::ISA_V_CVT_U32_F32_Impl(Instruction *instruction)
22862286
// Handle special number cases and cast to an unsigned
22872287

22882288
// -inf, NaN, 0, -0 --> 0
2289-
if ((isinf(fvalue) && fvalue < 0.0f) || isnan(fvalue)
2289+
if ((std::isinf(fvalue) && fvalue < 0.0f) || std::isnan(fvalue)
22902290
|| fvalue == 0.0f || fvalue == -0.0f)
22912291
value.as_uint = 0;
22922292
// inf, > max_uint --> max_uint
2293-
else if (isinf(fvalue) || fvalue >= std::numeric_limits<unsigned int>::max())
2293+
else if (std::isinf(fvalue) || fvalue >= std::numeric_limits<unsigned int>::max())
22942294
value.as_uint = std::numeric_limits<unsigned int>::max();
22952295
else
22962296
value.as_uint = (unsigned) fvalue;
@@ -2326,10 +2326,10 @@ void WorkItem::ISA_V_CVT_I32_F32_Impl(Instruction *instruction)
23262326
// Handle special number cases and cast to an int
23272327

23282328
// inf, > max_int --> max_int
2329-
if ((isinf(fvalue) && fvalue > 0.0f) || fvalue >= std::numeric_limits<int>::max())
2329+
if ((std::isinf(fvalue) && fvalue > 0.0f) || fvalue >= std::numeric_limits<int>::max())
23302330
value.as_int = std::numeric_limits<int>::max();
23312331
// -inf, < -max_int --> -max_int
2332-
else if (isinf(fvalue) || fvalue < std::numeric_limits<int>::min())
2332+
else if (std::isinf(fvalue) || fvalue < std::numeric_limits<int>::min())
23332333
value.as_int = std::numeric_limits<int>::min();
23342334
// NaN, 0, -0 --> 0
23352335
else if (isnan(fvalue) || fvalue == 0.0f || fvalue == -0.0f)
@@ -5926,41 +5926,41 @@ void WorkItem::ISA_V_ADD_F64_Impl(Instruction *instruction)
59265926
// Add the operands, take into account special number cases.
59275927

59285928
// s0 == NaN64 || s1 == NaN64
5929-
if (fpclassify(s0.as_double) == FP_NAN ||
5930-
fpclassify(s1.as_double) == FP_NAN)
5929+
if (std::fpclassify(s0.as_double) == FP_NAN ||
5930+
std::fpclassify(s1.as_double) == FP_NAN)
59315931
{
59325932
// value <-- NaN64
59335933
value.as_double = NAN;
59345934
}
59355935
// s0,s1 == infinity
5936-
else if (fpclassify(s0.as_double) == FP_INFINITE &&
5937-
fpclassify(s1.as_double) == FP_INFINITE)
5936+
else if (std::fpclassify(s0.as_double) == FP_INFINITE &&
5937+
std::fpclassify(s1.as_double) == FP_INFINITE)
59385938
{
59395939
// value <-- NaN64
59405940
value.as_double = NAN;
59415941
}
59425942
// s0,!s1 == infinity
5943-
else if (fpclassify(s0.as_double) == FP_INFINITE)
5943+
else if (std::fpclassify(s0.as_double) == FP_INFINITE)
59445944
{
59455945
// value <-- s0(+-infinity)
59465946
value.as_double = s0.as_double;
59475947
}
59485948
// s1,!s0 == infinity
5949-
else if (fpclassify(s1.as_double) == FP_INFINITE)
5949+
else if (std::fpclassify(s1.as_double) == FP_INFINITE)
59505950
{
59515951
// value <-- s1(+-infinity)
59525952
value.as_double = s1.as_double;
59535953
}
59545954
// s0 == +-denormal, +-0
5955-
else if (fpclassify(s0.as_double) == FP_SUBNORMAL ||
5956-
fpclassify(s0.as_double) == FP_ZERO)
5955+
else if (std::fpclassify(s0.as_double) == FP_SUBNORMAL ||
5956+
std::fpclassify(s0.as_double) == FP_ZERO)
59575957
{
59585958
// s1 == +-denormal, +-0
5959-
if (fpclassify(s1.as_double) == FP_SUBNORMAL ||
5960-
fpclassify(s1.as_double) == FP_ZERO)
5959+
if (std::fpclassify(s1.as_double) == FP_SUBNORMAL ||
5960+
std::fpclassify(s1.as_double) == FP_ZERO)
59615961
// s0 && s1 == -denormal, -0
5962-
if (! !signbit(s0.as_double)
5963-
&& ! !signbit(s1.as_double))
5962+
if (std::signbit(s0.as_double)
5963+
&& std::signbit(s1.as_double))
59645964
// value <-- -0
59655965
value.as_double = -0;
59665966
else
@@ -5972,15 +5972,15 @@ void WorkItem::ISA_V_ADD_F64_Impl(Instruction *instruction)
59725972
value.as_double = s1.as_double;
59735973
}
59745974
// s1 == +-denormal, +-0
5975-
else if (fpclassify(s1.as_double) == FP_SUBNORMAL ||
5976-
fpclassify(s1.as_double) == FP_ZERO)
5975+
else if (std::fpclassify(s1.as_double) == FP_SUBNORMAL ||
5976+
std::fpclassify(s1.as_double) == FP_ZERO)
59775977
{
59785978
// s0 == +-denormal, +-0
5979-
if (fpclassify(s0.as_double) == FP_SUBNORMAL ||
5980-
fpclassify(s0.as_double) == FP_ZERO)
5979+
if (std::fpclassify(s0.as_double) == FP_SUBNORMAL ||
5980+
std::fpclassify(s0.as_double) == FP_ZERO)
59815981
// s0 && s1 == -denormal, -0
5982-
if (! !signbit(s0.as_double)
5983-
&& ! !signbit(s1.as_double))
5982+
if (std::signbit(s0.as_double)
5983+
&& std::signbit(s1.as_double))
59845984
// value <-- -0
59855985
value.as_double = -0;
59865986
else
@@ -6041,81 +6041,81 @@ void WorkItem::ISA_V_MUL_F64_Impl(Instruction *instruction)
60416041
// Multiply the operands, take into account special number cases.
60426042

60436043
// s0 == NaN64 || s1 == NaN64
6044-
if (fpclassify(s0.as_double) == FP_NAN ||
6045-
fpclassify(s1.as_double) == FP_NAN)
6044+
if (std::fpclassify(s0.as_double) == FP_NAN ||
6045+
std::fpclassify(s1.as_double) == FP_NAN)
60466046
{
60476047
// value <-- NaN64
60486048
value.as_double = NAN;
60496049
}
60506050
// s0 == +denormal, +0
6051-
else if ((fpclassify(s1.as_double) == FP_SUBNORMAL ||
6052-
fpclassify(s1.as_double) == FP_ZERO) &&
6053-
!signbit(s0.as_double))
6051+
else if ((std::fpclassify(s1.as_double) == FP_SUBNORMAL ||
6052+
std::fpclassify(s1.as_double) == FP_ZERO) &&
6053+
!std::signbit(s0.as_double))
60546054
{
60556055
// s1 == +-infinity
6056-
if (isinf(s1.as_double))
6056+
if (std::isinf(s1.as_double))
60576057
// value <-- NaN64
60586058
value.as_double = NAN;
60596059
// s1 > 0
6060-
else if (!signbit(s1.as_double))
6060+
else if (!std::signbit(s1.as_double))
60616061
// value <-- +0
60626062
value.as_double = +0;
60636063
// s1 < 0
6064-
else if (! !signbit(s1.as_double))
6064+
else if (std::signbit(s1.as_double))
60656065
// value <-- -0
60666066
value.as_double = -0;
60676067
}
60686068
// s0 == -denormal, -0
6069-
else if ((fpclassify(s1.as_double) == FP_SUBNORMAL ||
6070-
fpclassify(s1.as_double) == FP_ZERO) &&
6071-
! !signbit(s0.as_double))
6069+
else if ((std::fpclassify(s1.as_double) == FP_SUBNORMAL ||
6070+
std::fpclassify(s1.as_double) == FP_ZERO) &&
6071+
std::signbit(s0.as_double))
60726072
{
60736073
// s1 == +-infinity
6074-
if (isinf(s1.as_double))
6074+
if (std::isinf(s1.as_double))
60756075
// value <-- NaN64
60766076
value.as_double = NAN;
60776077
// s1 > 0
6078-
else if (!signbit(s1.as_double))
6078+
else if (!std::signbit(s1.as_double))
60796079
// value <-- -0
60806080
value.as_double = -0;
60816081
// s1 < 0
6082-
else if (! !signbit(s1.as_double))
6082+
else if (std::signbit(s1.as_double))
60836083
// value <-- +0
60846084
value.as_double = +0;
60856085
}
60866086
// s0 == +infinity
6087-
else if (fpclassify(s0.as_double) == FP_INFINITE &&
6088-
!signbit(s0.as_double))
6087+
else if (std::fpclassify(s0.as_double) == FP_INFINITE &&
6088+
!std::signbit(s0.as_double))
60896089
{
60906090
// s1 == +-denormal, +-0
6091-
if (fpclassify(s1.as_double) == FP_SUBNORMAL ||
6092-
fpclassify(s1.as_double) == FP_ZERO)
6091+
if (std::fpclassify(s1.as_double) == FP_SUBNORMAL ||
6092+
std::fpclassify(s1.as_double) == FP_ZERO)
60936093
// value <-- NaN64
60946094
value.as_double = NAN;
60956095
// s1 > 0
6096-
else if (!signbit(s1.as_double))
6096+
else if (!std::signbit(s1.as_double))
60976097
// value <-- +infinity
60986098
value.as_double = +INFINITY;
60996099
// s1 < 0
6100-
else if (! !signbit(s1.as_double))
6100+
else if (std::signbit(s1.as_double))
61016101
// value <-- -infinity
61026102
value.as_double = -INFINITY;
61036103
}
61046104
// s0 == -infinity
6105-
else if (fpclassify(s0.as_double) == FP_INFINITE &&
6106-
! !signbit(s0.as_double))
6105+
else if (std::fpclassify(s0.as_double) == FP_INFINITE &&
6106+
std::signbit(s0.as_double))
61076107
{
61086108
// s1 == +-denormal, +-0
6109-
if (fpclassify(s1.as_double) == FP_SUBNORMAL ||
6110-
fpclassify(s1.as_double) == FP_ZERO)
6109+
if (std::fpclassify(s1.as_double) == FP_SUBNORMAL ||
6110+
std::fpclassify(s1.as_double) == FP_ZERO)
61116111
// value <-- NaN64
61126112
value.as_double = NAN;
61136113
// s1 > 0
6114-
else if (!signbit(s1.as_double))
6114+
else if (!std::signbit(s1.as_double))
61156115
// value <-- -infinity
61166116
value.as_double = -INFINITY;
61176117
// s1 < 0
6118-
else if (! !signbit(s1.as_double))
6118+
else if (std::signbit(s1.as_double))
61196119
// value <-- +infinity
61206120
value.as_double = +INFINITY;
61216121
}

0 commit comments

Comments
 (0)