From 19e16642cb99fbb4707ce23fa4df56963e3d39b6 Mon Sep 17 00:00:00 2001 From: chick Date: Tue, 28 Mar 2017 00:06:45 -0700 Subject: Creating FixedPoint literals was throwing away width when specifically provided. This caused one hot muxing problems in dsptools FixedPoint spec fixed based on error uncovered by this change --- chiselFrontend/src/main/scala/chisel3/core/Bits.scala | 2 +- src/test/scala/chiselTests/FixedPointSpec.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/chiselFrontend/src/main/scala/chisel3/core/Bits.scala b/chiselFrontend/src/main/scala/chisel3/core/Bits.scala index 240f5c83..dd3a2e8b 100644 --- a/chiselFrontend/src/main/scala/chisel3/core/Bits.scala +++ b/chiselFrontend/src/main/scala/chisel3/core/Bits.scala @@ -947,7 +947,7 @@ object FixedPoint { * Use PrivateObject to force users to specify width and binaryPoint by name */ def fromBigInt(value: BigInt, width: Width, binaryPoint: BinaryPoint): FixedPoint = { - apply(value, Width(), binaryPoint) + apply(value, width, binaryPoint) } /** Create an FixedPoint literal with inferred width from BigInt. * Use PrivateObject to force users to specify width and binaryPoint by name diff --git a/src/test/scala/chiselTests/FixedPointSpec.scala b/src/test/scala/chiselTests/FixedPointSpec.scala index 5047ac62..76a89e6a 100644 --- a/src/test/scala/chiselTests/FixedPointSpec.scala +++ b/src/test/scala/chiselTests/FixedPointSpec.scala @@ -79,7 +79,7 @@ class FixedPointFromBitsTester extends BasicTester { } class FixedPointMuxTester extends BasicTester { - val largeWidthLowPrecision = 6.0.F(3.W, 0.BP) + val largeWidthLowPrecision = 6.0.F(4.W, 0.BP) val smallWidthHighPrecision = 0.25.F(2.W, 2.BP) val unknownWidthLowPrecision = 6.0.F(0.BP) val unknownFixed = Wire(FixedPoint()) -- cgit v1.2.3