tidyup, use FPModBaseChain and FPModBase

diff --git a/src/ieee754/fpcommon/pack.py b/src/ieee754/fpcommon/pack.py
index a89ec90814944b5bc62d895951f77ea80076abc0..610bc706b5c2dee62d19064aa8d41dd824cdb4f8 100644 (file)
--- a/src/ieee754/fpcommon/pack.py
+++ b/src/ieee754/fpcommon/pack.py
@@ -2,13 +2,12 @@
 # Copyright (C) Jonathan P Dawson 2013
 # 2013-12-12
 
-from nmigen import Module, Signal, Elaboratable
+from nmigen import Module, Signal
 from nmigen.cli import main, verilog
 
-from ieee754.fpcommon.fpbase import FPNumOut, FPNumBaseRecord, FPNumBase
-from ieee754.fpcommon.fpbase import FPState
-from .roundz import FPRoundData
-from nmutil.singlepipe import Object
+from ieee754.fpcommon.modbase import FPModBase
+from ieee754.fpcommon.fpbase import FPNumBaseRecord, FPNumBase
+from ieee754.fpcommon.roundz import FPRoundData
 from ieee754.fpcommon.getop import FPPipeContext
 
 
@@ -39,12 +38,10 @@ class FPPackData:
         return list(self)
 
 
-class FPPackMod(Elaboratable):
+class FPPackMod(FPModBase):
 
     def __init__(self, pspec):
-        self.pspec = pspec
-        self.i = self.ispec()
-        self.o = self.ospec()
+        super().__init__(pspec, "pack")
 
     def ispec(self):
         return FPRoundData(self.pspec)
@@ -52,52 +49,22 @@ class FPPackMod(Elaboratable):
     def ospec(self):
         return FPPackData(self.pspec)
 
-    def process(self, i):
-        return self.o
-
-    def setup(self, m, in_z):
-        """ links module to inputs and outputs
-        """
-        m.submodules.pack = self
-        m.d.comb += self.i.eq(in_z)
-
     def elaborate(self, platform):
         m = Module()
+        comb = m.d.comb
+
         z = FPNumBaseRecord(self.pspec.width, False, name="z")
         m.submodules.pack_in_z = in_z = FPNumBase(self.i.z)
-        #m.submodules.pack_out_z = out_z = FPNumOut(z)
-        m.d.comb += self.o.ctx.eq(self.i.ctx)
+
         with m.If(~self.i.out_do_z):
             with m.If(in_z.is_overflowed):
-                m.d.comb += z.inf(self.i.z.s)
+                comb += z.inf(self.i.z.s)
             with m.Else():
-                m.d.comb += z.create(self.i.z.s, self.i.z.e, self.i.z.m)
+                comb += z.create(self.i.z.s, self.i.z.e, self.i.z.m)
         with m.Else():
-            m.d.comb += z.v.eq(self.i.oz)
-        m.d.comb += self.o.z.eq(z.v)
-        return m
-
-
-class FPPack(FPState):
+            comb += z.v.eq(self.i.oz)
 
-    def __init__(self, width, id_wid):
-        FPState.__init__(self, "pack")
-        self.mod = FPPackMod(width)
-        self.out_z = self.ospec()
+        comb += self.o.ctx.eq(self.i.ctx)
+        comb += self.o.z.eq(z.v)
 
-    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.v.eq(self.mod.out_z.v)
-        m.d.sync += self.out_z.ctx.eq(self.mod.o.ctx)
-
-    def action(self, m):
-        m.next = "pack_put_z"
+        return m