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

hdl.dsl: check for unique domain name.

Browse source 
Fixes #385.
This commit is contained in:
whitequark 2020-05-19 23:40:49 +00:00
parent fbf9e1f339
commit 404b2e07e4
2 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
nmigen/hdl/dsl.py
View file

@ -174,9 +174,9 @@ class Module(_ModuleBuilderRoot, Elaboratable):
self._ctrl_stack = [] self._ctrl_stack = []
self._driving = SignalDict() self._driving = SignalDict()
self._named_submodules = {} self._named_submodules = {}
self._anon_submodules = [] self._anon_submodules = []
self._domains = [] self._domains = {}
self._generated = {} self._generated = {}
def _check_context(self, construct, context): def _check_context(self, construct, context):
@ -523,7 +523,9 @@ class Module(_ModuleBuilderRoot, Elaboratable):
raise AttributeError("No submodule named '{}' exists".format(name)) raise AttributeError("No submodule named '{}' exists".format(name))
def _add_domain(self, cd): def _add_domain(self, cd):
self._domains.append(cd) if cd.name in self._domains:
raise NameError("Clock domain named '{}' already exists".format(cd.name))
self._domains[cd.name] = cd
def _flush(self): def _flush(self):
while self._ctrl_stack: while self._ctrl_stack:
@ -541,6 +543,6 @@ class Module(_ModuleBuilderRoot, Elaboratable):
fragment.add_statements(statements) fragment.add_statements(statements)
for signal, domain in self._driving.items(): for signal, domain in self._driving.items():
fragment.add_driver(signal, domain) fragment.add_driver(signal, domain)
fragment.add_domains(self._domains) fragment.add_domains(self._domains.values())
fragment.generated.update(self._generated) fragment.generated.update(self._generated)
return fragment return fragment

9
nmigen/test/test_hdl_dsl.py
View file

@ -712,7 +712,7 @@ class DSLTestCase(FHDLTestCase):
m = Module() m = Module()
m.domains.foo = ClockDomain() m.domains.foo = ClockDomain()
self.assertEqual(len(m._domains), 1) self.assertEqual(len(m._domains), 1)
self.assertEqual(m._domains[0].name, "foo") self.assertEqual(m._domains["foo"].name, "foo")
def test_domain_add_wrong(self): def test_domain_add_wrong(self):
m = Module() m = Module()
@ -729,6 +729,13 @@ class DSLTestCase(FHDLTestCase):
msg="Clock domain name 'bar' must match name in `m.domains.foo += ...` syntax"): msg="Clock domain name 'bar' must match name in `m.domains.foo += ...` syntax"):
m.domains.foo = ClockDomain("bar") m.domains.foo = ClockDomain("bar")
def test_domain_add_wrong_duplicate(self):
m = Module()
m.domains += ClockDomain("foo")
with self.assertRaises(NameError,
msg="Clock domain named 'foo' already exists"):
m.domains += ClockDomain("foo")
def test_lower(self): def test_lower(self):
m1 = Module() m1 = Module()
m1.d.comb += self.c1.eq(self.s1) m1.d.comb += self.c1.eq(self.s1)