From f968e27def692e22230fa35ff9db5287a33e8945 Mon Sep 17 00:00:00 2001 From: Luke Kenneth Casson Leighton Date: Thu, 28 Mar 2019 00:27:26 +0000 Subject: [PATCH] make FPADDBasePipe derive from ControlBase --- src/add/nmigen_add_experiment.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/add/nmigen_add_experiment.py b/src/add/nmigen_add_experiment.py index c9319f55..a175de31 100644 --- a/src/add/nmigen_add_experiment.py +++ b/src/add/nmigen_add_experiment.py @@ -9,7 +9,7 @@ from math import log from fpbase import FPNumIn, FPNumOut, FPOp, Overflow, FPBase, FPNumBase from fpbase import MultiShiftRMerge, Trigger -from example_buf_pipe import StageChain, UnbufferedPipeline +from singlepipe import (ControlBase, StageChain, UnbufferedPipeline) #from fpbase import FPNumShiftMultiRight @@ -1874,16 +1874,16 @@ class FPAddBaseStage: return o -class FPADDBasePipe: +class FPADDBasePipe(ControlBase): def __init__(self, width, id_wid): - stage1 = FPAddBaseStage(width, id_wid) - self.pipe = UnbufferedPipeline(stage1) + ControlBase.__init__(self) def elaborate(self, platform): - return self.pipe.elaborate(platform) + m = Module() + stage1 = FPAddBaseStage(width, id_wid) + m.d.comb += self.connect([stage1]) + return m - def ports(self): - return self.pipe.ports() class ResArray: def __init__(self, width, id_wid): -- 2.30.2