power_insn: clean extra disassembly

diff --git a/src/openpower/decoder/power_insn.py b/src/openpower/decoder/power_insn.py
index e9a51625c72378cf36c123ce4873da08359b9314..568542fb9f9f4d9cf2446e099978eeb0c7198a01 100644 (file)
--- a/src/openpower/decoder/power_insn.py
+++ b/src/openpower/decoder/power_insn.py
@@ -610,7 +610,12 @@ class DynamicOperandGPR(DynamicOperandReg):
             yield f"{int(value):0{value.bits}b}"
             yield repr(span)
             if svp64:
-                yield repr(self.extra_idx(record))
+                extra_idx = self.extra_idx(record)
+                if record.etype is _SVEtype.NONE:
+                    yield f"extra[none]"
+                else:
+                    etype = repr(record.etype).lower()
+                    yield f"{etype}{extra_idx!r}"
         else:
             yield f"r{str(int(value))}"
 
@@ -625,7 +630,12 @@ class DynamicOperandFPR(DynamicOperandReg):
             yield f"{int(value):0{value.bits}b}"
             yield repr(span)
             if svp64:
-                yield repr(self.extra_idx(record))
+                extra_idx = self.extra_idx(record)
+                if record.etype is _SVEtype.NONE:
+                    yield f"extra[none]"
+                else:
+                    etype = repr(record.etype).lower()
+                    yield f"{etype}{extra_idx!r}"
         else:
             yield f"f{str(int(value))}"