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

back.rtlil: add decodings to cases when switching on a signal.

Browse source 
Fixes #134.
This commit is contained in:
whitequark 2019-07-09 19:45:15 +00:00
parent 10e56c75fb
commit 37f363e338
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
nmigen/back/rtlil.py
View file

@ -603,10 +603,10 @@ class _StatementCompiler(xfrm.StatementVisitor):
self._has_rhs = False self._has_rhs = False
@contextmanager @contextmanager
def case(self, switch, values, src=""): def case(self, switch, values, attrs={}, src=""):
try: try:
old_case = self._case old_case = self._case
with switch.case(*values, src=src) as self._case: with switch.case(*values, attrs=attrs, src=src) as self._case:
yield yield
finally: finally:
self._case = old_case self._case = old_case
@ -659,11 +659,18 @@ class _StatementCompiler(xfrm.StatementVisitor):
with self._case.switch(test_sigspec, src=src(stmt.src_loc)) as switch: with self._case.switch(test_sigspec, src=src(stmt.src_loc)) as switch:
for values, stmts in stmt.cases.items(): for values, stmts in stmt.cases.items():
case_attrs = {}
if values in stmt.case_src_locs: if values in stmt.case_src_locs:
case_src = src(stmt.case_src_locs[values]) case_attrs["src"] = src(stmt.case_src_locs[values])
if isinstance(stmt.test, ast.Signal) and stmt.test.decoder:
decoded_values = []
for value in values:
if "-" in value:
decoded_values.append("<multiple>")
else: else:
case_src = "" decoded_values.append(stmt.test.decoder(int(value, 2)))
with self.case(switch, values, src=case_src): case_attrs["nmigen.decoding"] = "|".join(decoded_values)
with self.case(switch, values, attrs=case_attrs):
self.on_statements(stmts) self.on_statements(stmts)
def on_statement(self, stmt): def on_statement(self, stmt):