add fields to ls015, correct section (3.3.17)

diff --git a/openpower/sv/rfc/ls015.mdwn b/openpower/sv/rfc/ls015.mdwn
index 82876502bbd88c906fcc34058f1c614368041ce0..23c4ad3b770fddf0bed7dc0b93f5f3fadca0616c 100644 (file)
--- a/openpower/sv/rfc/ls015.mdwn
+++ b/openpower/sv/rfc/ls015.mdwn
@@ -57,11 +57,12 @@
 
 **Motivation**
 
-Existing Condition Register operations are somewhat anaemic if to be utilised more extensively
-as Predicate Masks in a True-Scalable Vector ISA. Merging of multiple CR Fields requires several
-operations that may be achieved with a single "weird" operation, and transfer between CR Fields
-and GPR is easier and more powerful. This mitigates the need to add dozens of duplicate Logical
-Operations.
+Existing Condition Register operations are somewhat anaemic if to be
+utilised more extensively as Predicate Masks in a True-Scalable Vector
+ISA. Merging of multiple CR Fields requires several operations that may
+be achieved with a single "weird" operation, and transfer between CR
+Fields and GPR is easier and more powerful. This mitigates the need to
+add dozens of duplicate Logical Operations.
 
 **Notes and Observations**:
 
@@ -72,7 +73,7 @@ Operations.
 Add the following entries to:
 
 * the Appendices of Book I
-* Book I 3.3.13 TODO Condition Register  Instructions
+* Book I 3.3.17 Condition Register  Instructions
 * Book I 1.6.1 and 1.6.2
 
 ----------
@@ -89,30 +90,42 @@ Add the following entries to:
 
 Add the following entries to Book I 1.6.1 Word Instruction Formats:
 
-## MM-FORM
+## CW-FORM
 
 ```
-    |0    |6    |11   |16   |21   |24 |25  |31  |
-    | PO  | FRT | FRA | FRB | FMM     | XO | Rc |
-    | PO  | RT  | RA  | RB  | MMM | / | XO | Rc |
+    |0     |6   |9 |11|12   |16   |19  |22   |26   |31|
+    | PO   | RA    |M |fmsk |BF   |XO  |fmap | XO     |
+    | PO   | BT    |M |fmsk |BF   |XO  |fmap | XO     |
+    | PO   | BF |  |M |fmsk |BF   |XO  |fmap | XO     |
 ```
 
-Add the following new fields to Book I 1.6.2 Word Instruction Fields:
+## CW2-FORM
 
 ```
-    FMM (21:24)
-        Field used to specify minimum/maximum mode for fminmax[s].
+    |0     |6   |9 |11|12   |16   |19  |22   |26   |31|
+    | PO   | RT    |M |fmsk |BFA  |XO  |fmap | XO  |Rc|
 
-        Formats: MM
+```
 
-    MMM (21:23)
-        Field used to specify minimum/maximum mode for integer minmax.
+Add the following new fields to Book I 1.6.2 Word Instruction Fields:
 
-        Formats: MM
 ```
+    fmap (22:25)
+        Field used to specify the CR Field set/clear map for CR Weird
+        instructions.
+        Formats: CW, CW2
+
+    fmsk (12:15)
+        Field used to specify the CR Field mask for CR Weird instructions.
+        Formats: CW, CW2
+```
+
+Add `CW` and `CW2` to the `Formats:` list for all of
+`RT`, `RA`, `BF`, `BFA` and `Rc`.
+
+Add `CW` to the `Formats:` list for `XO (25:30)`.
 
-Add `MM` to the `Formats:` list for all of `FRT`, `FRA`, `FRB`, `XO (25:30)`,
-`Rc`, `RT`, `RA` and `RB`.
+Add `CW2` to the `Formats:` list for `XO (25:31)`.
 
 ----------