summaryrefslogtreecommitdiff
path: root/src/main/scala/Chisel/Module.scala
diff options
context:
space:
mode:
authorHenry Cook2015-11-04 09:21:07 -0800
committerHenry Cook2015-11-04 09:21:07 -0800
commita3c9680d1e2b84693759747a4779341ba80c4a50 (patch)
treee97ab1d8394b0463ec7f600fce7ba278bd68d93a /src/main/scala/Chisel/Module.scala
parent23d15d166d2ed32f8bd9a153a806c09982659011 (diff)
Remove Parameters library and refactor Driver.
In addition to removing all the extraneous Driver invocations that created various top-level Parameters instances, this commit also lays the groundwork for stanza-firrtl/verilator based testing of Modules that extend BasicTester. The execution-based tests have been updated accordingly. They will only succeed if firrtl and verilator binaries have been installed. Further work is needed on individual tests to use assertions instead of .io.error.
Diffstat (limited to 'src/main/scala/Chisel/Module.scala')
-rw-r--r--src/main/scala/Chisel/Module.scala40
1 files changed, 15 insertions, 25 deletions
diff --git a/src/main/scala/Chisel/Module.scala b/src/main/scala/Chisel/Module.scala
index 1c1c02de..f799a7ce 100644
--- a/src/main/scala/Chisel/Module.scala
+++ b/src/main/scala/Chisel/Module.scala
@@ -6,37 +6,27 @@ import Builder.pushCommand
import Builder.dynamicContext
object Module {
- // TODO: update documentation when parameters gets removed from core Chisel
- // and this gets simplified.
/** A wrapper method that all Module instantiations must be wrapped in
* (necessary to help Chisel track internal state).
*
* @param m the Module being created
- * @param p Parameters passed down implicitly from that it is created in
*
- * @return the input module `m`
+ * @return the input module `m` with Chisel metadata properly set
*/
- def apply[T <: Module](bc: => T)(implicit currParams: Parameters = Builder.getParams.push): T = {
- paramsScope(currParams) {
- val parent = dynamicContext.currentModule
- val m = bc.setRefs()
- // init module outputs
- m._commands prependAll (for (p <- m.io.flatten; if p.dir == OUTPUT)
- yield Connect(p.lref, p.fromInt(0).ref))
- dynamicContext.currentModule = parent
- val ports = m.computePorts
- Builder.components += Component(m, m.name, ports, m._commands)
- pushCommand(DefInstance(m, ports))
- // init instance inputs
- for (p <- m.io.flatten; if p.dir == INPUT)
- p := p.fromInt(0)
- m
- }.connectImplicitIOs()
- }
-
- //TODO @deprecated("Use Chisel.paramsScope object","08-01-2015")
- def apply[T <: Module](m: => T, f: PartialFunction[Any,Any]): T = {
- apply(m)(Builder.getParams.alterPartial(f))
+ def apply[T <: Module](bc: => T): T = {
+ val parent = dynamicContext.currentModule
+ val m = bc.setRefs()
+ // init module outputs
+ m._commands prependAll (for (p <- m.io.flatten; if p.dir == OUTPUT)
+ yield Connect(p.lref, p.fromInt(0).ref))
+ dynamicContext.currentModule = parent
+ val ports = m.computePorts
+ Builder.components += Component(m, m.name, ports, m._commands)
+ pushCommand(DefInstance(m, ports))
+ // init instance inputs
+ for (p <- m.io.flatten; if p.dir == INPUT)
+ p := p.fromInt(0)
+ m.connectImplicitIOs()
}
}