usb-tools/amaranth
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

hdl.ast: don't crash on Mux(<bool>, ...).

Browse source 
Fixes #240.
This commit is contained in:
whitequark 2019-10-02 08:24:37 +00:00
parent d139f340b3
commit 9458de2079
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
nmigen/hdl/ast.py
View file

@ -526,8 +526,9 @@ def Mux(sel, val1, val0):
Value, out Value, out
Output ``Value``. If ``sel`` is asserted, the Mux returns ``val1``, else ``val0``. Output ``Value``. If ``sel`` is asserted, the Mux returns ``val1``, else ``val0``.
""" """
sel = Value.wrap(sel)
if len(sel) != 1: if len(sel) != 1:
sel = Value.wrap(sel).bool() sel = sel.bool()
return Operator("m", [sel, val1, val0]) return Operator("m", [sel, val1, val0])

4
nmigen/test/test_hdl_ast.py
View file

@ -292,6 +292,10 @@ class OperatorTestCase(FHDLTestCase):
v = Mux(s, Const(0, (4, False)), Const(0, (6, False))) 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))") self.assertEqual(repr(v), "(m (b (const 3'd4)) (const 4'd0) (const 6'd0))")
def test_mux_bool(self):
v = Mux(True, Const(0), Const(0))
self.assertEqual(repr(v), "(m (const 1'd1) (const 1'd0) (const 1'd0))")
def test_bool(self): def test_bool(self):
v = Const(0).bool() v = Const(0).bool()
self.assertEqual(repr(v), "(b (const 1'd0))") self.assertEqual(repr(v), "(b (const 1'd0))")