From: whitequark <whitequark@whitequark.org>
Date: Sun, 23 Dec 2018 06:47:38 +0000 (+0000)
Subject: back.rtlil: fix swapped operands in mux codegen.
X-Git-Tag: working~137
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2b6ddbb7139c98d05c7e8e49ab6c8ac2fccfbfbf;p=nmigen.git

back.rtlil: fix swapped operands in mux codegen.
---

diff --git a/nmigen/back/rtlil.py b/nmigen/back/rtlil.py
index 04260ad..2c2f1ad 100644
--- a/nmigen/back/rtlil.py
+++ b/nmigen/back/rtlil.py
@@ -429,17 +429,17 @@ class _RHSValueCompiler(_ValueCompiler):
         return res
 
     def on_Operator_mux(self, value):
-        sel, lhs, rhs = value.operands
-        lhs_bits, lhs_sign = lhs.shape()
-        rhs_bits, rhs_sign = rhs.shape()
+        sel, val1, val0 = value.operands
+        val1_bits, val1_sign = val1.shape()
+        val0_bits, val0_sign = val0.shape()
         res_bits, res_sign = value.shape()
-        lhs_bits = rhs_bits = res_bits = max(lhs_bits, rhs_bits, res_bits)
-        lhs_wire = self.match_shape(lhs, lhs_bits, lhs_sign)
-        rhs_wire = self.match_shape(rhs, rhs_bits, rhs_sign)
+        val1_bits = val0_bits = res_bits = max(val1_bits, val0_bits, res_bits)
+        val1_wire = self.match_shape(val1, val1_bits, val1_sign)
+        val0_wire = self.match_shape(val0, val0_bits, val0_sign)
         res = self.s.rtlil.wire(width=res_bits)
         self.s.rtlil.cell("$mux", ports={
-            "\\A": lhs_wire,
-            "\\B": rhs_wire,
+            "\\A": val0_wire,
+            "\\B": val1_wire,
             "\\S": self(sel),
             "\\Y": res,
         }, params={