From 4ef91c4c43d6ab808e79edd239062f919a5bbbe3 Mon Sep 17 00:00:00 2001
From: Schuyler Eldridge
Date: Mon, 16 Dec 2019 15:07:55 -0500
Subject: Remove unused WriteEmitted phase (#1273)

This removes a dead line where a WriteEmitted phase is constructed.

Signed-off-by: Schuyler Eldridge <schuyler.eldridge@ibm.com>---
 src/main/scala/chisel3/stage/package.scala | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/main')

diff --git a/src/main/scala/chisel3/stage/package.scala b/src/main/scala/chisel3/stage/package.scala
index 67d38ae7..57766be6 100644
--- a/src/main/scala/chisel3/stage/package.scala
+++ b/src/main/scala/chisel3/stage/package.scala
@@ -28,7 +28,6 @@ package object stage {
 
   private[chisel3] implicit object ChiselExecutionResultView extends OptionsView[ChiselExecutionResult] {
 
-    lazy val dummyWriteEmitted = new firrtl.stage.phases.WriteEmitted
     lazy val dummyConvert = new Convert
     lazy val dummyEmitter = new Emitter
 
-- 
cgit v1.2.3


From c720c99a75f565c8b4fbc7147d7b9daee9123d10 Mon Sep 17 00:00:00 2001
From: chick
Date: Wed, 18 Dec 2019 10:04:13 -0800
Subject: BitPat supports whitespace and underscores, presumably for human
 readability. The BitPat.parse factory though did not remove these from the
 returned count. This fixes that adds whitespace and underscores to the unit
 tests This is an updated vesion of Chisel PR #1069

---
 src/main/scala/chisel3/util/BitPat.scala | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/main')

diff --git a/src/main/scala/chisel3/util/BitPat.scala b/src/main/scala/chisel3/util/BitPat.scala
index 83475d1b..7c0abdb2 100644
--- a/src/main/scala/chisel3/util/BitPat.scala
+++ b/src/main/scala/chisel3/util/BitPat.scala
@@ -14,7 +14,7 @@ object BitPat {
     * @return bits the literal value, with don't cares being 0
     * @return mask the mask bits, with don't cares being 0 and cares being 1
     * @return width the number of bits in the literal, including values and
-    * don't cares.
+    * don't cares, but not including the white space and underscores
     */
   private def parse(x: String): (BigInt, BigInt, Int) = {
     // Notes:
@@ -25,14 +25,17 @@ object BitPat {
     require(x.head == 'b', "BitPats must be in binary and be prefixed with 'b'")
     var bits = BigInt(0)
     var mask = BigInt(0)
+    var count = 0
     for (d <- x.tail) {
-      if (d != '_') {
+      if (! (d == '_' || d.isWhitespace)) {
         require("01?".contains(d), "Literal: " + x + " contains illegal character: " + d)
         mask = (mask << 1) + (if (d == '?') 0 else 1)
         bits = (bits << 1) + (if (d == '1') 1 else 0)
+        count += 1
       }
     }
-    (bits, mask, x.length - 1)
+
+    (bits, mask, count)
   }
 
   /** Creates a [[BitPat]] literal from a string.
-- 
cgit v1.2.3


From 0a98a82c588882eb2905a5564792670c2cfaf858 Mon Sep 17 00:00:00 2001
From: Adam Izraelevitz
Date: Fri, 17 Jan 2020 15:52:57 -0800
Subject: Bugfix: Select.instances now works with blackboxes (#1303)

---
 src/main/scala/chisel3/aop/Select.scala | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/main')

diff --git a/src/main/scala/chisel3/aop/Select.scala b/src/main/scala/chisel3/aop/Select.scala
index 612cdcc7..390f82a5 100644
--- a/src/main/scala/chisel3/aop/Select.scala
+++ b/src/main/scala/chisel3/aop/Select.scala
@@ -80,8 +80,11 @@ object Select {
     */
   def instances(module: BaseModule): Seq[BaseModule] = {
     check(module)
-    module._component.get.asInstanceOf[DefModule].commands.collect {
-      case i: DefInstance => i.id
+    module._component.get match {
+      case d: DefModule => d.commands.collect {
+        case i: DefInstance => i.id
+      }
+      case other => Nil
     }
   }
 
-- 
cgit v1.2.3


From c7715c160a0dd07765e736b813c8b6b26b27de28 Mon Sep 17 00:00:00 2001
From: Deborah Soung
Date: Mon, 20 Jan 2020 16:48:31 -0800
Subject: specifying type of target field (#1305)

---
 src/main/scala/chisel3/stage/ChiselStage.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main')

diff --git a/src/main/scala/chisel3/stage/ChiselStage.scala b/src/main/scala/chisel3/stage/ChiselStage.scala
index 0a0cc47c..df23f97d 100644
--- a/src/main/scala/chisel3/stage/ChiselStage.scala
+++ b/src/main/scala/chisel3/stage/ChiselStage.scala
@@ -16,7 +16,7 @@ import java.io.{StringWriter, PrintWriter}
 class ChiselStage extends Stage with PreservesAll[Phase] {
   val shell: Shell = new Shell("chisel") with ChiselCli with FirrtlCli
 
-  val targets =
+  val targets: Seq[PhaseManager.PhaseDependency] =
     Seq( classOf[chisel3.stage.phases.Checks],
          classOf[chisel3.stage.phases.Elaborate],
          classOf[chisel3.stage.phases.AddImplicitOutputFile],
-- 
cgit v1.2.3