From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Thu, 1 Sep 2022 15:54:39 +0000 (+0100)
Subject: drat have to use RCOE.RC not RCOE.RC_OE for now otherwise
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=90a2667f60c1c06176819ca581873fedfc76ba51;p=openpower-isa.git

drat have to use RCOE.RC not RCOE.RC_OE for now otherwise
all CSV entries have to change
---

diff --git a/src/openpower/decoder/power_decoder2.py b/src/openpower/decoder/power_decoder2.py
index cedb3548..fdad7392 100644
--- a/src/openpower/decoder/power_decoder2.py
+++ b/src/openpower/decoder/power_decoder2.py
@@ -539,7 +539,7 @@ class DecodeRC(Elaboratable):
 
         # select Record bit out field
         with m.Switch(self.sel_in):
-            with m.Case(RCOE.RC_OE, RCOE.RC_ONLY):
+            with m.Case(RCOE.RC, RCOE.RC_ONLY):
                 comb += self.rc_out.data.eq(self.dec.Rc)
                 comb += self.rc_out.ok.eq(1)
             with m.Case(RCOE.ONE):
@@ -605,7 +605,7 @@ class DecodeOE(Elaboratable):
             with m.Default():
                 # select OE bit out field
                 with m.Switch(self.sel_in):
-                    with m.Case(RCOE.RC_OE):
+                    with m.Case(RCOE.RC):
                         comb += self.oe_out.data.eq(self.dec.OE)
                         comb += self.oe_out.ok.eq(1)
 
diff --git a/src/openpower/decoder/power_enums.py b/src/openpower/decoder/power_enums.py
index 693a4879..7bb927fb 100644
--- a/src/openpower/decoder/power_enums.py
+++ b/src/openpower/decoder/power_enums.py
@@ -674,7 +674,7 @@ class LDSTMode(Enum):
 class RCOE(Enum):
     NONE = 0
     ONE = 1
-    RC_OE = 2    # includes OE
+    RC = 2    # includes OE
     RC_ONLY = 3  # does not include OE
 
 
diff --git a/src/openpower/decoder/power_insn.py b/src/openpower/decoder/power_insn.py
index 78217512..43cf10a6 100644
--- a/src/openpower/decoder/power_insn.py
+++ b/src/openpower/decoder/power_insn.py
@@ -717,7 +717,7 @@ class Database:
                     svp64 = svp64db.get(identifier)
                     if ppc.rc is _RCOE.ONE:
                         variants = {name:True for name in ppc.names}
-                    elif ppc.rc in [_RCOE.RC_OE, _RCOE.RC_ONLY]:
+                    elif ppc.rc in [_RCOE.RC, _RCOE.RC_ONLY]:
                         variants = {name:False for name in ppc.names}
                         variants.update({f"{name}.":True for name in ppc.names})
                     else: