From be75ebcbde4fa977038070a92a3285761f036566 Mon Sep 17 00:00:00 2001 From: Luke Kenneth Casson Leighton Date: Sat, 23 Mar 2019 11:28:21 +0000 Subject: [PATCH] finally got specialcases to pass through z down rest of pipeline --- src/add/nmigen_add_experiment.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/add/nmigen_add_experiment.py b/src/add/nmigen_add_experiment.py index 30dcc711..1c6ba120 100644 --- a/src/add/nmigen_add_experiment.py +++ b/src/add/nmigen_add_experiment.py @@ -460,9 +460,9 @@ class FPAddSpecialCasesDeNorm(FPState): m.d.sync += self.o.eq(self.dmod.o) def action(self, m): - with m.If(self.out_do_z): - m.next = "put_z" - with m.Else(): + #with m.If(self.out_do_z): + # m.next = "put_z" + #with m.Else(): m.next = "align" @@ -840,9 +840,8 @@ class FPAddStage0Mod: self.o.tot.eq(bm0 - am0), self.o.z.s.eq(self.i.b.s) ] - with m.Else(): - m.d.comb += self.o.oz.eq(self.i.z.v) + m.d.comb += self.o.oz.eq(self.i.oz) m.d.comb += self.o.out_do_z.eq(self.i.out_do_z) m.d.comb += self.o.mid.eq(self.i.mid) return m -- 2.30.2