X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fieee754%2Fadd%2Finputgroup.py;h=6069817e93bcca6af8cce182a2ac9ef3a98c62e2;hb=1464aba03659adec485de985b4b3ebcfc02ba487;hp=e1b775d42b8c259a7c130d8a9a68e743382b4ffd;hpb=58e455d3bd9b43d076468bf2b7b1f0784e5c4fd2;p=ieee754fpu.git diff --git a/src/ieee754/add/inputgroup.py b/src/ieee754/add/inputgroup.py index e1b775d4..6069817e 100644 --- a/src/ieee754/add/inputgroup.py +++ b/src/ieee754/add/inputgroup.py @@ -2,7 +2,7 @@ from nmigen import Module, Signal, Cat, Array, Const from nmigen.lib.coding import PriorityEncoder from math import log -from fpbase import Trigger +from ieee754.fpcommon.fpbase import Trigger class FPGetSyncOpsMod: @@ -63,7 +63,7 @@ class InputGroup: self.num_rows = num_rows self.mmax = int(log(self.num_rows) / log(2)) self.rs = [] - self.mid = Signal(self.mmax, reset_less=True) # multiplex id + self.muxid = Signal(self.mmax, reset_less=True) # multiplex id for i in range(num_rows): self.rs.append(FPGetSyncOpsMod(width, num_ops)) self.rs = Array(self.rs) @@ -92,7 +92,7 @@ class InputGroup: # encoder active: ack relevant input, record MID, pass output with m.If(out_en): rs = self.rs[pe.o] - m.d.sync += self.mid.eq(pe.o) + m.d.sync += self.muxid.eq(pe.o) m.d.sync += rs.ack.eq(0) m.d.sync += self.out_op.stb.eq(0) for j in range(self.num_ops): @@ -110,6 +110,6 @@ class InputGroup: for i in range(self.num_rows): inop = self.rs[i] res += inop.in_op + [inop.stb] - return self.out_op.ports() + res + [self.mid] + return self.out_op.ports() + res + [self.muxid]