mirror of
https://github.com/myhdl/myhdl.git
synced 2025-01-24 21:52:56 +08:00
Signal attr ref names(after replacing . with _) can conflict with memory names
and vice versa. --HG-- branch : 0.9-dev
This commit is contained in:
parent
962dd8afcc
commit
4f01bf32d4
@ -96,6 +96,7 @@ def _analyzeSigs(hierarchy, hdl='Verilog'):
|
||||
name = inst.name
|
||||
sigdict = inst.sigdict
|
||||
memdict = inst.memdict
|
||||
namedict = dict(sigdict.items() + memdict.items())
|
||||
delta = curlevel - level
|
||||
curlevel = level
|
||||
assert(delta >= -1)
|
||||
@ -111,7 +112,7 @@ def _analyzeSigs(hierarchy, hdl='Verilog'):
|
||||
continue
|
||||
if isinstance(s, _SliceSignal):
|
||||
continue
|
||||
s._name = _makeName(n, prefixes, sigdict)
|
||||
s._name = _makeName(n, prefixes, namedict)
|
||||
if not s._nrbits:
|
||||
raise ConversionError(_error.UndefinedBitWidth, s._name)
|
||||
# slice signals
|
||||
@ -122,7 +123,7 @@ def _analyzeSigs(hierarchy, hdl='Verilog'):
|
||||
for n, m in memdict.items():
|
||||
if m.name is not None:
|
||||
continue
|
||||
m.name = _makeName(n, prefixes, memdict)
|
||||
m.name = _makeName(n, prefixes, namedict)
|
||||
memlist.append(m)
|
||||
|
||||
# handle the case where a named signal appears in a list also by giving
|
||||
|
Loading…
x
Reference in New Issue
Block a user