clarify java/saturating only refers to java's fp->int for long/int

we specifically don't mean java's float -> byte/short/etc. that saturates to int then truncates

diff --git a/openpower/sv/int_fp_mv.mdwn b/openpower/sv/int_fp_mv.mdwn
index 1778e9400ba67cf7ff99c41c600f4a1cade1777d..8b21bac42f9be519b6f7432d28b2c32240cce35f 100644 (file)
--- a/openpower/sv/int_fp_mv.mdwn
+++ b/openpower/sv/int_fp_mv.mdwn
@@ -78,11 +78,13 @@ If adding new Integer <-> FP conversion instructions,
 the opportunity may be taken to modernise the instructions and make them
 well-suited for common/important conversion sequences:
 
-* **standard IEEE754** - used by most languages and CPUs
-* **standard OpenPOWER** - saturation with NaN
-  converted to minimum valid integer
-* **Java** - saturation with NaN converted to 0
-* **JavaScript** - modulo wrapping with Inf/NaN converted to 0
+* Int -> Float
+    * **standard IEEE754** - used by most languages and CPUs
+* Float -> Int
+    * **standard OpenPOWER** - saturation with NaN
+      converted to minimum valid integer
+    * **Java/Saturating** - saturation with NaN converted to 0
+    * **JavaScript** - modulo wrapping with Inf/NaN converted to 0
 
 The assembly listings in the [[int_fp_mv/appendix]] show how costly
 some of these language-specific conversions are: Javascript, the
@@ -455,7 +457,7 @@ For the sake of simplicity, the FP -> Integer conversion semantics generalized f
 Those same semantics are used in some way by all of the following languages (not necessarily for the default conversion method):
 
 * Java's
-  [FP -> Integer conversion](https://docs.oracle.com/javase/specs/jls/se16/html/jls-5.html#jls-5.1.3)
+  [FP -> Integer conversion](https://docs.oracle.com/javase/specs/jls/se16/html/jls-5.html#jls-5.1.3) (only for long/int results)
 * Rust's FP -> Integer conversion using the
   [`as` operator](https://doc.rust-lang.org/reference/expressions/operator-expr.html#semantics)
 * LLVM's
@@ -520,12 +522,12 @@ def fp_to_int_open_power<fp, int>(v: fp) -> int:
 
 <div id="fp-to-int-java-saturating-conversion-semantics"></div>
 [Java/Saturating conversion semantics](https://docs.oracle.com/javase/specs/jls/se16/html/jls-5.html#jls-5.1.3)
-/
+(only for long/int results)/
 [Rust semantics](https://doc.rust-lang.org/reference/expressions/operator-expr.html#semantics)
 (with adjustment to add non-truncate rounding modes):
 
 ```
-def fp_to_int_java<fp, int>(v: fp) -> int:
+def fp_to_int_java_saturating<fp, int>(v: fp) -> int:
     if v is NaN:
         return 0
     if v >= int::MAX_VALUE:
@@ -710,6 +712,3 @@ For brevity, `[o]` is used to mean `o` is optional there.
 | `fcvttgud[o]. RT, FRB, CVM`  | `fcvttg[o] RT, FRB, CVM, 3, 1` |
 | `fcvtstgud[o] RT, FRB, CVM`  | `fcvttg[o] RT, FRB, CVM, 3, 2` |
 | `fcvtstgud[o]. RT, FRB, CVM` | `fcvttg[o] RT, FRB, CVM, 3, 3` |
-
-[mode `Mode`]: #fpr-to-gpr-conversion-mode
-

diff --git a/openpower/sv/rfc/ls006.mdwn b/openpower/sv/rfc/ls006.mdwn
index 92413f870c94c68d5563d7baf67518fcf95ba2ef..b1203ec9da28fadb570195b63f0daa57830d03ac 100644 (file)
--- a/openpower/sv/rfc/ls006.mdwn
+++ b/openpower/sv/rfc/ls006.mdwn
@@ -81,7 +81,7 @@ For the sake of simplicity, the FP -> Integer conversion semantics generalized f
 Those same semantics are used in some way by all of the following languages (not necessarily for the default conversion method):
 
 * Java's
-  [FP -> Integer conversion](https://docs.oracle.com/javase/specs/jls/se16/html/jls-5.html#jls-5.1.3)
+  [FP -> Integer conversion](https://docs.oracle.com/javase/specs/jls/se16/html/jls-5.html#jls-5.1.3) (only for long/int results)
 * Rust's FP -> Integer conversion using the
   [`as` operator](https://doc.rust-lang.org/reference/expressions/operator-expr.html#semantics)
 * LLVM's
@@ -337,7 +337,7 @@ For the sake of simplicity, the FP -> Integer conversion semantics generalized f
 Those same semantics are used in some way by all of the following languages (not necessarily for the default conversion method):
 
 * Java's
-  [FP -> Integer conversion](https://docs.oracle.com/javase/specs/jls/se16/html/jls-5.html#jls-5.1.3)
+  [FP -> Integer conversion](https://docs.oracle.com/javase/specs/jls/se16/html/jls-5.html#jls-5.1.3) (only for ling/int results)
 * Rust's FP -> Integer conversion using the
   [`as` operator](https://doc.rust-lang.org/reference/expressions/operator-expr.html#semantics)
 * LLVM's
@@ -402,12 +402,12 @@ def fp_to_int_open_power<fp, int>(v: fp) -> int:
 
 <div id="fp-to-int-java-saturating-conversion-semantics"></div>
 [Java/Saturating conversion semantics](https://docs.oracle.com/javase/specs/jls/se16/html/jls-5.html#jls-5.1.3)
-/
+ (only for long/int results)/
 [Rust semantics](https://doc.rust-lang.org/reference/expressions/operator-expr.html#semantics)
 (with adjustment to add non-truncate rounding modes):
 
 ```
-def fp_to_int_java<fp, int>(v: fp) -> int:
+def fp_to_int_java_saturating<fp, int>(v: fp) -> int:
     if v is NaN:
         return 0
     if v >= int::MAX_VALUE: