summaryrefslogtreecommitdiff
path: root/chiselFrontend/src
diff options
context:
space:
mode:
authorducky2016-11-16 15:23:36 -0800
committerducky2016-11-21 12:48:10 -0800
commit876bc32feca6bd0a2aaec7019fd3d29675ce0255 (patch)
tree9598426ff507c096340e37fcf9cd1e75f41e5318 /chiselFrontend/src
parent2db9bc81015000b5ee4581dc57c0f339ae9f9329 (diff)
Fix open-open range specifier, remove dead code, restyle tests
Diffstat (limited to 'chiselFrontend/src')
-rw-r--r--chiselFrontend/src/main/scala/chisel3/internal/firrtl/IR.scala15
1 files changed, 3 insertions, 12 deletions
diff --git a/chiselFrontend/src/main/scala/chisel3/internal/firrtl/IR.scala b/chiselFrontend/src/main/scala/chisel3/internal/firrtl/IR.scala
index d463d78e..262b939f 100644
--- a/chiselFrontend/src/main/scala/chisel3/internal/firrtl/IR.scala
+++ b/chiselFrontend/src/main/scala/chisel3/internal/firrtl/IR.scala
@@ -109,16 +109,6 @@ case class Index(imm: Arg, value: Arg) extends Arg {
override def fullName(ctx: Component): String = s"${imm.fullName(ctx)}[${value.fullName(ctx)}]"
}
-object Range {
- def log2Up(value: BigInt): Int = {
- require(value >= 0)
- 1 max (value-1).bitLength
- }
-}
-
-/*sealed abstract class Range {
-
-}*/
sealed trait Bound
sealed trait NumericBound[T] extends Bound {
val value: T
@@ -137,8 +127,9 @@ sealed trait KnownIntRange extends Range {
val max: NumericBound[Int]
require( (min, max) match {
- case (low, Open(high_val)) => low.value < high_val
- case (Open(low_val), high) => low_val < high.value
+ case (Open(low_val), Open(high_val)) => low_val < high_val - 1
+ case (Closed(low_val), Open(high_val)) => low_val < high_val
+ case (Open(low_val), Closed(high_val)) => low_val < high_val
case (Closed(low_val), Closed(high_val)) => low_val <= high_val
})
}