switch to exact version of cython

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

diff --git a/src/ieee754/fpcommon/normtopack.py b/src/ieee754/fpcommon/normtopack.py
index b90d02321cfa1988fafe910a54ca0d4f03364656..003516c55dbf1859c472e9b9efab18273958fe8d 100644 (file)
--- a/src/ieee754/fpcommon/normtopack.py
+++ b/src/ieee754/fpcommon/normtopack.py
@@ -1,53 +1,29 @@
-# IEEE Floating Point Adder (Single Precision)
-# Copyright (C) Jonathan P Dawson 2013
-# 2013-12-12
+"""IEEE754 Floating Point Pipeline
 
-#from nmigen.cli import main, verilog
+Copyright (C) 2019 Luke Kenneth Casson Leighton <lkcl@lkcl.net>
 
-from nmutil.singlepipe import StageChain, SimpleHandshake
+"""
 
-from ieee754.fpcommon.fpbase import FPState, FPID
-from .postcalc import FPAddStage1Data
-from .postnormalise import FPNorm1ModSingle
-from .roundz import FPRoundMod
-from .corrections import FPCorrectionsMod
-from .pack import FPPackData, FPPackMod
+from nmutil.pipemodbase import PipeModBaseChain
+from ieee754.fpcommon.postnormalise import FPNorm1ModSingle
+from ieee754.fpcommon.roundz import FPRoundMod
+from ieee754.fpcommon.corrections import FPCorrectionsMod
+from ieee754.fpcommon.pack import FPPackMod
 
 
-class FPNormToPack(FPState, SimpleHandshake):
+class FPNormToPack(PipeModBaseChain):
 
     def __init__(self, pspec, e_extra=False):
-        FPState.__init__(self, "normalise_1")
-        #print ("normtopack", pspec)
-        self.pspec = pspec
         self.e_extra = e_extra
-        SimpleHandshake.__init__(self, self) # pipeline is its own stage
+        super().__init__(pspec)
 
-    def ispec(self):
-        return FPAddStage1Data(self.pspec, e_extra=self.e_extra)
-
-    def ospec(self):
-        return FPPackData(self.pspec) # FPPackMod
-
-    def setup(self, m, i):
-        """ links module to inputs and outputs
+    def get_chain(self):
+        """ gets chain of modules
         """
-
         # Normalisation, Rounding Corrections, Pack - in a chain
         nmod = FPNorm1ModSingle(self.pspec, e_extra=self.e_extra)
         rmod = FPRoundMod(self.pspec)
         cmod = FPCorrectionsMod(self.pspec)
         pmod = FPPackMod(self.pspec)
-        stages = [nmod, rmod, cmod, pmod]
-        chain = StageChain(stages)
-        chain.setup(m, i)
-        self.out_z = pmod.ospec()
-
-        self.o = pmod.o
-
-    def process(self, i):
-        return self.o
 
-    def action(self, m):
-        m.d.sync += self.out_z.eq(self.process(None))
-        m.next = "pack_put_z"
+        return [nmod, rmod, cmod, pmod]