use Mux in fp corrections

[ieee754fpu.git] / src / ieee754 / fpcommon / corrections.py

diff --git a/src/ieee754/fpcommon/corrections.py b/src/ieee754/fpcommon/corrections.py
index 500792265936af1dfab7bb390f173077fbbaf06e..54e8bd2d6a9632f12f82d513611f712e4df2be11 100644 (file)
--- a/src/ieee754/fpcommon/corrections.py
+++ b/src/ieee754/fpcommon/corrections.py
@@ -2,68 +2,32 @@
 # Copyright (C) Jonathan P Dawson 2013
 # 2013-12-12
 
-from nmigen import Module, Elaboratable
+from nmigen import Module, Mux
 from nmigen.cli import main, verilog
-from ieee754.fpcommon.fpbase import FPState, FPNumBase
-from .roundz import FPRoundData
 
+from nmutil.pipemodbase import PipeModBase
+from ieee754.fpcommon.fpbase import FPNumBase
+from ieee754.fpcommon.roundz import FPRoundData
 
-class FPCorrectionsMod(Elaboratable):
 
-    def __init__(self, width, pspec):
-        self.width = width
-        self.pspec = pspec
-        self.i = self.ispec()
-        self.out_z = self.ospec()
+class FPCorrectionsMod(PipeModBase):
+
+    def __init__(self, pspec):
+        super().__init__(pspec, "corrections")
 
     def ispec(self):
-        return FPRoundData(self.width, self.pspec)
+        return FPRoundData(self.pspec)
 
     def ospec(self):
-        return FPRoundData(self.width, self.pspec)
-
-    def process(self, i):
-        return self.out_z
-
-    def setup(self, m, i):
-        """ links module to inputs and outputs
-        """
-        m.submodules.corrections = self
-        m.d.comb += self.i.eq(i)
+        return FPRoundData(self.pspec)
 
     def elaborate(self, platform):
         m = Module()
+        comb = m.d.comb
         m.submodules.corr_in_z = in_z = FPNumBase(self.i.z)
-        #m.submodules.corr_out_z = self.out_z.z
-        m.d.comb += self.out_z.eq(self.i) # copies mid, z, out_do_z
-        with m.If(~self.i.out_do_z):
-            with m.If(in_z.is_denormalised):
-                m.d.comb += self.out_z.z.e.eq(self.i.z.N127)
+        comb += self.o.eq(self.i) # copies mid, z, out_do_z
+        comb += self.o.z.e.eq(Mux(in_z.is_denormalised,
+                                  self.i.z.N127, self.i.z.e))
         return m
 
 
-class FPCorrections(FPState):
-
-    def __init__(self, width, id_wid):
-        FPState.__init__(self, "corrections")
-        self.mod = FPCorrectionsMod(width)
-        self.out_z = self.ospec()
-
-    def ispec(self):
-        return self.mod.ispec()
-
-    def ospec(self):
-        return self.mod.ospec()
-
-    def setup(self, m, in_z):
-        """ links module to inputs and outputs
-        """
-        self.mod.setup(m, in_z)
-
-        m.d.sync += self.out_z.eq(self.mod.out_z)
-        m.d.sync += self.out_z.ctx.eq(self.mod.o.ctx)
-
-    def action(self, m):
-        m.next = "pack"
-
-