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

hdl.ast: cast Mux() selector to bool if it is not a 1-bit value.

Browse source 
Fixes #232.
This commit is contained in:
whitequark 2019-09-23 13:39:31 +00:00
parent 7777b7b98c
commit b227352258
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nmigen/hdl/ast.py
View file

@ -523,6 +523,8 @@ 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``.
""" """
if len(sel) != 1:
sel = Value.wrap(sel).bool()
return Operator("m", [sel, val1, val0]) return Operator("m", [sel, val1, val0])

5
nmigen/test/test_hdl_ast.py
View file

@ -276,6 +276,11 @@ class OperatorTestCase(FHDLTestCase):
v4 = Mux(s, Const(0, (4, False)), Const(0, (4, True))) v4 = Mux(s, Const(0, (4, False)), Const(0, (4, True)))
self.assertEqual(v4.shape(), (5, 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): 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))")