From b4e4ceed3dfaa413cbe97d7d4e593b3646205d6d Mon Sep 17 00:00:00 2001 From: Andrew Waterman Date: Wed, 22 Jul 2015 15:52:13 -0700 Subject: [PATCH] Factor out some more hazard detection code --- rocket/src/main/scala/rocket.scala | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/rocket/src/main/scala/rocket.scala b/rocket/src/main/scala/rocket.scala index 013fc2a8..3d9cf54b 100644 --- a/rocket/src/main/scala/rocket.scala +++ b/rocket/src/main/scala/rocket.scala @@ -454,11 +454,7 @@ class Rocket extends CoreModule fp_sboard.clear(dmem_resp_replay && dmem_resp_fpu, dmem_resp_waddr) fp_sboard.clear(io.fpu.sboard_clr, io.fpu.sboard_clra) - id_csr_en && !io.fpu.fcsr_rdy || - io.fpu.dec.ren1 && fp_sboard.read(id_raddr1) || - io.fpu.dec.ren2 && fp_sboard.read(id_raddr2) || - io.fpu.dec.ren3 && fp_sboard.read(id_raddr3) || - io.fpu.dec.wen && fp_sboard.read(id_waddr) + id_csr_en && !io.fpu.fcsr_rdy || checkHazards(fp_hazard_targets, fp_sboard.read _) } else Bool(false) val ctrl_stalld =