From a6f22d467f2bc7d83e1dc94da3a7f354c4dc9d7d Mon Sep 17 00:00:00 2001 From: Andrew Waterman Date: Fri, 2 Nov 2018 14:49:53 -0700 Subject: Fix Queue.io.count when entries=1 (#918) Resolves #917--- src/main/scala/chisel3/util/Decoupled.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/chisel3/util/Decoupled.scala b/src/main/scala/chisel3/util/Decoupled.scala index 88ccd892..d2a6552d 100644 --- a/src/main/scala/chisel3/util/Decoupled.scala +++ b/src/main/scala/chisel3/util/Decoupled.scala @@ -253,7 +253,7 @@ class Queue[T <: Data](gen: T, private val ptr_diff = enq_ptr.value - deq_ptr.value if (isPow2(entries)) { - io.count := Cat(maybe_full && ptr_match, ptr_diff) + io.count := Mux(maybe_full && ptr_match, entries.U, 0.U) | ptr_diff } else { io.count := Mux(ptr_match, Mux(maybe_full, -- cgit v1.2.3