From 7b2a3bc74d5fd0303c0056b4cb785fb34d7806bc Mon Sep 17 00:00:00 2001 From: Adam Izraelevitz Date: Sun, 12 Feb 2017 23:33:20 -0800 Subject: Changed fixed-point cat semantics to return uint (#436) --- src/main/scala/firrtl/PrimOps.scala | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/main') 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 { -- cgit v1.2.3