init methods for deqio, call collectelts during clone, change elsewhen emission to indent correctly

1 files changed, 8 insertions, 4 deletions

diff --git a/src/main/scala/utils.scala b/src/main/scala/utils.scala
index a86c81e8..c6f2ec01 100644
--- a/src/main/scala/utils.scala
+++ b/src/main/scala/utils.scala
@@ -310,16 +310,20 @@ object Decoupled {
 class EnqIO[T <: Data](gen: T) extends DecoupledIO(gen)
 {
   def enq(dat: T): T = { valid := Bool(true); bits := dat; dat }
-  valid := Bool(false);
-  for (io <- bits.flatten)
-    io := UInt(0)
+  override def init(dummy: Int = 0) = {
+    valid := Bool(false);
+    for (io <- bits.flatten)
+      io := UInt(0)
+  }
   override def cloneType: this.type = { new EnqIO(gen).asInstanceOf[this.type]; }
 }
 
 class DeqIO[T <: Data](gen: T) extends DecoupledIO(gen)
 {
   flip()
-  ready := Bool(false);
+  override def init(dummy: Int = 0) = {
+    ready := Bool(false)
+  }
   def deq(b: Boolean = false): T = { ready := Bool(true); bits }
   override def cloneType: this.type = { new DeqIO(gen).asInstanceOf[this.type]; }
 }