diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2007-04-23 11:34:39 -0400 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2007-04-23 11:34:39 -0400 |
| commit | a006aa067a197f5ce2cd3f22ffe30ae3d9103cbf (patch) | |
| tree | 1a10eafaa85a1f97b17b040813fd6348aa1db9d2 /src/base/random.cc | |
| parent | f3a0abbecc3456147f1ca3e297a50ae4353316fd (diff) | |
| parent | dbc1edd23deed386c952a77488a70f20485da711 (diff) | |
| download | gem5-a006aa067a197f5ce2cd3f22ffe30ae3d9103cbf.tar.xz | |
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/newmem
into zizzer.eecs.umich.edu:/.automount/wexford/x/gblack/m5/newmem-o3-spec
--HG--
extra : convert_revision : 12f10c174f0eca1ddf74b672414fbe78251f686b
Diffstat (limited to 'src/base/random.cc')
| -rw-r--r-- | src/base/random.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/base/random.cc b/src/base/random.cc index ceab337d9..8a2e3c1c0 100644 --- a/src/base/random.cc +++ b/src/base/random.cc @@ -29,9 +29,6 @@ * Ali Saidi */ -#if defined(__sun) -#include <ieeefp.h> -#endif #ifdef __SUNPRO_CC #include <stdlib.h> #include <math.h> @@ -40,6 +37,7 @@ #include <cstdlib> #include <cmath> +#include "base/fenv.hh" #include "base/random.hh" using namespace std; @@ -61,9 +59,10 @@ m5round(double r) { #if defined(__sun) double val; - fp_rnd oldrnd = fpsetround(FP_RN); + int oldrnd = m5_fegetround(); + m5_fesetround(M5_FE_TONEAREST); val = rint(r); - fpsetround(oldrnd); + m5_fesetround(oldrnd); return val; #else return round(r); |