diff mbox series

target/alpha: Do not mix exception flags and FPCR bits

Message ID 20250211162604.83446-1-philmd@linaro.org
State Superseded
Headers show
Series target/alpha: Do not mix exception flags and FPCR bits | expand

Commit Message

Philippe Mathieu-Daudé Feb. 11, 2025, 4:26 p.m. UTC 
get_float_exception_flags() returns exception flags,
which are distinct from the FPCR bits used as error code.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
Based-on: <20250211130626.3940412-1-peter.maydell@linaro.org>
---
 target/alpha/fpu_helper.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

Comments

Richard Henderson Feb. 11, 2025, 4:49 p.m. UTC | #1 
On 2/11/25 08:26, Philippe Mathieu-Daudé wrote:
> get_float_exception_flags() returns exception flags,
> which are distinct from the FPCR bits used as error code.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
> Based-on: <20250211130626.3940412-1-peter.maydell@linaro.org>
> ---
>   target/alpha/fpu_helper.c | 15 +++++++--------
>   1 file changed, 7 insertions(+), 8 deletions(-)

Yes, this is clearer.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>


r~
Philippe Mathieu-Daudé March 6, 2025, 1:13 p.m. UTC | #2 
On 11/2/25 17:26, Philippe Mathieu-Daudé wrote:
> get_float_exception_flags() returns exception flags,
> which are distinct from the FPCR bits used as error code.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
> Based-on: <20250211130626.3940412-1-peter.maydell@linaro.org>
> ---
>   target/alpha/fpu_helper.c | 15 +++++++--------
>   1 file changed, 7 insertions(+), 8 deletions(-)

Patch queued, thanks.
diff mbox series

Patch

diff --git a/target/alpha/fpu_helper.c b/target/alpha/fpu_helper.c
index f810a9b6a47..6aefb9b851a 100644
--- a/target/alpha/fpu_helper.c
+++ b/target/alpha/fpu_helper.c
@@ -455,29 +455,28 @@  static uint64_t do_cvttq(CPUAlphaState *env, uint64_t a, int roundmode)
 {
     float64 fa;
     int64_t ret;
-    uint32_t exc;
+    uint32_t exc = 0;
+    int flags;
 
     fa = t_to_float64(a);
     ret = float64_to_int64_modulo(fa, roundmode, &FP_STATUS);
 
-    exc = get_float_exception_flags(&FP_STATUS);
-    if (unlikely(exc)) {
+    flags = get_float_exception_flags(&FP_STATUS);
+    if (unlikely(flags)) {
         set_float_exception_flags(0, &FP_STATUS);
 
         /* We need to massage the resulting exceptions. */
-        if (exc & float_flag_invalid_cvti) {
+        if (flags & float_flag_invalid_cvti) {
             /* Overflow, either normal or infinity. */
             if (float64_is_infinity(fa)) {
                 exc = FPCR_INV;
             } else {
                 exc = FPCR_IOV | FPCR_INE;
             }
-        } else if (exc & float_flag_invalid) {
+        } else if (flags & float_flag_invalid) {
             exc = FPCR_INV;
-        } else if (exc & float_flag_inexact) {
+        } else if (flags & float_flag_inexact) {
             exc = FPCR_INE;
-        } else {
-            exc = 0;
         }
     }
     env->error_code = exc;