diff options
| author | Andrew Waterman | 2015-08-05 01:28:58 -0700 |
|---|---|---|
| committer | Andrew Waterman | 2015-08-05 01:28:58 -0700 |
| commit | 1f2383fb61ca7c4e4def0c7c4ee1a19e58c36288 (patch) | |
| tree | c43ae73dba5d971828e37ddb5ab8f5fa2947e7fb /src/main/scala/Chisel/utils.scala | |
| parent | 4dc84e2f57be972287d77caca3121b21d0c79b56 (diff) | |
Use Width object, not Int
Please, no more -1
Diffstat (limited to 'src/main/scala/Chisel/utils.scala')
| -rw-r--r-- | src/main/scala/Chisel/utils.scala | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/main/scala/Chisel/utils.scala b/src/main/scala/Chisel/utils.scala index fe8329a7..5756fee0 100644 --- a/src/main/scala/Chisel/utils.scala +++ b/src/main/scala/Chisel/utils.scala @@ -94,9 +94,7 @@ object Mux1H if (in.tail.isEmpty) in.head._2 else { val masked = in map {case (s, i) => Mux(s, i.toBits, Bits(0))} - val width = - if (in.forall(_._2.knownWidth)) Some(in.map(_._2.getWidth).max) - else None + val width = in.map(_._2.width).reduce(_ max _) in.head._2.cloneTypeWidth(width).fromBits(masked.reduceLeft(_|_)) } } |
