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

back.rtlil: match shape of Array elements to ArrayProxy shape.

Browse source 
Fixes #15.
This commit is contained in:
whitequark 2018-12-31 03:43:34 +00:00
parent cdc40eaa9b
commit ae3c5834ed
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
nmigen/back/rtlil.py
View file

@ -328,9 +328,10 @@ class _ValueCompiler(xfrm.ValueVisitor):
index = self.s.expand(value.index) index = self.s.expand(value.index)
if isinstance(index, ast.Const): if isinstance(index, ast.Const):
if index.value < len(value.elems): if index.value < len(value.elems):
return self(value.elems[index.value]) elem = value.elems[index.value]
else: else:
return self(value.elems[-1]) elem = value.elems[-1]
return self.match_shape(elem, *value.shape())
else: else:
raise LegalizeValue(value.index, range(len(value.elems))) raise LegalizeValue(value.index, range(len(value.elems)))
@ -503,6 +504,10 @@ class _LHSValueCompiler(_ValueCompiler):
def on_Operator(self, value): def on_Operator(self, value):
raise TypeError # :nocov: raise TypeError # :nocov:
def match_shape(self, value, new_bits, new_sign):
assert value.shape() == (new_bits, new_sign)
return self(value)
def on_Signal(self, value): def on_Signal(self, value):
wire_curr, wire_next = self.s.resolve(value) wire_curr, wire_next = self.s.resolve(value)
if wire_next is None: if wire_next is None: