summaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorAndrew Waterman2015-08-08 18:31:33 -0700
committerAndrew Waterman2015-08-09 21:31:03 -0700
commit27c4e0fc6af6379d25990b90a0382774bc7c4765 (patch)
tree2a30fe4585ea3d29d48baf5562cc0ce25054235b /src/main
parent1c9f3936172683a464e59a6e5b935381b7cbffe7 (diff)
For now, allow constructing Data outside of Modules
This probably isn't a good idea, but Emitter.initPorts depends on it to create the literal 0.
Diffstat (limited to 'src/main')
-rw-r--r--src/main/scala/Chisel/Core.scala6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/scala/Chisel/Core.scala b/src/main/scala/Chisel/Core.scala
index c348b3a4..4030c549 100644
--- a/src/main/scala/Chisel/Core.scala
+++ b/src/main/scala/Chisel/Core.scala
@@ -279,9 +279,9 @@ object debug {
}
abstract class Data(dirArg: Direction) extends Id {
- private[Chisel] val _mod: Module = DynamicContext.getCurrentModule.getOrElse(
- throwException("Data subclasses can only be instantiated inside Modules!"))
- //TODO: is this true?
+ private[Chisel] val _mod: Module = DynamicContext.getCurrentModule.getOrElse(null)
+ if (_mod ne null)
+ _mod.addNode(this)
_mod.addNode(this)
def params = DynamicContext.getParams