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

sim._pyrtl: fix masking for bitwise operands and muxes.

Browse source 
Fixes #926.
This commit is contained in:
Wanda 2023-10-05 13:53:56 +02:00 committed by Catherine
parent cce4e4462e
commit ccf7aaf00d
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
amaranth/sim/_pyrtl.py
View file

@ -170,11 +170,11 @@ class _RHSValueCompiler(_ValueCompiler):
if value.operator == "%":
return f"zmod({sign(lhs)}, {sign(rhs)})"
if value.operator == "&":
return f"({mask(lhs)} & {mask(rhs)})"
return f"({sign(lhs)} & {sign(rhs)})"
if value.operator == "|":
return f"({mask(lhs)} | {mask(rhs)})"
return f"({sign(lhs)} | {sign(rhs)})"
if value.operator == "^":
return f"({mask(lhs)} ^ {mask(rhs)})"
return f"({sign(lhs)} ^ {sign(rhs)})"
if value.operator == "<<":
return f"({sign(lhs)} << {sign(rhs)})"
if value.operator == ">>":
@ -194,7 +194,7 @@ class _RHSValueCompiler(_ValueCompiler):
elif len(value.operands) == 3:
if value.operator == "m":
sel, val1, val0 = value.operands
return f"({self(val1)} if {mask(sel)} else {self(val0)})"
return f"({sign(val1)} if {mask(sel)} else {sign(val0)})"
raise NotImplementedError("Operator '{}' not implemented".format(value.operator)) # :nocov:
def on_Slice(self, value):

6
tests/test_sim.py
View file

@ -152,6 +152,9 @@ class SimulatorUnitTestCase(FHDLTestCase):
def test_and(self):
stmt = lambda y, a, b: y.eq(a & b)
self.assertStatement(stmt, [C(0b1100, 4), C(0b1010, 4)], C(0b1000, 4))
self.assertStatement(stmt, [C(0b1010, 4), C(0b10, signed(2))], C(0b1010, 4))
stmt = lambda y, a: y.eq(a)
self.assertStatement(stmt, [C(0b1010, 4) & C(-2, 2).as_unsigned()], C(0b0010, 4))
def test_or(self):
stmt = lambda y, a, b: y.eq(a | b)
@ -211,6 +214,9 @@ class SimulatorUnitTestCase(FHDLTestCase):
stmt = lambda y, a, b, c: y.eq(Mux(c, a, b))
self.assertStatement(stmt, [C(2, 4), C(3, 4), C(0)], C(3, 4))
self.assertStatement(stmt, [C(2, 4), C(3, 4), C(1)], C(2, 4))
stmt = lambda y, a: y.eq(a)
self.assertStatement(stmt, [Mux(0, C(0b1010, 4), C(0b10, 2).as_signed())], C(0b1110, 4))
self.assertStatement(stmt, [Mux(0, C(0b1010, 4), C(-2, 2).as_unsigned())], C(0b0010, 4))
def test_mux_invert(self):
stmt = lambda y, a, b, c: y.eq(Mux(~c, a, b))