Patchwork [1/2] target-arm: Fix VRECPS edge cases handling

login
register
mail settings
Submitter Peter Maydell
Date March 14, 2011, 12:32 p.m.
Message ID <1300105948-26961-2-git-send-email-peter.maydell@linaro.org>
Download mbox | patch
Permalink /patch/86733/
State New
Headers show

Comments

Peter Maydell - March 14, 2011, 12:32 p.m.
Correct the handling of edge cases for the VRECPS instruction:
 * this is a Neon instruction so uses the "standard FPSCR value"
 * (zero, inf) is a special case which returns 2.0

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 target-arm/helper.c |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

Patch

diff --git a/target-arm/helper.c b/target-arm/helper.c
index d360121..c01a5a2 100644
--- a/target-arm/helper.c
+++ b/target-arm/helper.c
@@ -2707,11 +2707,16 @@  uint32_t HELPER(vfp_fcvt_f32_to_f16)(float32 a, CPUState *env)
     return do_fcvt_f32_to_f16(a, env, &env->vfp.fp_status);
 }
 
+#define float32_two make_float32(0x40000000)
+
 float32 HELPER(recps_f32)(float32 a, float32 b, CPUState *env)
 {
-    float_status *s = &env->vfp.fp_status;
-    float32 two = int32_to_float32(2, s);
-    return float32_sub(two, float32_mul(a, b, s), s);
+    float_status *s = &env->vfp.standard_fp_status;
+    if ((float32_is_infinity(a) && float32_is_zero_or_denormal(b)) ||
+        (float32_is_infinity(b) && float32_is_zero_or_denormal(a))) {
+        return float32_two;
+    }
+    return float32_sub(float32_two, float32_mul(a, b, s), s);
 }
 
 float32 HELPER(rsqrts_f32)(float32 a, float32 b, CPUState *env)