diff options
| author | Jack Koenig | 2016-06-10 18:09:19 -0700 |
|---|---|---|
| committer | Jack Koenig | 2016-06-10 18:09:19 -0700 |
| commit | c13ad522ae226bad57f341d0f93865194fb0bf76 (patch) | |
| tree | abb1a5b81693da98818a9bee79c776d421a820d1 /src/main/scala/firrtl/PrimOps.scala | |
| parent | f162263c05643c0851c5200fff2fc356f97843cd (diff) | |
Change BoolType from method to val
Diffstat (limited to 'src/main/scala/firrtl/PrimOps.scala')
| -rw-r--r-- | src/main/scala/firrtl/PrimOps.scala | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/src/main/scala/firrtl/PrimOps.scala b/src/main/scala/firrtl/PrimOps.scala index c90260a3..7e8d77db 100644 --- a/src/main/scala/firrtl/PrimOps.scala +++ b/src/main/scala/firrtl/PrimOps.scala @@ -180,60 +180,60 @@ object PrimOps extends LazyLogging { } case Lt => { val t = (t1(),t2()) match { - case (t1:UIntType, t2:UIntType) => Utils.BoolType() - case (t1:SIntType, t2:UIntType) => Utils.BoolType() - case (t1:UIntType, t2:SIntType) => Utils.BoolType() - case (t1:SIntType, t2:SIntType) => Utils.BoolType() + case (t1:UIntType, t2:UIntType) => Utils.BoolType + case (t1:SIntType, t2:UIntType) => Utils.BoolType + case (t1:UIntType, t2:SIntType) => Utils.BoolType + case (t1:SIntType, t2:SIntType) => Utils.BoolType case (t1, t2) => UnknownType } DoPrim(o,a,c,t) } case Leq => { val t = (t1(),t2()) match { - case (t1:UIntType, t2:UIntType) => Utils.BoolType() - case (t1:SIntType, t2:UIntType) => Utils.BoolType() - case (t1:UIntType, t2:SIntType) => Utils.BoolType() - case (t1:SIntType, t2:SIntType) => Utils.BoolType() + case (t1:UIntType, t2:UIntType) => Utils.BoolType + case (t1:SIntType, t2:UIntType) => Utils.BoolType + case (t1:UIntType, t2:SIntType) => Utils.BoolType + case (t1:SIntType, t2:SIntType) => Utils.BoolType case (t1, t2) => UnknownType } DoPrim(o,a,c,t) } case Gt => { val t = (t1(),t2()) match { - case (t1:UIntType, t2:UIntType) => Utils.BoolType() - case (t1:SIntType, t2:UIntType) => Utils.BoolType() - case (t1:UIntType, t2:SIntType) => Utils.BoolType() - case (t1:SIntType, t2:SIntType) => Utils.BoolType() + case (t1:UIntType, t2:UIntType) => Utils.BoolType + case (t1:SIntType, t2:UIntType) => Utils.BoolType + case (t1:UIntType, t2:SIntType) => Utils.BoolType + case (t1:SIntType, t2:SIntType) => Utils.BoolType case (t1, t2) => UnknownType } DoPrim(o,a,c,t) } case Geq => { val t = (t1(),t2()) match { - case (t1:UIntType, t2:UIntType) => Utils.BoolType() - case (t1:SIntType, t2:UIntType) => Utils.BoolType() - case (t1:UIntType, t2:SIntType) => Utils.BoolType() - case (t1:SIntType, t2:SIntType) => Utils.BoolType() + case (t1:UIntType, t2:UIntType) => Utils.BoolType + case (t1:SIntType, t2:UIntType) => Utils.BoolType + case (t1:UIntType, t2:SIntType) => Utils.BoolType + case (t1:SIntType, t2:SIntType) => Utils.BoolType case (t1, t2) => UnknownType } DoPrim(o,a,c,t) } case Eq => { val t = (t1(),t2()) match { - case (t1:UIntType, t2:UIntType) => Utils.BoolType() - case (t1:SIntType, t2:UIntType) => Utils.BoolType() - case (t1:UIntType, t2:SIntType) => Utils.BoolType() - case (t1:SIntType, t2:SIntType) => Utils.BoolType() + case (t1:UIntType, t2:UIntType) => Utils.BoolType + case (t1:SIntType, t2:UIntType) => Utils.BoolType + case (t1:UIntType, t2:SIntType) => Utils.BoolType + case (t1:SIntType, t2:SIntType) => Utils.BoolType case (t1, t2) => UnknownType } DoPrim(o,a,c,t) } case Neq => { val t = (t1(),t2()) match { - case (t1:UIntType, t2:UIntType) => Utils.BoolType() - case (t1:SIntType, t2:UIntType) => Utils.BoolType() - case (t1:UIntType, t2:SIntType) => Utils.BoolType() - case (t1:SIntType, t2:SIntType) => Utils.BoolType() + case (t1:UIntType, t2:UIntType) => Utils.BoolType + case (t1:SIntType, t2:UIntType) => Utils.BoolType + case (t1:UIntType, t2:SIntType) => Utils.BoolType + case (t1:SIntType, t2:SIntType) => Utils.BoolType case (t1, t2) => UnknownType } DoPrim(o,a,c,t) @@ -352,21 +352,21 @@ object PrimOps extends LazyLogging { } case Andr => { val t = (t1()) match { - case (_:UIntType|_:SIntType) => Utils.BoolType() + case (_:UIntType|_:SIntType) => Utils.BoolType case (t1) => UnknownType } DoPrim(o,a,c,t) } case Orr => { val t = (t1()) match { - case (_:UIntType|_:SIntType) => Utils.BoolType() + case (_:UIntType|_:SIntType) => Utils.BoolType case (t1) => UnknownType } DoPrim(o,a,c,t) } case Xorr => { val t = (t1()) match { - case (_:UIntType|_:SIntType) => Utils.BoolType() + case (_:UIntType|_:SIntType) => Utils.BoolType case (t1) => UnknownType } DoPrim(o,a,c,t) |