connect corrections to pack without global z

diff --git a/src/add/nmigen_add_experiment.py b/src/add/nmigen_add_experiment.py
index f87ee7a91f2fb2b98294a9a7e6e53de6a82d4f0f..825005ff2116da5b7cb111943f93d2cd357f4376 100644 (file)
--- a/src/add/nmigen_add_experiment.py
+++ b/src/add/nmigen_add_experiment.py
@@ -813,18 +813,18 @@ class FPADD:
 
         cor = self.add_state(FPCorrections(self.width))
         cor.set_inputs({"z": rnz})  # XXX Z as output
-        cor.set_outputs({"z": rnz})  # XXX Z as output
+        #cor.set_outputs({"z": rnz})  # XXX Z as output
         cor.mod.setup(m, rnz, cor.out_z)
         m.submodules.corrections = cor.mod
 
         pa = self.add_state(FPPack(self.width))
-        pa.set_inputs({"z": rnz})  # XXX Z as output
-        pa.set_outputs({"z": rnz})  # XXX Z as output
-        pa.mod.setup(m, rnz, pa.out_z)
+        pa.set_inputs({"z": cor.out_z})  # XXX Z as output
+        pa.set_outputs({"z": cor.out_z})  # XXX Z as output
+        pa.mod.setup(m, cor.out_z, pa.out_z)
         m.submodules.pack = pa.mod
 
         pz = self.add_state(FPPutZ("pack_put_z"))
-        pz.set_inputs({"z": rnz})
+        pz.set_inputs({"z": cor.out_z})
         pz.set_outputs({"out_z": self.out_z})
 
         pz = self.add_state(FPPutZ("put_z"))