From baaa2adcbfcf4fb508d8e5e71345afd1d7e5a352 Mon Sep 17 00:00:00 2001
From: Chick Markley
Date: Thu, 7 Oct 2021 14:31:16 -0700
Subject: Fixed bug with unary minus on FixedPoint and Interval (#2154)

In `Bits.scala`, `FixedPoint` and `Interval` did not defeine the `do_unary_-` methods (the `do_`) was missing
The recent PR #2124 combined with the above fact made DspTools break. This fix is necessary to get
that repo to build.---
 core/src/main/scala/chisel3/Bits.scala          | 9 +++++----
 src/test/scala/chiselTests/FixedPointSpec.scala | 3 +++
 src/test/scala/chiselTests/IntervalSpec.scala   | 7 +++++++
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/core/src/main/scala/chisel3/Bits.scala b/core/src/main/scala/chisel3/Bits.scala
index a96d2732..81b43483 100644
--- a/core/src/main/scala/chisel3/Bits.scala
+++ b/core/src/main/scala/chisel3/Bits.scala
@@ -1330,9 +1330,9 @@ package experimental {
     final def unary_-%(dummy: Int*): FixedPoint = macro SourceInfoTransform.noArgDummy
 
     /** @group SourceInfoTransformMacro */
-    def unary_- (implicit sourceInfo: SourceInfo, compileOptions: CompileOptions): FixedPoint = FixedPoint.fromBigInt(0) - this
+    def do_unary_- (implicit sourceInfo: SourceInfo, compileOptions: CompileOptions): FixedPoint = FixedPoint.fromBigInt(0) - this
     /** @group SourceInfoTransformMacro */
-    def unary_-% (implicit sourceInfo: SourceInfo, compileOptions: CompileOptions): FixedPoint = FixedPoint.fromBigInt(0) -% this
+    def do_unary_-% (implicit sourceInfo: SourceInfo, compileOptions: CompileOptions): FixedPoint = FixedPoint.fromBigInt(0) -% this
 
     /** add (default - no growth) operator */
     override def do_+ (that: FixedPoint)(implicit sourceInfo: SourceInfo, compileOptions: CompileOptions): FixedPoint =
@@ -1772,10 +1772,11 @@ package experimental {
     @deprecated("Calling this function with an empty argument list is invalid in Scala 3. Use the form without parentheses instead", "Chisel 3.5")
     final def unary_-%(dummy: Int*): Interval = macro SourceInfoTransform.noArgDummy
 
-    def unary_-(implicit sourceInfo: SourceInfo, compileOptions: CompileOptions): Interval = {
+    /** @group SourceInfoTransformMacro */
+    def do_unary_-(implicit sourceInfo: SourceInfo, compileOptions: CompileOptions): Interval = {
       Interval.Zero - this
     }
-    def unary_-%(implicit sourceInfo: SourceInfo, compileOptions: CompileOptions): Interval = {
+    def do_unary_-%(implicit sourceInfo: SourceInfo, compileOptions: CompileOptions): Interval = {
       Interval.Zero -% this
     }
 
diff --git a/src/test/scala/chiselTests/FixedPointSpec.scala b/src/test/scala/chiselTests/FixedPointSpec.scala
index a1acdb17..2530bb13 100644
--- a/src/test/scala/chiselTests/FixedPointSpec.scala
+++ b/src/test/scala/chiselTests/FixedPointSpec.scala
@@ -60,6 +60,9 @@ class FixedPointFromBitsTester extends BasicTester {
   val negativefp = (-3.5).F(4.BP)
   val positivefp = 3.5.F(4.BP)
 
+  assert(- positivefp === negativefp)
+  assert(positivefp === -negativefp)
+
   assert(uint2fp === uint_result)
   assert(sint2fp === sint_result)
   assert(fp2fp   === fp_result)
diff --git a/src/test/scala/chiselTests/IntervalSpec.scala b/src/test/scala/chiselTests/IntervalSpec.scala
index abc619e5..a33cedc1 100644
--- a/src/test/scala/chiselTests/IntervalSpec.scala
+++ b/src/test/scala/chiselTests/IntervalSpec.scala
@@ -406,6 +406,13 @@ class IntervalChainedSubTester extends BasicTester {
   assert(intervalResult1 === 5.I)
   assert(intervalResult2 === 5.I)
 
+  val negativeInterval = (-3.5).I(4.BP)
+  val positiveInterval = 3.5.I(4.BP)
+
+  assert(negativeInterval =/= positiveInterval)
+  assert(-negativeInterval === positiveInterval)
+  assert(negativeInterval === -positiveInterval)
+
   stop()
 }
 
-- 
cgit v1.2.3