Decode: don't pass illegal inst to TrapInstMod when out not ready

rezado · Aug 30, 2024 · b395248 · b395248
1 parent a44e2ed
commit b395248
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/main/scala/xiangshan/backend/decode/DecodeStage.scala b/src/main/scala/xiangshan/backend/decode/DecodeStage.scala
@@ -104,9 +104,9 @@ class DecodeStage(implicit p: Parameters) extends XSModule
   val isSimpleVec = VecInit(inValids.zip(decoders.map(_.io.deq.isComplex)).map { case (valid, isComplex) => valid && !isComplex })
   val simpleDecodedInst = VecInit(decoders.map(_.io.deq.decodedInst))
 
-  val isIllegalInstVec = VecInit(outValids.zip(io.out.map(_.bits)).map {
-    case (valid, decodedInst) =>
-      valid && (decodedInst.exceptionVec(ExceptionNO.EX_II) || decodedInst.exceptionVec(ExceptionNO.EX_VI))
+  val isIllegalInstVec = VecInit((outValids lazyZip outReadys lazyZip io.out.map(_.bits)).map {
+    case (valid, ready, decodedInst) =>
+      valid && ready && (decodedInst.exceptionVec(ExceptionNO.EX_II) || decodedInst.exceptionVec(ExceptionNO.EX_VI))
   })
   val hasIllegalInst = Cat(isIllegalInstVec).orR
   val illegalInst = PriorityMuxDefault(isIllegalInstVec.zip(io.out.map(_.bits)), 0.U.asTypeOf(new DecodedInst))