Moar fix

chipsalliance · Jan 31, 2017 · 2f3bb1c · 2f3bb1c
1 parent 8940c77
commit 2f3bb1c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/chiselFrontend/src/main/scala/chisel3/core/BlackBox.scala b/chiselFrontend/src/main/scala/chisel3/core/BlackBox.scala
@@ -31,6 +31,8 @@ abstract class BlackBox(val params: Map[String, Param] = Map.empty[String, Param
   def io: Record
 
   private[core] override def generateComponent(): Component = {
+    _autoWrapPorts()  // pre-IO(...) compatibility hack
+
     require(!_closed, "Can't generate module more than once")
     _closed = true
 

diff --git a/chiselFrontend/src/main/scala/chisel3/core/Module.scala b/chiselFrontend/src/main/scala/chisel3/core/Module.scala
@@ -238,6 +238,8 @@ abstract class UserModule(implicit moduleCompileOptions: CompileOptions)
   }
 
   private[core] override def generateComponent(): Component = {
+    _autoWrapPorts()  // pre-IO(...) compatibility hack
+
     require(!_closed, "Can't generate module more than once")
     _closed = true
 
@@ -299,15 +301,6 @@ abstract class ImplicitModule(
   val clock = IO(Input(Clock()))
   val reset = IO(Input(Bool()))
 
-  private[core] override def generateComponent(): Component = {
-    _autoWrapPorts()  // pre-IO(...) compatibility hack
-
-    // Ensure that io is properly bound
-    //require(_ioPortBound(), "Missing IO binding in $this")
-
-    super.generateComponent()
-  }
-
   private[core] def initializeInParent(externalClock: Option[Clock], externalReset: Option[Bool]) {
     // Don't generate source info referencing parents inside a module, since this interferes with
     // module de-duplication in FIRRTL emission.