From 2a01f558ba8d6830fe5810a5bf3949e6ea4c7a6e Mon Sep 17 00:00:00 2001 From: Yunsup Lee Date: Sun, 18 Mar 2012 19:55:24 -0700 Subject: [PATCH] fix unmasked valid bug in ctrl_vec --- rocket/src/main/scala/ctrl_vec.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rocket/src/main/scala/ctrl_vec.scala b/rocket/src/main/scala/ctrl_vec.scala index 55466cd2..df3b15d5 100644 --- a/rocket/src/main/scala/ctrl_vec.scala +++ b/rocket/src/main/scala/ctrl_vec.scala @@ -231,11 +231,11 @@ class rocketCtrlVec extends Component val reg_hold = Reg(resetVal = Bool(false)) - when (wb_vec_xcpthold) { reg_hold := Bool(true) } + when (valid_common && wb_vec_xcpthold) { reg_hold := Bool(true) } when (io.eret) { reg_hold := Bool(false) } - io.iface.evac := wb_vec_xcptevac.toBool - io.iface.kill := wb_vec_xcptkill.toBool + io.iface.evac := valid_common && wb_vec_xcptevac.toBool + io.iface.kill := valid_common && wb_vec_xcptkill.toBool io.iface.hold := reg_hold io.stalld := reg_xcptwait