diff options
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/scala/chisel3/util/Decoupled.scala | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/src/main/scala/chisel3/util/Decoupled.scala b/src/main/scala/chisel3/util/Decoupled.scala index d2419325..f9fc2b90 100644 --- a/src/main/scala/chisel3/util/Decoupled.scala +++ b/src/main/scala/chisel3/util/Decoupled.scala @@ -282,11 +282,20 @@ object Queue entries: Int = 2, pipe: Boolean = false, flow: Boolean = false): DecoupledIO[T] = { - val q = Module(new Queue(chiselTypeOf(enq.bits), entries, pipe, flow)) - q.io.enq.valid := enq.valid // not using <> so that override is allowed - q.io.enq.bits := enq.bits - enq.ready := q.io.enq.ready - TransitName(q.io.deq, q) + if (entries == 0) { + val deq = Wire(new DecoupledIO(enq.bits)) + deq.valid := enq.valid + deq.bits := enq.bits + enq.ready := deq.ready + deq + } else { + require(entries > 0) + val q = Module(new Queue(chiselTypeOf(enq.bits), entries, pipe, flow)) + q.io.enq.valid := enq.valid // not using <> so that override is allowed + q.io.enq.bits := enq.bits + enq.ready := q.io.enq.ready + TransitName(q.io.deq, q) + } } /** Create a queue and supply a IrrevocableIO containing the product. @@ -300,6 +309,7 @@ object Queue entries: Int = 2, pipe: Boolean = false, flow: Boolean = false): IrrevocableIO[T] = { + require(entries > 0) // Zero-entry queues don't guarantee Irrevocability val deq = apply(enq, entries, pipe, flow) val irr = Wire(new IrrevocableIO(deq.bits)) irr.bits := deq.bits |