power_insn: simplify branch table

diff --git a/src/openpower/decoder/power_insn.py b/src/openpower/decoder/power_insn.py
index edc103bdff360a1551b99323b742a933475a0c25..5fc8f00cfc31beefca6d09c1118720e585e3b6bd 100644 (file)
--- a/src/openpower/decoder/power_insn.py
+++ b/src/openpower/decoder/power_insn.py
@@ -1852,16 +1852,17 @@ class RM(BaseRM):
             search = ((int(rm.mode) << 1) | (regtype or 0))
 
         elif record.svp64.mode is _SVMode.BRANCH:
-            # just mode 5-bit. could be reduced down to 2, oh well.
-            #    mode     mask     member
+            # just mode 2-bit
+            #    mode  mask  member
             table = (
-                (0b00000, 0b11000, "simple"), # simple
-                (0b01000, 0b11000, "vls"),    # VLset
-                (0b10000, 0b11000, "ctr"),    # CTR mode
-                (0b11000, 0b11000, "ctrvls"), # CTR+VLset mode
+                (0b00, 0b11, "simple"), # simple
+                (0b01, 0b11, "vls"),    # VLset
+                (0b10, 0b11, "ctr"),    # CTR mode
+                (0b11, 0b11, "ctrvls"), # CTR+VLset mode
             )
             # slightly weird: doesn't have a 5-bit "mode" field like others
-            search = int(rm[19:23])
+            rm = rm.branch
+            search = int(rm.mode[0, 1])
 
         # look up in table
         if table is not None:

diff --git a/src/openpower/sv/trans/svp64.py b/src/openpower/sv/trans/svp64.py
index 5fab53d10c3667f07c68ddd6176ae506d7ce5dc4..3b42951e11f4a594cc9f694fbd5695643a6dffb8 100644 (file)
--- a/src/openpower/sv/trans/svp64.py
+++ b/src/openpower/sv/trans/svp64.py
@@ -1365,11 +1365,12 @@ class SVP64Asm:
         # and subvl: bits 8-9
         svp64_rm.subvl = subvl
 
-        # put in elwidths
-        # srcwid: bits 6-7
-        svp64_rm.ewsrc = srcwid
-        # destwid: bits 4-5
-        svp64_rm.elwidth = destwid
+        # put in elwidths unless bc
+        if not is_bc:
+            # srcwid: bits 6-7
+            svp64_rm.ewsrc = srcwid
+            # destwid: bits 4-5
+            svp64_rm.elwidth = destwid
 
         # nice debug printout. (and now for something completely different)
         # https://youtu.be/u0WOIwlXE9g?t=146