From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Wed, 20 May 2020 04:46:17 +0000 (+0100)
Subject: convert shift_rot to use XER Data
X-Git-Tag: div_pipeline~1050
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a46acfab1061a2e2001d8a2f4a39f301f50bddcd;p=soc.git

convert shift_rot to use XER Data
---

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