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

compat: do not finalize native submodules twice.

Browse source
This commit is contained in:
whitequark 2018-12-22 00:02:31 +00:00
parent a4183eba69
commit 0df543b204
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
nmigen/compat/fhdl/module.py
View file

@ -122,9 +122,6 @@ class CompatModule:
elif name == "_submodules": elif name == "_submodules":
self._submodules = [] self._submodules = []
return self._submodules return self._submodules
elif name == "_specials":
self._specials = []
return self._specials
elif name == "_clock_domains": elif name == "_clock_domains":
self._clock_domains = [] self._clock_domains = []
return self._clock_domains return self._clock_domains
@ -135,22 +132,22 @@ class CompatModule:
raise AttributeError("'{}' object has no attribute '{}'" raise AttributeError("'{}' object has no attribute '{}'"
.format(type(self).__name__, name)) .format(type(self).__name__, name))
def _finalize_submodules(self): def _finalize_submodules(self, finalize_native):
for name, submodule in self._submodules: for name, submodule in self._submodules:
if hasattr(submodule, "get_fragment_called"): if hasattr(submodule, "get_fragment_called"):
# Compat submodule # Compat submodule
if not submodule.get_fragment_called: if not submodule.get_fragment_called:
self._module._add_submodule(submodule.get_fragment(), name) self._module._add_submodule(submodule.get_fragment(), name)
else: elif finalize_native:
# Native submodule # Native submodule
self._module._add_submodule(submodule, name) self._module._add_submodule(submodule, name)
def finalize(self, *args, **kwargs): def finalize(self, *args, **kwargs):
if not self.finalized: if not self.finalized:
self.finalized = True self.finalized = True
self._finalize_submodules() self._finalize_submodules(finalize_native=False)
self.do_finalize(*args, **kwargs) self.do_finalize(*args, **kwargs)
self._finalize_submodules() self._finalize_submodules(finalize_native=True)
def do_finalize(self): def do_finalize(self):
pass pass