[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 5/8] ARM: Return correct result for single<->double
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PATCH 5/8] ARM: Return correct result for single<->double conversion of NaN |
Date: |
Thu, 11 Nov 2010 18:23:59 +0000 |
The ARM ARM defines that if the input to a single<->double conversion
is a NaN then the output is always forced to be a quiet NaN by setting
the most significant bit of the fraction part.
Signed-off-by: Peter Maydell <address@hidden>
---
target-arm/helper.c | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/target-arm/helper.c b/target-arm/helper.c
index 72ba314..628094f 100644
--- a/target-arm/helper.c
+++ b/target-arm/helper.c
@@ -2529,12 +2529,28 @@ float32 VFP_HELPER(tosiz, d)(float64 x, CPUState *env)
/* floating point conversion */
float64 VFP_HELPER(fcvtd, s)(float32 x, CPUState *env)
{
- return float32_to_float64(x, &env->vfp.fp_status);
+ float64 r = float32_to_float64(x, &env->vfp.fp_status);
+ /* ARM requires that S<->D conversion of any kind of NaN generates
+ * a quiet NaN by forcing the most significant frac bit to 1.
+ */
+ if (float64_is_signaling_nan(r))
+ {
+ return make_float64(float64_val(r) | (1LL << 51));
+ }
+ return r;
}
float32 VFP_HELPER(fcvts, d)(float64 x, CPUState *env)
{
- return float64_to_float32(x, &env->vfp.fp_status);
+ float32 r = float64_to_float32(x, &env->vfp.fp_status);
+ /* ARM requires that S<->D conversion of any kind of NaN generates
+ * a quiet NaN by forcing the most significant frac bit to 1.
+ */
+ if (float32_is_signaling_nan(r))
+ {
+ return make_float32(float32_val(r) | (1 << 22));
+ }
+ return r;
}
/* VFP3 fixed point conversion. */
--
1.7.1
- [Qemu-devel] [PATCH 0/8] ARM: fix VCVT instructions, Peter Maydell, 2010/11/11
- [Qemu-devel] [PATCH 1/8] ARM: Fix decoding of VFP forms of VCVT between float and int/fixed, Peter Maydell, 2010/11/11
- [Qemu-devel] [PATCH 6/8] ARM: Ignore top 16 bits when doing VCVT from 16 bit fixed point, Peter Maydell, 2010/11/11
- [Qemu-devel] [PATCH 7/8] softfloat: Add float/double to 16 bit integer conversion functions, Peter Maydell, 2010/11/11
- [Qemu-devel] [PATCH 2/8] ARM: Fix decoding of Neon forms of VCVT between float and fixed point, Peter Maydell, 2010/11/11
- [Qemu-devel] [PATCH 4/8] ARM: Return correct result for float-to-integer conversion of NaN, Peter Maydell, 2010/11/11
- [Qemu-devel] [PATCH 5/8] ARM: Return correct result for single<->double conversion of NaN,
Peter Maydell <=
- [Qemu-devel] [PATCH 3/8] ARM: Fix sense of to_integer bit in Neon VCVT float/int conversion, Peter Maydell, 2010/11/11
- [Qemu-devel] [PATCH 8/8] ARM: Implement VCVT to 16 bit integer using new softfloat routines, Peter Maydell, 2010/11/11