From 0e2b7800892a83740d18e98e923428b3203014dc Mon Sep 17 00:00:00 2001 From: Andrew Waterman Date: Sun, 26 Mar 2017 12:27:43 -0700 Subject: [PATCH] Bump hardfloat, giving us the 5th rounding mode finally! --- hardfloat | 2 +- src/main/scala/tile/FPU.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hardfloat b/hardfloat index f38b8bee..7f9ab280 160000 --- a/hardfloat +++ b/hardfloat @@ -1 +1 @@ -Subproject commit f38b8beeb3fbce40ee3d9c1e132c8f60ed05f4aa +Subproject commit 7f9ab280fee705b3d32c071209fd9022ddfc13d4 diff --git a/src/main/scala/tile/FPU.scala b/src/main/scala/tile/FPU.scala index 1f245e7c..96ab2178 100644 --- a/src/main/scala/tile/FPU.scala +++ b/src/main/scala/tile/FPU.scala @@ -690,7 +690,7 @@ class FPU(cfg: FPUParams)(implicit p: Parameters) extends FPUModule()(p) { io.sboard_clr := !wb_cp_valid && (divSqrt_wen || (wen(0) && useScoreboard(x => wbInfo(0).pipeid === UInt(x._2)))) io.sboard_clra := waddr // we don't currently support round-max-magnitude (rm=4) - io.illegal_rm := io.inst(14) && (io.inst(13,12) < 3 || io.fcsr_rm >= 4) + io.illegal_rm := io.inst(14,12).isOneOf(5, 6) || io.inst(14,12) === 7 && io.fcsr_rm >= 5 divSqrt_wdata := 0 divSqrt_flags := 0