back.pysim: give better names to unnamed fragments and their signals.

Was: top.#0, top.None_clk
Now: top.U0, top.U0_clk

(U for Unnamed, or similarly, an unit refdes.)
This commit is contained in:
whitequark 2019-01-26 18:07:16 +00:00
parent 7acea8f3ce
commit 8686e9aa06

View file

@ -454,7 +454,7 @@ class Simulator:
hierarchy[fragment] = scope
for index, (subfragment, name) in enumerate(fragment.subfragments):
if name is None:
add_fragment(subfragment, (*scope, "#{}".format(index)))
add_fragment(subfragment, (*scope, "U{}".format(index)))
else:
add_fragment(subfragment, (*scope, name))
add_fragment(root_fragment, scope=("top",))
@ -504,9 +504,9 @@ class Simulator:
signal_slot = self._signal_slots[signal]
for subfragment, name in fragment.subfragments:
for i, (subfragment, name) in enumerate(fragment.subfragments):
if signal in subfragment.ports:
var_name = "{}_{}".format(name, signal.name)
var_name = "{}_{}".format(name or "U{}".format(i), signal.name)
break
else:
var_name = signal.name