diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2007-04-23 15:34:40 +0000 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2007-04-23 15:34:40 +0000 |
| commit | cca881a5316d686f0be6b437e756a9faba43aa02 (patch) | |
| tree | 1c46278b51c66879e228b696dee64787fc487704 /src/base/random.cc | |
| parent | f0929006965514982603fe58ebc3211acf021cce (diff) | |
| parent | a006aa067a197f5ce2cd3f22ffe30ae3d9103cbf (diff) | |
| download | gem5-cca881a5316d686f0be6b437e756a9faba43aa02.tar.xz | |
Merge zizzer.eecs.umich.edu:/n/wexford/x/gblack/m5/newmem-o3-spec
into ahchoo.blinky.homelinux.org:/home/gblack/m5/newmem-o3-micro
--HG--
extra : convert_revision : 757e1d79033e6f8e0aaaf5ecaf14077d416cff8e
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); |