From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Thu, 27 Aug 2020 20:18:12 +0000 (+0100)
Subject: https://bugs.libre-soc.org/show_bug.cgi?id=476
X-Git-Tag: semi_working_ecp5~250^2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9486ce5933b5a20031166a1caffa0821b2af883f;p=soc.git

https://bugs.libre-soc.org/show_bug.cgi?id=476
XER SO not being "listened" to correctly when OE=0 and Rc=1 creating CR0
---

diff --git a/src/soc/fu/common_output_stage.py b/src/soc/fu/common_output_stage.py
index 530db3ac..adb795c5 100644
--- a/src/soc/fu/common_output_stage.py
+++ b/src/soc/fu/common_output_stage.py
@@ -21,10 +21,18 @@ class CommonOutputStage(PipeModBase):
         #     has been pass-through just to get it into CR0
         # in case (1) we don't *have* an xer_so output so put xer_so *input*
         # into CR0.
+        xer_so_i = self.i.xer_so.data[0]
         if hasattr(self.o, "xer_so"):
             xer_so_o = self.o.xer_so.data[0]
+            so = Signal(reset_less=True)
+            oe = Signal(reset_less=True)
+            comb += oe.eq(op.oe.oe & op.oe.oe_ok)
+            with m.If(oe):
+                comb += so.eq(xer_so_o)
+            with m.Else():
+                comb += so.eq(xer_so_i)
         else:
-            xer_so_o = self.i.xer_so.data[0]
+            so = xer_so_i
 
         # op requests inversion of the output...
         o = Signal.like(self.i.o)
@@ -85,7 +93,7 @@ class CommonOutputStage(PipeModBase):
         with m.If(is_cmpeqb):
             comb += cr0.eq(self.i.cr0.data)
         with m.Else():
-            comb += cr0.eq(Cat(xer_so_o, ~is_nzero, is_positive, is_negative))
+            comb += cr0.eq(Cat(so, ~is_nzero, is_positive, is_negative))
 
         # copy out [inverted?] output, cr0, and context out
         comb += self.o.o.data.eq(o)