From dc3e209f89c409217aab6025b836bad12198c0fb Mon Sep 17 00:00:00 2001 From: Andrew Waterman Date: Thu, 13 Aug 2015 14:59:43 -0700 Subject: Don't fold constants in the frontend We need to make a similar change for extract, pending a FIRRTL bug fix. --- src/main/scala/Chisel/Core.scala | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src') diff --git a/src/main/scala/Chisel/Core.scala b/src/main/scala/Chisel/Core.scala index d257044b..4a0ee386 100644 --- a/src/main/scala/Chisel/Core.scala +++ b/src/main/scala/Chisel/Core.scala @@ -631,11 +631,7 @@ object Cat { val left = apply(r.slice(0, r.length/2)) val right = apply(r.slice(r.length/2, r.length)) val w = left.width + right.width - - if (left.isLit && right.isLit) - UInt((left.litValue() << right.getWidth) | right.litValue(), w) - else - pushOp(DefPrim(UInt(NO_DIR, w), ConcatOp, left.ref, right.ref)) + pushOp(DefPrim(UInt(NO_DIR, w), ConcatOp, left.ref, right.ref)) } } } -- cgit v1.2.3