diff options
| author | Timothy G Rogers <[email protected]> | 2018-04-18 15:51:50 -0400 |
|---|---|---|
| committer | GitHub Enterprise <[email protected]> | 2018-04-18 15:51:50 -0400 |
| commit | e97db22feb5aef9978feaae9f5c92507c73d7d96 (patch) | |
| tree | 12caa122df78e40310ca7f376263b7f21dc13fa4 /src/cuda-sim/instructions.cc | |
| parent | 12f2a2c791747dc38a53553026ed8122e8e08988 (diff) | |
| parent | b61a26eb163565cce292f7a2400b5fd82f3d2d10 (diff) | |
Merge branch 'dev-purdue-integration' into dev-purdue-integration
Diffstat (limited to 'src/cuda-sim/instructions.cc')
| -rw-r--r-- | src/cuda-sim/instructions.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/cuda-sim/instructions.cc b/src/cuda-sim/instructions.cc index 011c285..e3b8970 100644 --- a/src/cuda-sim/instructions.cc +++ b/src/cuda-sim/instructions.cc @@ -33,6 +33,7 @@ #include "ptx.tab.h" #include <stdlib.h> #include <math.h> +#include <cmath> #include <fenv.h> #include "cuda-math.h" #include "../abstract_hardware_model.h" @@ -1961,7 +1962,7 @@ ptx_reg_t d2d( ptx_reg_t x, unsigned from_width, unsigned to_width, int to_sign, y.f64 = x.f64; break; } - if (isnan(y.f64)) { + if (std::isnan(y.f64)) { y.u64 = 0xfff8000000000000ull; } else if (saturation_mode) { y.f64 = cuda_math::__saturatef(y.f64); @@ -2086,7 +2087,7 @@ void ptx_round(ptx_reg_t& data, int rounding_mode, int type) } } if ((type == F64_TYPE)||(type == FF64_TYPE)) { - if (isnan(data.f64)) { + if (std::isnan(data.f64)) { data.u64 = 0xfff8000000000000ull; } } @@ -2648,12 +2649,12 @@ void mad_def( const ptx_instruction *pI, ptx_thread_info *thread, bool use_carry bool isNaN(float x) { - return isnan(x); + return std::isnan(x); } bool isNaN(double x) { - return isnan(x); + return std::isnan(x); } void max_impl( const ptx_instruction *pI, ptx_thread_info *thread ) |