hdl.ast: make Value.__abs__ return unsigned shape.

amaranth-lang · Jun 7, 2023 · b1cce87 · b1cce87
1 parent 51391be
commit b1cce87
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/amaranth/hdl/ast.py b/amaranth/hdl/ast.py
@@ -263,7 +263,7 @@ def __ge__(self, other):
 
     def __abs__(self):
         if self.shape().signed:
-            return Mux(self >= 0, self, -self)
+            return Mux(self >= 0, self, -self)[:len(self)]
         else:
             return self
 

diff --git a/tests/test_hdl_ast.py b/tests/test_hdl_ast.py
@@ -675,6 +675,17 @@ def test_hash(self):
         with self.assertRaises(TypeError):
             hash(Const(0) + Const(0))
 
+    def test_abs(self):
+        s = Signal(4)
+        self.assertRepr(abs(s), """
+        (sig s)
+        """)
+        s = Signal(signed(4))
+        self.assertRepr(abs(s), """
+        (slice (m (>= (sig s) (const 1'd0)) (sig s) (- (sig s))) 0:4)
+        """)
+        self.assertEqual(abs(s).shape(), unsigned(4))
+
 
 class SliceTestCase(FHDLTestCase):
     def test_shape(self):