From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Sun, 26 Jun 2022 22:13:27 +0000 (+0100)
Subject: whoops svp64.py testing wrong variable on sv.svstep
X-Git-Tag: sv_maxu_works-initial~310
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8de6cd78880595e1aa82a0cda4fe78e04079d7a7;p=openpower-isa.git

whoops svp64.py testing wrong variable on sv.svstep
---

diff --git a/src/openpower/sv/trans/svp64.py b/src/openpower/sv/trans/svp64.py
index faedfb31..2749d0a1 100644
--- a/src/openpower/sv/trans/svp64.py
+++ b/src/openpower/sv/trans/svp64.py
@@ -1227,7 +1227,7 @@ class SVP64Asm:
         # fiinally yield the svp64 prefix and the thingy.  v3.0b opcode
         rc = '.' if rc_mode else ''
         yield ".long 0x%08x" % svp64_prefix.insn.value
-        log(v30b_newfields)
+        log(v30b_op, v30b_newfields)
         # argh, sv.fmadds etc. need to be done manually
         if v30b_op == 'ffmadds':
             opcode = 59 << (32-6)    # bits 0..6 (MSB0)
@@ -1261,7 +1261,7 @@ class SVP64Asm:
                 opcode |= 1  # Rc, bit 31.
             yield ".long 0x%x" % opcode
         # sigh have to do svstep here manually for now...
-        elif opcode in ["svstep", "svstep."]:
+        elif v30b_op in ["svstep", "svstep."]:
             insn = 22 << (31-5)          # opcode 22, bits 0-5
             insn |= int(v30b_newfields[0]) << (31-10)  # RT       , bits 6-10
             insn |= int(v30b_newfields[1]) << (31-22)  # SVi      , bits 16-22
@@ -1455,6 +1455,9 @@ if __name__ == '__main__':
         'cprop 3,12,5',
         'svindex 0,0,1,0,0,0,0',
     ]
+    lst = [
+        'sv.svstep./m=r3 2.v, 4, 0',
+    ]
     isa = SVP64Asm(lst, macros=macros)
     log("list", list(isa))
     asm_process()