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 859f521122bfe806d6da2c8e7229d36a5130d088..aa53abd0625ab92b3234ccc7895f6391d01da0ba 100644 (file)
--- 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()