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

hdl.dsl: cases wider than switch test value are unreachable.

Browse source 
In 3083c1d6 they were erroneously fixed via truncation.
This commit is contained in:
whitequark 2019-01-13 08:51:49 +00:00
parent 3083c1d6dd
commit 664b4bcb3a
3 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
nmigen/hdl/dsl.py
View file

@ -219,17 +219,19 @@ class Module(_ModuleBuilderRoot):
if isinstance(value, str) and len(value) != len(switch_data["test"]): if isinstance(value, str) and len(value) != len(switch_data["test"]):
raise SyntaxError("Case value '{}' must have the same width as test (which is {})" raise SyntaxError("Case value '{}' must have the same width as test (which is {})"
.format(value, len(switch_data["test"]))) .format(value, len(switch_data["test"])))
omit_case = False
if isinstance(value, int) and bits_for(value) > len(switch_data["test"]): if isinstance(value, int) and bits_for(value) > len(switch_data["test"]):
warnings.warn("Case value '{:b}' is wider than test (which has width {}); " warnings.warn("Case value '{:b}' is wider than test (which has width {}); "
"comparison will be made against truncated value" "comparison will never be true"
.format(value, len(switch_data["test"])), SyntaxWarning, stacklevel=3) .format(value, len(switch_data["test"])), SyntaxWarning, stacklevel=3)
value &= (1 << len(switch_data["test"])) - 1 omit_case = True
try: try:
_outer_case, self._statements = self._statements, [] _outer_case, self._statements = self._statements, []
self._ctrl_context = None self._ctrl_context = None
yield yield
self._flush_ctrl() self._flush_ctrl()
switch_data["cases"][value] = self._statements if not omit_case:
switch_data["cases"][value] = self._statements
finally: finally:
self._ctrl_context = "Switch" self._ctrl_context = "Switch"
self._statements = _outer_case self._statements = _outer_case

6
nmigen/test/test_hdl_dsl.py
View file

@ -289,14 +289,12 @@ class DSLTestCase(FHDLTestCase):
pass pass
with self.assertWarns(SyntaxWarning, with self.assertWarns(SyntaxWarning,
msg="Case value '10110' is wider than test (which has width 4); comparison " msg="Case value '10110' is wider than test (which has width 4); comparison "
"will be made against truncated value"): "will never be true"):
with m.Case(0b10110): with m.Case(0b10110):
pass pass
self.assertRepr(m._statements, """ self.assertRepr(m._statements, """
( (
(switch (sig w1) (switch (sig w1) )
(case 0110 )
)
) )
""") """)

10
nmigen/test/tools.py
View file

@ -12,10 +12,12 @@ __all__ = ["FHDLTestCase"]
class FHDLTestCase(unittest.TestCase): class FHDLTestCase(unittest.TestCase):
def assertRepr(self, obj, repr_str): def assertRepr(self, obj, repr_str):
obj = Statement.wrap(obj) obj = Statement.wrap(obj)
repr_str = re.sub(r"\s+", " ", repr_str) def prepare_repr(repr_str):
repr_str = re.sub(r"\( (?=\()", "(", repr_str) repr_str = re.sub(r"\s+", " ", repr_str)
repr_str = re.sub(r"\) (?=\))", ")", repr_str) repr_str = re.sub(r"\( (?=\()", "(", repr_str)
self.assertEqual(repr(obj), repr_str.strip()) repr_str = re.sub(r"\) (?=\))", ")", repr_str)
return repr_str.strip()
self.assertEqual(prepare_repr(repr(obj)), prepare_repr(repr_str))
@contextmanager @contextmanager
def assertRaises(self, exception, msg=None): def assertRaises(self, exception, msg=None):