summaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorJack Koenig2017-08-17 11:26:29 -0700
committerGitHub2017-08-17 11:26:29 -0700
commit802cfc4405c28ae212a955a92c7a6ad2d2b6f0c2 (patch)
tree23f8d8be14506cb2cfcacfd89eb4ef35cccfe925 /src/main
parent90e775b1228765ce7f345716fa215f72b97816a9 (diff)
Make Reset a trait (#672)
Bool implements Reset. Compatibility package includes an implicit conversion from Reset to Bool.
Diffstat (limited to 'src/main')
-rw-r--r--src/main/scala/chisel3/compatibility.scala3
-rw-r--r--src/main/scala/chisel3/testers/BasicTester.scala2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/main/scala/chisel3/compatibility.scala b/src/main/scala/chisel3/compatibility.scala
index e169fb8f..4d2d9311 100644
--- a/src/main/scala/chisel3/compatibility.scala
+++ b/src/main/scala/chisel3/compatibility.scala
@@ -195,6 +195,9 @@ package object Chisel { // scalastyle:ignore package.object.name
type Bool = chisel3.core.Bool
object Bool extends BoolFactory
val Mux = chisel3.core.Mux
+ type Reset = chisel3.core.Reset
+
+ implicit def resetToBool(reset: Reset): Bool = reset.toBool
import chisel3.core.Param
abstract class BlackBox(params: Map[String, Param] = Map.empty[String, Param]) extends chisel3.core.BlackBox(params) {
diff --git a/src/main/scala/chisel3/testers/BasicTester.scala b/src/main/scala/chisel3/testers/BasicTester.scala
index bd7d4027..6d1a4913 100644
--- a/src/main/scala/chisel3/testers/BasicTester.scala
+++ b/src/main/scala/chisel3/testers/BasicTester.scala
@@ -25,7 +25,7 @@ class BasicTester extends Module() {
*/
def stop()(implicit sourceInfo: SourceInfo) {
// TODO: rewrite this using library-style SourceInfo passing.
- when (!reset) {
+ when (!reset.toBool) {
pushCommand(Stop(sourceInfo, Node(clock), 0))
}
}