From: whitequark <whitequark@whitequark.org>
Date: Wed, 26 Aug 2020 04:15:26 +0000 (+0000)
Subject: sim._pyrtl: fix miscompilation of -(Const(0b11, 2).as_signed()).
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=593e95e327889159af17794737435e7f81f737e7;p=nmigen.git

sim._pyrtl: fix miscompilation of -(Const(0b11, 2).as_signed()).

Fixes #473.
---

diff --git a/nmigen/sim/_pyrtl.py b/nmigen/sim/_pyrtl.py
index 9c7225a..c2e9367 100644
--- a/nmigen/sim/_pyrtl.py
+++ b/nmigen/sim/_pyrtl.py
@@ -116,7 +116,7 @@ class _RHSValueCompiler(_ValueCompiler):
             if value.operator == "~":
                 return f"(~{self(arg)})"
             if value.operator == "-":
-                return f"(-{self(arg)})"
+                return f"(-{sign(arg)})"
             if value.operator == "b":
                 return f"bool({mask(arg)})"
             if value.operator == "r|":
diff --git a/nmigen/test/test_sim.py b/nmigen/test/test_sim.py
index 8626e71..94424f7 100644
--- a/nmigen/test/test_sim.py
+++ b/nmigen/test/test_sim.py
@@ -365,6 +365,7 @@ class SimulatorUnitTestCase(FHDLTestCase):
         self.assertStatement(stmt, [C(0b1000000)], C(0b0000010))
         self.assertStatement(stmt, [C(0b1000001)], C(0b0000110))
 
+
 class SimulatorIntegrationTestCase(FHDLTestCase):
     @contextmanager
     def assertSimulation(self, module, deadline=None):
@@ -788,3 +789,10 @@ class SimulatorRegressionTestCase(FHDLTestCase):
         dut = Module()
         dut.d.comb += Signal().eq(Repl(Const(1), 0))
         Simulator(dut).run()
+
+    def test_bug_473(self):
+        sim = Simulator(Module())
+        def process():
+            self.assertEqual((yield -(Const(0b11, 2).as_signed())), 1)
+        sim.add_process(process)
+        sim.run()