From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Sun, 10 Jul 2022 11:41:32 +0000 (+0100)
Subject: non-persistence enabled on svindex as well as svremap
X-Git-Tag: sv_maxu_works-initial~270
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2ce36781642bf7fafa5a1c4f489b1f35dbb5a459;p=openpower-isa.git

non-persistence enabled on svindex as well as svremap
---

diff --git a/src/openpower/decoder/isa/caller.py b/src/openpower/decoder/isa/caller.py
index 859f5211..aa53abd0 100644
--- a/src/openpower/decoder/isa/caller.py
+++ b/src/openpower/decoder/isa/caller.py
@@ -1754,10 +1754,11 @@ class ISACaller(ISACallerHelper, ISAFPHelpers):
         else:
             # XXX only in non-SVP64 mode!
             # record state of whether the current operation was an svshape,
+            # OR svindex!
             # to be able to know if it should apply in the next instruction.
             # also (if going to use this instruction) should disable ability
             # to interrupt in between. sigh.
-            self.last_op_svshape = asmop == 'svremap'
+            self.last_op_svshape = asmop in ['svremap', 'svindex']
 
         if nia_update:
             self.update_pc_next()