FPGA/myhdl
1
0
Fork 0
mirror of https://github.com/myhdl/myhdl.git synced 2025-01-24 21:52:56 +08:00
Code Issues Projects Releases Wiki Activity

Signal attr ref names(after replacing . with _) can conflict with memory names

Browse Source 
and vice versa.

--HG--
branch : 0.9-dev
This commit is contained in:
Keerthan Jaic 2013-09-29 18:55:50 -04:00
parent 962dd8afcc
commit 4f01bf32d4
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
myhdl/conversion/_analyze.py
View File

@ -96,6 +96,7 @@ def _analyzeSigs(hierarchy, hdl='Verilog'):
name = inst.name name = inst.name
sigdict = inst.sigdict sigdict = inst.sigdict
memdict = inst.memdict memdict = inst.memdict
namedict = dict(sigdict.items() + memdict.items())
delta = curlevel - level delta = curlevel - level
curlevel = level curlevel = level
assert(delta >= -1) assert(delta >= -1)
@ -111,7 +112,7 @@ def _analyzeSigs(hierarchy, hdl='Verilog'):
continue continue
if isinstance(s, _SliceSignal): if isinstance(s, _SliceSignal):
continue continue
s._name = _makeName(n, prefixes, sigdict) s._name = _makeName(n, prefixes, namedict)
if not s._nrbits: if not s._nrbits:
raise ConversionError(_error.UndefinedBitWidth, s._name) raise ConversionError(_error.UndefinedBitWidth, s._name)
# slice signals # slice signals
@ -122,7 +123,7 @@ def _analyzeSigs(hierarchy, hdl='Verilog'):
for n, m in memdict.items(): for n, m in memdict.items():
if m.name is not None: if m.name is not None:
continue continue
m.name = _makeName(n, prefixes, memdict) m.name = _makeName(n, prefixes, namedict)
memlist.append(m) memlist.append(m)
# handle the case where a named signal appears in a list also by giving # handle the case where a named signal appears in a list also by giving