summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Waterman2015-08-13 16:23:17 -0700
committerAndrew Waterman2015-08-13 18:19:42 -0700
commita46e06355e510743fbefabdf5deeffa352360187 (patch)
treeb26f7853c7893cdd66dc2ef45f7c13fb286befc9
parent6439d30fc177867c721625fd8895f04a84970f2b (diff)
Make temporary names locally unique, rather than globally so
-rw-r--r--src/main/scala/Chisel/Builder.scala1
-rw-r--r--src/main/scala/Chisel/Core.scala2
2 files changed, 1 insertions, 2 deletions
diff --git a/src/main/scala/Chisel/Builder.scala b/src/main/scala/Chisel/Builder.scala
index 3a6db75e..79d1ab18 100644
--- a/src/main/scala/Chisel/Builder.scala
+++ b/src/main/scala/Chisel/Builder.scala
@@ -36,7 +36,6 @@ private class IdGen {
private[Chisel] trait HasId {
private[Chisel] val _id = Builder.idGen.next
- private[Chisel] def setRef() = Builder.globalRefMap.setRef(this, s"T_${_id}")
private[Chisel] def setRef(imm: Immediate) = Builder.globalRefMap.setRef(this, imm)
private[Chisel] def setRef(name: String) = Builder.globalRefMap.setRef(this, name)
private[Chisel] def setRef(parent: HasId, name: String) = Builder.globalRefMap.setField(parent, this, name)
diff --git a/src/main/scala/Chisel/Core.scala b/src/main/scala/Chisel/Core.scala
index e7dce33a..ccffbc96 100644
--- a/src/main/scala/Chisel/Core.scala
+++ b/src/main/scala/Chisel/Core.scala
@@ -779,7 +779,7 @@ abstract class Module(_clock: Clock = null, _reset: Bool = null) extends HasId {
case id: HasId => id.setRef(_namespace.name(m.getName))
case _ =>
}
- (_nodes ++ _children).foreach(_.setRef)
+ (_nodes ++ _children).foreach(_.setRef(_namespace.name("T")))
this
}