aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorAdam Izraelevitz2017-02-12 23:33:20 -0800
committerGitHub2017-02-12 23:33:20 -0800
commit7b2a3bc74d5fd0303c0056b4cb785fb34d7806bc (patch)
treede0e881ad213a0ff71a81cf41a3bbb997c4a246c /src/main
parent2f4ae9b4164cf415600de970b3ac5a1b9760efa5 (diff)
Changed fixed-point cat semantics to return uint (#436)
Diffstat (limited to 'src/main')
-rw-r--r--src/main/scala/firrtl/PrimOps.scala4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/main/scala/firrtl/PrimOps.scala b/src/main/scala/firrtl/PrimOps.scala
index b28cd000..fa523e12 100644
--- a/src/main/scala/firrtl/PrimOps.scala
+++ b/src/main/scala/firrtl/PrimOps.scala
@@ -314,9 +314,7 @@ object PrimOps extends LazyLogging {
case _ => UnknownType
}
case Cat => (t1, t2) match {
- case (_: UIntType | _: SIntType, _: UIntType | _: SIntType) => UIntType(PLUS(w1, w2))
- case (_: FixedType, _: UIntType| _: SIntType) => FixedType(PLUS(w1, w2), PLUS(p1, w2))
- case (_: UIntType | _: SIntType, _: FixedType) => FixedType(PLUS(w1, w2), p1)
+ case (_: UIntType | _: SIntType | _: FixedType, _: UIntType | _: SIntType | _: FixedType) => UIntType(PLUS(w1, w2))
case (t1, t2) => UnknownType
}
case Bits => t1 match {