rename svshape and svoffset fields

* yx to SVyx
* offs to SVo
also correct the pseudocode!

diff --git a/openpower/isa/simplev.mdwn b/openpower/isa/simplev.mdwn
index 7d5cabcdee184e0fe76a1a8a71686096c2402b97..ce4e1105a5d7a408326e97fc5f99c9d990a01a2b 100644 (file)
--- a/openpower/isa/simplev.mdwn
+++ b/openpower/isa/simplev.mdwn
@@ -301,7 +301,7 @@ Special Registers Altered:
 
 SVI-Form
 
-* svindex SVG,rmm,SVd,ew,yx,mm,sk
+* svindex SVG,rmm,SVd,ew,SVyx,mm,sk
 
 Pseudo-code:
 
@@ -314,7 +314,7 @@ Pseudo-code:
     # set up template, then copy once location identified
     shape <- [0]*32
     shape[30:31] <- 0b00            # mode
-    if yx = 0 then
+    if SVyx = 0 then
         shape[18:20] <- 0b110       # indexed xd/yd
         shape[0:5] <- (0b0 || SVd)  # xdim
         if sk = 0 then shape[6:11] <- 0 # ydim
@@ -369,7 +369,7 @@ Special Registers Altered:
 
 SVM2-Form
 
-* svshape2 SVo,SVM2yx,rmm,SVd,sk,mm
+* svshape2 SVo,SVyx,rmm,SVd,sk,mm
 
 Pseudo-code:
 
@@ -383,7 +383,7 @@ Pseudo-code:
     shape <- [0]*32
     shape[30:31] <- 0b00            # mode
     shape[0:5] <- (0b0 || SVd)      # x/ydim
-    if yx = 0 then
+    if SVyx = 0 then
         shape[18:20] <- 0b000       # ordering xd/yd(/zd)
         if sk = 0 then shape[6:11] <- 0 # ydim
         else           shape[6:11] <- 0b111111 # ydim max
@@ -392,7 +392,7 @@ Pseudo-code:
         if sk = 1 then shape[6:11] <- 0 # ydim
         else           shape[6:11] <- d-1 # ydim max
     # offset (the prime purpose of this instruction)
-    shape[24:27] <- offs        # offset
+    shape[24:27] <- SVo         # offset
     if sk = 1 then shape[28:29] <- 0b01 # skip 1st dimension
     else           shape[28:29] <- 0b00 # no skipping
     # select the mode for updating SVSHAPEs

diff --git a/openpower/isatables/fields.text b/openpower/isatables/fields.text
index 0cad72a626517e47f3132327a39e4c68fed0f4c5..fbf50361640a1523cb117916bfbc7dfdd95a6233 100644 (file)
--- a/openpower/isatables/fields.text
+++ b/openpower/isatables/fields.text
@@ -274,8 +274,8 @@
     | PO   |  FRTp|  /// | R | FRBp  |RMC|   XO |Rc |
 
 # 1.6.29 SVI-FORM
-    |0     |6    |11    |16   |21 |23|24|25|26    31|
-    | PO   |  SVG|rmm   | SVd |ew |yx|mm|sk|   XO   |
+    |0     |6    |11    |16   |21 |23  |24|25|26    31|
+    | PO   |  SVG|rmm   | SVd |ew |SVyx|mm|sk|   XO   |
 
 # 1.6.30 SVL-FORM
     |0     |6    |11    |16   |23 |24 |25 |26    |31 |
@@ -307,8 +307,8 @@
     | PO   |  SVxd   |   SVyd | SVzd | SVrm |vf |   XO      |
 
 # 1.6.35.1 SVM2-FORM
-    |0     |6     |10   |11      |16    |21 |24|25 |26    |31  |
-    | PO   | SVo  |SVMyx|   rmm  | SVd  |XO |mm|sk |   XO      |
+    |0     |6     |10  |11      |16    |21 |24|25 |26    |31  |
+    | PO   | SVo  |SVyx|   rmm  | SVd  |XO |mm|sk |   XO      |
 
 # 1.6.36 SVRM-FORM
     |0     |6     |11  |13   |15   |17   |19   |21  |22   |26     |31 |
@@ -666,9 +666,6 @@
         Field used to specify the number of bytes to move
         in an immediate Move Assist instruction.
         Formats: X
-    offs (6:9)
-        Field used by the svshape2 instruction as an offset
-        Formats: SVM2
     OC (6:20)
         Field used by the Embedded Hypervisor Privilege
         instruction.
@@ -856,6 +853,9 @@
     SVme (6:10)
          Simple-V "REMAP" map-enable bits (0-4)
          Formats: SVRM
+    SVo (6:9)
+        Field used by the svshape2 instruction as an offset
+        Formats: SVM2
     SVrm (21:24)
          Simple-V "REMAP" Mode
          Formats: SVM
@@ -1040,9 +1040,9 @@
     XO (30:31)
         Extended opcode field.
         Formats: DQE, DS, SC
-    yx (23)
+    SVyx (23)
         Field used to specify loop dimension order in svindex
         Formats: SVI
-    SVMyx (10)
+    SVyx (10)
         Field used to specify loop dimension order in svshape2
         Formats: SVM2