From 0220029ffb201563bda619f4267e92829037e77c Mon Sep 17 00:00:00 2001
From: Dmitry Selyutin <ghostmansd@gmail.com>
Date: Sun, 18 Sep 2022 17:08:52 +0300
Subject: [PATCH] power_insn: support m/sm/dm specifiers

---
 src/openpower/decoder/power_insn.py | 46 +++++++++++++++++++++++++----
 1 file changed, 40 insertions(+), 6 deletions(-)

diff --git a/src/openpower/decoder/power_insn.py b/src/openpower/decoder/power_insn.py
index 37ec76ec..c125a19a 100644
--- a/src/openpower/decoder/power_insn.py
+++ b/src/openpower/decoder/power_insn.py
@@ -1276,7 +1276,6 @@ class BaseRM(_Mapping):
     subvl: _Field = range(8, 10)
     mode: Mode.remap(range(19, 24))
     smask: _Field = range(16, 19)
-
     extra: Extra.remap(range(10, 19))
     extra2: Extra2.remap(range(10, 19))
     extra3: Extra3.remap(range(10, 19))
@@ -1301,21 +1300,56 @@ class BaseRM(_Mapping):
 
 class NormalLDSTBaseRM(BaseRM):
     def specifiers(self, record):
-        width = {
+        widths = {
             0b11: "8",
             0b10: "16",
             0b01: "32",
         }
+        predicates = {
+            # integer
+            (0, 0b001): "1<<r3",
+            (0, 0b010): "r3",
+            (0, 0b011): "~r3",
+            (0, 0b100): "r10",
+            (0, 0b101): "~r10",
+            (0, 0b110): "r30",
+            (0, 0b111): "~r30",
+            # CRs
+            (1, 0b000): "lt",
+            (1, 0b001): "ge",
+            (1, 0b010): "gt",
+            (1, 0b011): "le",
+            (1, 0b100): "eq",
+            (1, 0b101): "ne",
+            (1, 0b110): "so",
+            (1, 0b111): "ns",
+        }
+
+        mmode = int(self.mmode)
+        mask = int(self.mask)
+        if record.svp64.ptype is _SVPtype.P2:
+            (smask, dmask) = (int(self.smask), mask)
+        else:
+            (smask, dmask) = (mask, mask)
+        if all((smask, dmask)) and (smask == dmask):
+            yield f"m={predicates[(mmode, smask)]}"
+        else:
+            sw = predicates.get((mmode, smask))
+            dw = predicates.get((mmode, dmask))
+            if sw:
+                yield f"sm={sw}"
+            if dw:
+                yield f"dm={dw}"
 
         dw = int(self.elwidth)
         sw = int(self.ewsrc)
-        if all((dw, sw)) and dw == sw:
-            yield f"w={width[dw]}"
+        if all((dw, sw)) and (dw == sw):
+            yield f"w={widths[dw]}"
         else:
             if dw != 0b00:
-                yield f"dw={width[dw]}"
+                yield f"dw={widths[dw]}"
             if sw != 0b00:
-                yield f"sw={width[sw]}"
+                yield f"sw={widths[sw]}"
 
         yield from super().specifiers(record=record)
 
-- 
2.30.2