From 815c6c4d5de9ace35e07184be4c2eea1f595f404 Mon Sep 17 00:00:00 2001 From: Luke Kenneth Casson Leighton Date: Wed, 20 Mar 2019 13:29:36 +0000 Subject: [PATCH] more use of ospec --- src/add/nmigen_add_experiment.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/add/nmigen_add_experiment.py b/src/add/nmigen_add_experiment.py index e3e904bc..bc5f6415 100644 --- a/src/add/nmigen_add_experiment.py +++ b/src/add/nmigen_add_experiment.py @@ -711,9 +711,7 @@ class FPAddAlignSingleAdd(FPState, FPID): self.o = self.mod.ospec() self.a0mod = FPAddStage0Mod(width) - self.a0_out_z = FPNumBase(width, False) - self.out_tot = Signal(self.a0_out_z.m_width + 4, reset_less=True) - self.a0_out_z = FPNumBase(width, False) + self.a0o = self.a0mod.ospec() self.a1mod = FPAddStage1Mod(width) self.a1o = self.a1mod.ospec() @@ -725,10 +723,9 @@ class FPAddAlignSingleAdd(FPState, FPID): m.d.comb += self.o.eq(self.mod.o) self.a0mod.setup(m, self.o.a, self.o.b) - m.d.comb += self.a0_out_z.eq(self.a0mod.o.z) - m.d.comb += self.out_tot.eq(self.a0mod.o.tot) + m.d.comb += self.a0o.eq(self.a0mod.o) - self.a1mod.setup(m, self.out_tot, self.a0_out_z) + self.a1mod.setup(m, self.a0o.tot, self.a0o.z) if self.in_mid is not None: m.d.comb += self.in_mid.eq(in_mid) -- 2.30.2