Skip to content

hdl._dsl: fix using 0-width Switch with integer keys. #1135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions amaranth/hdl/_dsl.py
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,8 @@ def Case(self, *patterns):
"expression, not {!r}"
.format(pattern)) from e
pattern_len = bits_for(pattern.value)
if pattern.value == 0:
pattern_len = 0
if pattern_len > len(switch_data["test"]):
warnings.warn("Case pattern '{!r}' ({}'{:b}) is wider than switch value "
"(which has width {}); comparison will never be true"
Expand Down
15 changes: 15 additions & 0 deletions tests/test_hdl_dsl.py
Original file line number Diff line number Diff line change
Expand Up @@ -502,6 +502,21 @@ class Color(Enum):
m.d.comb += dummy.eq(0)
self.assertEqual(m._statements, {})

def test_Switch_zero_width(self):
m = Module()
s = Signal(0)
with m.Switch(s):
with m.Case(0):
m.d.comb += self.c1.eq(1)
m._flush()
self.assertRepr(m._statements["comb"], """
(
(switch (sig s)
(case (eq (sig c1) (const 1'd1)))
)
)
""")

def test_Case_bits_wrong(self):
m = Module()
with m.Switch(self.w1):
Expand Down