diff options
| author | Kevin Lim <ktlim@umich.edu> | 2006-02-28 15:16:24 -0500 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2006-02-28 15:16:24 -0500 |
| commit | 34da58a698e4119876f04d13c337e9974970f49a (patch) | |
| tree | 6dc9940bf89b04ec973ff4b433a015e13cb7f017 /arch/alpha/isa/fp.isa | |
| parent | 3a362d04b7aed0fa728af9373bad175a096a7de8 (diff) | |
| parent | 96fd6b5c4039c98a1b536ec184126ad75e7d2539 (diff) | |
| download | gem5-34da58a698e4119876f04d13c337e9974970f49a.tar.xz | |
Merge ktlim@zizzer:/bk/m5
into zamp.eecs.umich.edu:/z/ktlim2/clean/m5-clean
arch/alpha/ev5.cc:
cpu/o3/regfile.hh:
Hand merge.
--HG--
rename : arch/alpha/alpha_memory.cc => arch/alpha/tlb.cc
extra : convert_revision : c941dd2198851398820b38a66471372ed8454891
Diffstat (limited to 'arch/alpha/isa/fp.isa')
| -rw-r--r-- | arch/alpha/isa/fp.isa | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/alpha/isa/fp.isa b/arch/alpha/isa/fp.isa index 2ee714b0f..13656359f 100644 --- a/arch/alpha/isa/fp.isa +++ b/arch/alpha/isa/fp.isa @@ -35,7 +35,7 @@ output exec {{ inline Fault checkFpEnableFault(%(CPU_exec_context)s *xc) { Fault fault = NoFault; // dummy... this ipr access should not fault - if (!EV5::ICSR_FPE(xc->readIpr(AlphaISA::IPR_ICSR, fault))) { + if (!EV5::ICSR_FPE(xc->readMiscRegWithEffect(AlphaISA::IPR_ICSR, fault))) { fault = new FloatEnableFault; } return fault; @@ -217,7 +217,8 @@ def template FloatingPointExecute {{ if (roundingMode == Normal) { %(code)s; } else { - fesetround(getC99RoundingMode(xc->readFpcr())); + fesetround(getC99RoundingMode( + xc->readMiscReg(AlphaISA::Fpcr_DepTag))); %(code)s; fesetround(FE_TONEAREST); } |