back.rtlil: avoid illegal slices.

Not sure what to do with {} [] on LHS yet--fix Yosys?
This commit is contained in:
whitequark 2018-12-16 17:41:11 +00:00
parent e86104d3a6
commit 9bce35098f

View file

@ -272,14 +272,6 @@ class _ValueCompiler(xfrm.AbstractValueTransformer):
def on_ResetSignal(self, value):
raise NotImplementedError # :nocov:
def on_Slice(self, value):
if value.start == 0 and value.end == len(value.value):
return self(value.value)
elif value.start + 1 == value.end:
return "{} [{}]".format(self(value.value), value.start)
else:
return "{} [{}:{}]".format(self(value.value), value.end - 1, value.start)
def on_Cat(self, value):
return "{{ {} }}".format(" ".join(reversed([self(o) for o in value.operands])))
@ -410,6 +402,21 @@ class _RHSValueCompiler(_ValueCompiler):
else:
raise TypeError # :nocov:
def on_Slice(self, value):
if value.start == 0 and value.end == len(value.value):
return self(value.value)
if isinstance(value.value, ast.Signal):
sigspec = self(value.value)
else:
sigspec = self.s.rtlil.wire(len(value.value))
self.s.rtlil.connect(sigspec, self(value.value))
if value.start + 1 == value.end:
return "{} [{}]".format(sigspec, value.start)
else:
return "{} [{}:{}]".format(sigspec, value.end - 1, value.start)
def on_Part(self, value):
raise NotImplementedError
@ -433,6 +440,20 @@ class _LHSValueCompiler(_ValueCompiler):
raise ValueError("Cannot return lhs for non-driven signal {}".format(repr(value)))
return wire_next
def on_Slice(self, value):
if value.start == 0 and value.end == len(value.value):
return self(value.value)
if isinstance(value.value, ast.Signal):
sigspec = self(value.value)
else:
raise NotImplementedError
if value.start + 1 == value.end:
return "{} [{}]".format(sigspec, value.start)
else:
return "{} [{}:{}]".format(sigspec, value.end - 1, value.start)
def on_Part(self, value):
raise NotImplementedError