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

back.rtlil: only emit each AnyConst/AnySeq cell once.

Browse source 
These are semantically like signals, not like constants.
This commit is contained in:
whitequark 2019-01-18 01:27:17 +00:00
parent 60089db075
commit 66466a8a0e
2 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
nmigen/hdl/ast.py
View file

@ -255,7 +255,7 @@ class Const(Value):
C = Const # shorthand
class AnyValue(Value):
class AnyValue(Value, DUID):
def __init__(self, shape):
super().__init__(src_loc_at=0)
if isinstance(shape, int):
@ -1119,7 +1119,7 @@ class ValueKey:
def __hash__(self):
if isinstance(self.value, Const):
return hash(self.value.value)
elif isinstance(self.value, Signal):
elif isinstance(self.value, (Signal, AnyValue)):
return hash(self.value.duid)
elif isinstance(self.value, (ClockSignal, ResetSignal)):
return hash(self.value.domain)
@ -1149,7 +1149,7 @@ class ValueKey:
if isinstance(self.value, Const):
return self.value.value == other.value.value
elif isinstance(self.value, Signal):
elif isinstance(self.value, (Signal, AnyValue)):
return self.value is other.value
elif isinstance(self.value, (ClockSignal, ResetSignal)):
return self.value.domain == other.value.domain
@ -1191,7 +1191,7 @@ class ValueKey:
if isinstance(self.value, Const):
return self.value < other.value
elif isinstance(self.value, Signal):
elif isinstance(self.value, (Signal, AnyValue)):
return self.value.duid < other.value.duid
elif isinstance(self.value, Slice):
return (ValueKey(self.value.value) < ValueKey(other.value.value) and