From a3c9680d1e2b84693759747a4779341ba80c4a50 Mon Sep 17 00:00:00 2001 From: Henry Cook Date: Wed, 4 Nov 2015 09:21:07 -0800 Subject: 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. --- src/main/scala/Chisel/Aggregate.scala | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'src/main/scala/Chisel/Aggregate.scala') diff --git a/src/main/scala/Chisel/Aggregate.scala b/src/main/scala/Chisel/Aggregate.scala index 07362b9b..e6ac6b85 100644 --- a/src/main/scala/Chisel/Aggregate.scala +++ b/src/main/scala/Chisel/Aggregate.scala @@ -313,17 +313,6 @@ class Bundle extends Aggregate(NO_DIR) { } } -object Bundle { - private val keywords = - HashSet[String]("flip", "asInput", "asOutput", "cloneType", "toBits") - - def apply[T <: Bundle](b: => T)(implicit p: Parameters): T = { - Builder.paramsScope(p.push){ b } - } - - //TODO @deprecated("Use Chisel.paramsScope object","08-01-2015") - def apply[T <: Bundle](b: => T, f: PartialFunction[Any,Any]): T = { - val q = Builder.getParams.alterPartial(f) - apply(b)(q) - } +private[Chisel] object Bundle { + val keywords = List("flip", "asInput", "asOutput", "cloneType", "toBits") } -- cgit v1.2.3