power_insn: support legacy style

[openpower-isa.git] / src / openpower / sv / trans / svp64.py

diff --git a/src/openpower/sv/trans/svp64.py b/src/openpower/sv/trans/svp64.py
index 90063f33db42de505862d06801fd122c5dcaed8f..7792a9a3f2e5c6328392ed44660d2ed2f5a46553 100644 (file)
--- a/src/openpower/sv/trans/svp64.py
+++ b/src/openpower/sv/trans/svp64.py
@@ -273,12 +273,7 @@ class SVP64Asm:
         if record is not None:
             insn = WordInstruction.assemble(db=DB,
                 entry=opcode, arguments=fields)
-            yield " ".join((
-                f".long 0x{int(insn):08X}",
-                "#",
-                opcode,
-                ",".join(fields),
-            ))
+            yield from insn.disassemble(db=DB, style=Style.LEGACY)
             return
 
         # identify if is a svp64 mnemonic
@@ -305,10 +300,7 @@ class SVP64Asm:
                 entry=v30b_op_orig,
                 arguments=fields,
                 specifiers=opmodes)
-            prefix = int(insn.prefix)
-            suffix = int(insn.suffix)
-            yield f".long 0x{prefix:08X}"
-            yield from insn.suffix.disassemble(db=DB, style=Style.SHORT)
+            yield from insn.disassemble(db=DB, style=Style.LEGACY)
             return
 
         # look up the 32-bit op (original, with "." if it has it)
@@ -957,12 +949,7 @@ class SVP64Asm:
         if record is not None:
             insn = WordInstruction.assemble(db=DB,
                 entry=opcode, arguments=fields)
-            yield " ".join((
-                f".long 0x{int(insn):08X}",
-                "#",
-                opcode,
-                ",".join(fields),
-            ))
+            yield from insn.disassemble(db=DB, style=Style.LEGACY)
         else:
             if not v30b_op.endswith('.'):
                 v30b_op += rc