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

lib.data: allow Const as value of Layout.const(...) field.

Browse source 
Fixes #838.
This commit is contained in:
Catherine 2023-07-18 14:20:05 +00:00
parent 385b10d743
commit d1ca9c46a5
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
amaranth/lib/data.py
View file

@ -238,7 +238,7 @@ class Layout(ShapeCastable, metaclass=ABCMeta):
"it casts to, {!r}, and not {!r}" "it casts to, {!r}, and not {!r}"
.format(field.shape, cast_field_shape, .format(field.shape, cast_field_shape,
key_value.shape())) key_value.shape()))
else: elif not isinstance(key_value, Const):
key_value = Const(key_value, cast_field_shape) key_value = Const(key_value, cast_field_shape)
int_value &= ~(((1 << cast_field_shape.width) - 1) << field.offset) int_value &= ~(((1 << cast_field_shape.width) - 1) << field.offset)
int_value |= key_value.value << field.offset int_value |= key_value.value << field.offset

4
tests/test_lib_data.py
View file

@ -424,6 +424,10 @@ class LayoutTestCase(FHDLTestCase):
r"that it casts to, unsigned\(8\), and not unsigned\(1\)$"): r"that it casts to, unsigned\(8\), and not unsigned\(1\)$"):
sl.const({"f": "01"}) sl.const({"f": "01"})
def test_const_field_const(self):
sl = StructLayout({"f": unsigned(1)})
self.assertRepr(sl.const({"f": Const(1)}), "(const 1'd1)")
def test_signal_reset(self): def test_signal_reset(self):
sl = StructLayout({ sl = StructLayout({
"a": unsigned(1), "a": unsigned(1),