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

hdl.ir: raise DomainError if a domain is used but not defined.

Browse source 
Before this commit, a KeyError would be raised elsewhere in guts of
hdl.ir, which is not helpful.
This commit is contained in:
whitequark 2019-08-03 15:31:00 +00:00
parent fdb0c5a6bc
commit fc846532c7
2 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
nmigen/hdl/ir.py
View file

@ -351,19 +351,24 @@ class Fragment:
subfrag._propagate_domains_down()
def _propagate_domains(self, missing_domain):
def _create_missing_domains(self, missing_domain):
from .xfrm import DomainCollector
self._propagate_domains_up()
new_domains = []
for domain_name in DomainCollector()(self):
if domain_name is None:
continue
if domain_name not in self.domains:
domain = missing_domain(domain_name)
if domain is not None:
self.add_domains(domain)
new_domains.append(domain)
if domain is None:
raise DomainError("Domain '{}' is used but not defined".format(domain_name))
self.add_domains(domain)
new_domains.append(domain)
return new_domains
def _propagate_domains(self, missing_domain):
self._propagate_domains_up()
new_domains = self._create_missing_domains(missing_domain)
self._propagate_domains_down()
return new_domains

9
nmigen/test/test_hdl_ir.py
View file

@ -380,6 +380,15 @@ class FragmentDomainsTestCase(FHDLTestCase):
self.assertEqual(f1.domains, {"cd": cd})
self.assertEqual(f2.domains, {"cd": cd})
def test_propagate_missing(self):
s1 = Signal()
f1 = Fragment()
f1.add_driver(s1, "sync")
with self.assertRaises(DomainError,
msg="Domain 'sync' is used but not defined"):
f1._propagate_domains(missing_domain=lambda name: None)
def test_propagate_create_missing(self):
s1 = Signal()
f1 = Fragment()