Skip to content

Commit

Permalink
back.rtlil: fix expansion of Part() for partial dummy writes.
Browse files Browse the repository at this point in the history
Before this commit, selecting a part that was fully out of bounds of
a value was correctly implemented as a write to a dummy wire, but
selecting a part that was only partially out of bounds resulted in
a crash.

Fixes #351.
  • Loading branch information
whitequark committed Apr 13, 2020
1 parent edd2bb2 commit 814ffde
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions nmigen/back/rtlil.py
Expand Up @@ -632,12 +632,14 @@ def _prepare_value_for_Slice(self, value):
def on_Part(self, value):
offset = self.s.expand(value.offset)
if isinstance(offset, ast.Const):
if offset.value == len(value.value):
dummy_wire = self.s.rtlil.wire(value.width)
return dummy_wire
return self(ast.Slice(value.value,
offset.value * value.stride,
offset.value * value.stride + value.width))
start = offset.value * value.stride
stop = start + value.width
slice = self(ast.Slice(value.value, start, min(len(value.value), stop)))
if len(value.value) >= stop:
return slice
else:
dummy_wire = self.s.rtlil.wire(stop - len(value.value))
return "{{ {} {} }}".format(dummy_wire, slice)
else:
# Only so many possible parts. The amount of branches is exponential; if value.offset
# is large (e.g. 32-bit wide), trying to naively legalize it is likely to exhaust
Expand Down

0 comments on commit 814ffde

Please sign in to comment.