ARM: Return correct result for single<->double conversion of NaN

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 <peter.maydell@linaro.org>
Reviewed-by: Nathan Froyd <froydnj@codesourcery.com>
This commit is contained in:
Peter Maydell 2010-12-07 15:37:34 +00:00
parent b408dbdec3
commit 2d6277373d

View File

@ -2528,12 +2528,20 @@ float32 VFP_HELPER(tosiz, d)(float64 x, CPUState *env)
/* floating point conversion */ /* floating point conversion */
float64 VFP_HELPER(fcvtd, s)(float32 x, CPUState *env) 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.
*/
return float64_maybe_silence_nan(r);
} }
float32 VFP_HELPER(fcvts, d)(float64 x, CPUState *env) 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.
*/
return float32_maybe_silence_nan(r);
} }
/* VFP3 fixed point conversion. */ /* VFP3 fixed point conversion. */