From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Thu, 14 May 2020 21:27:30 +0000 (+0100)
Subject: minor cleanup
X-Git-Tag: div_pipeline~1213
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6dc34159591db5f3cfa5ecda092a9208a61ee9b7;p=soc.git

minor cleanup
---

diff --git a/src/soc/alu/input_stage.py b/src/soc/alu/input_stage.py
index 5a325f51..75207324 100644
--- a/src/soc/alu/input_stage.py
+++ b/src/soc/alu/input_stage.py
@@ -23,13 +23,14 @@ class ALUInputStage(PipeModBase):
     def elaborate(self, platform):
         m = Module()
         comb = m.d.comb
+        ctx = self.i.ctx
 
         ##### operand A #####
 
         # operand a to be as-is or inverted
         a = Signal.like(self.i.a)
 
-        with m.If(self.i.ctx.op.invert_a):
+        with m.If(ctx.op.invert_a):
             comb += a.eq(~self.i.a)
         with m.Else():
             comb += a.eq(self.i.a)
@@ -40,7 +41,7 @@ class ALUInputStage(PipeModBase):
         ##### carry-in #####
 
         # either copy incoming carry or set to 1/0 as defined by op
-        with m.Switch(self.i.ctx.op.input_carry):
+        with m.Switch(ctx.op.input_carry):
             with m.Case(CryIn.ZERO):
                 comb += self.o.carry_in.eq(0)
             with m.Case(CryIn.ONE):
@@ -51,6 +52,6 @@ class ALUInputStage(PipeModBase):
         ##### sticky overflow and context (both pass-through) #####
 
         comb += self.o.so.eq(self.i.so)
-        comb += self.o.ctx.eq(self.i.ctx)
+        comb += self.o.ctx.eq(ctx)
 
         return m