From e27c162b013ca4723bd61a22250ba01cd3637aca Mon Sep 17 00:00:00 2001 From: whitequark Date: Mon, 23 Sep 2019 13:39:31 +0000 Subject: [PATCH] hdl.ast: cast Mux() selector to bool if it is not a 1-bit value. Fixes #232. --- nmigen/hdl/ast.py | 2 ++ nmigen/test/test_hdl_ast.py | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/nmigen/hdl/ast.py b/nmigen/hdl/ast.py index d7ae092..2dee3ff 100644 --- a/nmigen/hdl/ast.py +++ b/nmigen/hdl/ast.py @@ -523,6 +523,8 @@ def Mux(sel, val1, val0): Value, out Output ``Value``. If ``sel`` is asserted, the Mux returns ``val1``, else ``val0``. """ + if len(sel) != 1: + sel = Value.wrap(sel).bool() return Operator("m", [sel, val1, val0]) diff --git a/nmigen/test/test_hdl_ast.py b/nmigen/test/test_hdl_ast.py index 1029c82..143de35 100644 --- a/nmigen/test/test_hdl_ast.py +++ b/nmigen/test/test_hdl_ast.py @@ -276,6 +276,11 @@ class OperatorTestCase(FHDLTestCase): v4 = Mux(s, Const(0, (4, False)), Const(0, (4, True))) self.assertEqual(v4.shape(), (5, True)) + def test_mux_wide(self): + s = Const(0b100) + v = Mux(s, Const(0, (4, False)), Const(0, (6, False))) + self.assertEqual(repr(v), "(m (b (const 3'd4)) (const 4'd0) (const 6'd0))") + def test_bool(self): v = Const(0).bool() self.assertEqual(repr(v), "(b (const 1'd0))") -- 2.30.2