summaryrefslogtreecommitdiff
path: root/src/main/scala
diff options
context:
space:
mode:
authorducky2018-07-01 12:40:25 -0700
committerRichard Lin2018-07-04 18:39:28 -0500
commit94bde13444b956b2ef3c3cf7e94870b1d890f65d (patch)
tree95d478dc89be94c2a419cd997c4e809952aa73c8 /src/main/scala
parenta931abe0cf57481b47093b5950d3bffd9575f803 (diff)
Prefer litValue, eliminate litToBigInt
Diffstat (limited to 'src/main/scala')
-rw-r--r--src/main/scala/chisel3/util/BitPat.scala2
-rw-r--r--src/main/scala/chisel3/util/Conditional.scala4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/main/scala/chisel3/util/BitPat.scala b/src/main/scala/chisel3/util/BitPat.scala
index 3a3a7061..6ff08bea 100644
--- a/src/main/scala/chisel3/util/BitPat.scala
+++ b/src/main/scala/chisel3/util/BitPat.scala
@@ -75,7 +75,7 @@ object BitPat {
*/
def apply(x: UInt): BitPat = {
val len = if (x.isWidthKnown) x.getWidth else 0
- apply("b" + x.litToBigInt.toString(2).reverse.padTo(len, "0").reverse.mkString)
+ apply("b" + x.litValue.toString(2).reverse.padTo(len, "0").reverse.mkString)
}
}
diff --git a/src/main/scala/chisel3/util/Conditional.scala b/src/main/scala/chisel3/util/Conditional.scala
index 1d2805ad..bf2d4268 100644
--- a/src/main/scala/chisel3/util/Conditional.scala
+++ b/src/main/scala/chisel3/util/Conditional.scala
@@ -28,8 +28,8 @@ class SwitchContext[T <: Bits](cond: T, whenContext: Option[WhenContext], lits:
def is(v: Iterable[T])(block: => Unit): SwitchContext[T] = {
if (!v.isEmpty) {
val newLits = v.map { w =>
- require(w.litToBigIntOption.isDefined, "is condition must be literal")
- val value = w.litToBigInt
+ require(w.litOption.isDefined, "is condition must be literal")
+ val value = w.litValue
require(!lits.contains(value), "all is conditions must be mutually exclusive!")
value
}