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

lib.coding: fix tests to actually run, and fix code to fix tests.

Browse source
This commit is contained in:
whitequark 2018-12-27 21:45:55 +00:00
parent 470d66934f
commit 3ea35b8566
2 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
nmigen/lib/coding.py
View file

@ -69,7 +69,7 @@ class PriorityEncoder:
m = Module()
for j, b in enumerate(reversed(self.i)):
with m.If(b):
m.d.comb += self.o.eq(j)
m.d.comb += self.o.eq(len(self.i) - j - 1)
m.d.comb += self.n.eq(self.i == 0)
return m.lower(platform)
@ -105,9 +105,8 @@ class Decoder:
for j in range(len(self.o)):
with m.Case(j):
m.d.comb += self.o.eq(1 << j)
with m.Case():
with m.If(self.n):
m.d.comb += self.o.eq(0)
with m.If(self.n):
m.d.comb += self.o.eq(0)
return m.lower(platform)