From a46acfab1061a2e2001d8a2f4a39f301f50bddcd Mon Sep 17 00:00:00 2001 From: Luke Kenneth Casson Leighton Date: Wed, 20 May 2020 05:46:17 +0100 Subject: [PATCH] convert shift_rot to use XER Data --- src/soc/fu/shift_rot/main_stage.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/soc/fu/shift_rot/main_stage.py b/src/soc/fu/shift_rot/main_stage.py index a837fb8a..f3911827 100644 --- a/src/soc/fu/shift_rot/main_stage.py +++ b/src/soc/fu/shift_rot/main_stage.py @@ -68,11 +68,11 @@ class ShiftRotMainStage(PipeModBase): # outputs from the microwatt rotator module comb += [self.o.o.eq(rotator.result_o), - self.o.carry_out.eq(rotator.carry_out_o)] + self.o.xer_co.eq(rotator.carry_out_o)] ###### sticky overflow and context, both pass-through ##### - comb += self.o.so.eq(self.i.so) + comb += self.o.xer_so.data.eq(self.i.so) comb += self.o.ctx.eq(self.i.ctx) return m -- 2.30.2