From bbf8f23e73445d9331a6ebb3217f763fcda895b1 Mon Sep 17 00:00:00 2001
From: Donggyu Kim <dgkim@eecs.berkeley.edu>
Date: Mon, 22 Sep 2014 20:00:27 -0700
Subject: [PATCH] [MIDAS] fix things for the new Chisel

---
 chisel                            |  2 +-
 src/main/scala/DaisyBackend.scala | 19 ++++---------------
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/chisel b/chisel
index f85a5f9c..ec819009 160000
--- a/chisel
+++ b/chisel
@@ -1 +1 @@
-Subproject commit f85a5f9c180a7ce1db29e23e8a1be41e6acb454c
+Subproject commit ec8190095ee6121861d22103c75511f6590f5789
diff --git a/src/main/scala/DaisyBackend.scala b/src/main/scala/DaisyBackend.scala
index 326f4a72..339fd690 100644
--- a/src/main/scala/DaisyBackend.scala
+++ b/src/main/scala/DaisyBackend.scala
@@ -27,26 +27,15 @@ object DaisyBackend {
     Driver.backend.transforms += addSnapshotChains
   } 
 
-  def addPin[T <: Data](m: Module, pin: T, name: String) = {
-    for ((n, io) <- pin.flatten) {
-      io.component = m
-      io.isIo = true
-    }
-    if (name != "")
-      pin nameIt (name, true)
-    m.io.asInstanceOf[Bundle] += pin
-    pin
-  }
-
   def addDaisyPins(c: Module) {
     ChiselError.info("[DaisyBackend] add daisy pins")
     for (m <- Driver.sortedComps) {
       if (m.name == top.name) {
         firePins(m) = top.stepCounter.orR
       } else {
-        firePins(m) = addPin(m, Bool(INPUT), "fire")
-        regsIns(m) = addPin(m, Valid(UInt(width=daisywidth)).flip, "regs_in")
-        regsOuts(m) = addPin(m, Decoupled(UInt(width=daisywidth)), "regs_out")
+        firePins(m) = m.addPin(Bool(INPUT), "fire")
+        regsIns(m) = m.addPin(Valid(UInt(width=daisywidth)).flip, "regs_in")
+        regsOuts(m) = m.addPin(Decoupled(UInt(width=daisywidth)), "regs_out")
       } 
     } 
   }
@@ -119,7 +108,7 @@ object DaisyBackend {
           }
         } else {
           val datawidth = (elems foldLeft 0)(_ + _.needWidth())
-          val chain = Module(new RegChain(datawidth), m)
+          val chain = m.addModule(new RegChain(datawidth))
           chains += chain
           chain.io.dataIn := UInt(Concatenate(elems))
           chain.io.stall  := !firePins(m)