reduce setup args to FPCorrections

diff --git a/src/add/nmigen_add_experiment.py b/src/add/nmigen_add_experiment.py
index f89f4d630e532f3ea7a5f0aaeed28a6524213f26..4addd9c1db3f069fb397d37598bb687360d5d6e2 100644 (file)
--- a/src/add/nmigen_add_experiment.py
+++ b/src/add/nmigen_add_experiment.py
@@ -1268,8 +1268,8 @@ class FPNormToPack(FPState, FPID):
 
         # Rounding (chained to normalisation)
         rmod = FPRoundMod(self.width, self.id_wid)
+        rmod.setup(m, n_out)
         r_out_z = rmod.ospec()
-        rmod.setup(m, n_out.z, n_out.roundz)
         m.d.comb += r_out_z.eq(rmod.out_z)
 
         # Corrections (chained to rounding)
@@ -1317,11 +1317,9 @@ class FPRoundMod:
     def ospec(self):
         return FPRoundData(self.width, self.id_wid)
 
-    def setup(self, m, in_z, roundz):
+    def setup(self, m, i):
         m.submodules.roundz = self
-
-        m.d.comb += self.i.z.eq(in_z)
-        m.d.comb += self.i.roundz.eq(roundz)
+        m.d.comb += self.i.eq(i)
 
     def elaborate(self, platform):
         m = Module()