summaryrefslogtreecommitdiff
path: root/chiselFrontend/src/main/scala/chisel3/core/Module.scala
diff options
context:
space:
mode:
authorJack2017-01-30 22:42:57 -0800
committerJack Koenig2017-01-31 11:30:28 -0800
commit3ef63639284b2b56f415e1540c58d85d88c360db (patch)
tree5ab5802bcd1ec2a86ef23a67b6d1249488425deb /chiselFrontend/src/main/scala/chisel3/core/Module.scala
parentf8408623e13149ccd4bfae443d916eeb9c5a2146 (diff)
Make Module and Bundle properly use empty namespaces
Fix default suggested name of Module instances (now based on desired name rather than actual assigned name). Remove parent/child relationship from Namespace. Previously, Module and Bundle namespaces were "children" of the Module definition namespace. This could lead to collisions that would give unexpected names for module instances or Bundle elements. In particular, otherwise identical modules that instantiate other identical modules in such a way that the instance cannot be named via reflection would not be deduplicated because the names of the instances would collide with the names of the modules in the Builder.globalNamespace.
Diffstat (limited to 'chiselFrontend/src/main/scala/chisel3/core/Module.scala')
-rw-r--r--chiselFrontend/src/main/scala/chisel3/core/Module.scala5
1 files changed, 3 insertions, 2 deletions
diff --git a/chiselFrontend/src/main/scala/chisel3/core/Module.scala b/chiselFrontend/src/main/scala/chisel3/core/Module.scala
index ca7c8abd..de13c078 100644
--- a/chiselFrontend/src/main/scala/chisel3/core/Module.scala
+++ b/chiselFrontend/src/main/scala/chisel3/core/Module.scala
@@ -113,7 +113,8 @@ extends HasId {
Port(iodef)
}
- private[core] val _namespace = Builder.globalNamespace.child
+ // Fresh Namespace because in Firrtl, Modules namespaces are disjoint with the global namespace
+ private[core] val _namespace = Namespace.empty
private[chisel3] val _commands = ArrayBuffer[Command]()
private[core] val _ids = ArrayBuffer[HasId]()
Builder.currentModule = Some(this)
@@ -210,7 +211,7 @@ extends HasId {
// For Module instances we haven't named, suggest the name of the Module
_ids foreach {
- case m: Module => m.suggestName(m.name)
+ case m: Module => m.suggestName(m.desiredName)
case _ =>
}