add default field for DecodeField for DecodeTable non X case

chipsalliance · Oct 2, 2023 · a80c2e5 · a80c2e5
1 parent 3b39bd8
commit a80c2e5
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/main/scala/chisel3/util/experimental/decode/DecoderBundle.scala b/src/main/scala/chisel3/util/experimental/decode/DecoderBundle.scala
@@ -23,11 +23,15 @@ trait DecodeField[T <: DecodePattern, D <: Data] {
 
   def chiselType: D
 
+  def default: BitPat = dc
+
   final def width: Int = chiselType.getWidth
 
   def dc: BitPat = BitPat.dontCare(width)
 
   def genTable(op: T): BitPat
+
+  require(width == default.width)
 }
 
 /**
@@ -79,7 +83,11 @@ class DecodeTable[I <: DecodePattern](patterns: Seq[I], fields: Seq[DecodeField[
   private val _table = patterns.map { op =>
     op.bitPat -> fields.reverse.map(field => field.genTable(op)).reduce(_ ## _)
   }
-  val table: TruthTable = TruthTable(_table, BitPat.dontCare(_table.head._2.getWidth))
+
+  val table: TruthTable = TruthTable(
+    patterns.map { op => op.bitPat -> fields.reverse.map(field => field.genTable(op)).reduce(_ ## _) },
+    fields.reverse.map(_.default).reduce(_ ## _)
+  )
 
   def decode(input: UInt): DecodeBundle = chisel3.util.experimental.decode.decoder(input, table).asTypeOf(bundle)
 }