From 9a63c4e6906939dfb50b7e7bed65d480527d2fa7 Mon Sep 17 00:00:00 2001
From: lkcl <lkcl@web>
Date: Thu, 7 Jan 2021 21:28:23 +0000
Subject: [PATCH]

---
 openpower/sv/ldst.mdwn | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/openpower/sv/ldst.mdwn b/openpower/sv/ldst.mdwn
index c5401b575..7f3840ba7 100644
--- a/openpower/sv/ldst.mdwn
+++ b/openpower/sv/ldst.mdwn
@@ -30,7 +30,8 @@ Thus we can see that Vector Indexed may be covered, and, as demonstrated with th
 
 At the minimum however it is possible to provide unit stride and vector mode, as follows:
 
-    function op_ld(RT, RA, immed, update=False) # LD not VLD!
+    # LD not VLD!
+    function op_ld(RT, RA, immed, svctx, update=False)
       rdv = map_dest_extra(RT);
       rsv = map_src_extra(RA);
       ps = get_pred_val(FALSE, RA); # predication on src
@@ -39,16 +40,19 @@ At the minimum however it is possible to provide unit stride and vector mode, as
         # skip nonpredicates elements
         if (RA.isvec) while (!(ps & 1<<i)) i++;
         if (RT.isvec) while (!(pd & 1<<j)) j++;
-        if (RA.isvec)
+        if RA.isvec:
           # indirect mode (multi mode)
-          EA = ireg[rsv+i] + immoed;
+          EA = ireg[rsv+i] + immed;
           if update: ireg[rsv+i] = EA;
-        elif (RT.isvec)
+        elif svctx.ldstmode == unitstride:
           # unit and element stride mode
           EA = ireg[rsv] + i * immed
-          if update: ireg[rsv] = EA; # note: overwrites repeatedly
+          # note: overwrites repeatedly, effectively
+          # giving the last non-masked-out value 
+          if update: ireg[rsv] = EA;
         else
           # standard scalar mode (but predicated)
+          # no stride multiplier means VSPLAT mode
           EA = ireg[rsv] + immed
           if update: ireg[rsv] = EA;
         ireg[rdv+j] <= MEM[EA];
-- 
2.30.2