From: whitequark <whitequark@whitequark.org>
Date: Sat, 3 Aug 2019 23:57:50 +0000 (+0000)
Subject: back.rtlil: use a dummy wire, not 'x, when assigning to shorter LHS.
X-Git-Tag: locally_working~49
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2e6627c4af46360893e60e7881a438f4f194de30;p=nmigen.git

back.rtlil: use a dummy wire, not 'x, when assigning to shorter LHS.

Using 'x is legal RTLIL, in theory, but in practice it crashes Yosys
and when it doesn't, it causes Yosys to produce invalid Verilog.
Using a dummy wire is always safe and is not a major readability
issue as this is a rare corner case.

(It is not trivial to shorten the RHS in this case, because during
expansion of an ArrayProxy, match_shape() could be called in
a context far from the RHS handling logic.)
---

diff --git a/nmigen/back/rtlil.py b/nmigen/back/rtlil.py
index 6ef0d86..ac2b99f 100644
--- a/nmigen/back/rtlil.py
+++ b/nmigen/back/rtlil.py
@@ -578,9 +578,9 @@ class _LHSValueCompiler(_ValueCompiler):
         elif new_bits < value_bits:
             return self(ast.Slice(value, 0, new_bits))
         else: # new_bits > value_bits
-            # It is legal to assign to constants on LHS in RTLIL; such assignments are ignored.
             dummy_bits = new_bits - value_bits
-            return "{{ {}'{} {} }}".format(dummy_bits, "x" * dummy_bits, self(value))
+            dummy_wire = self.s.rtlil.wire(dummy_bits)
+            return "{{ {} {} }}".format(dummy_wire, self(value))
 
     def on_Signal(self, value):
         if value not in self.s.driven: