mirror of
https://github.com/yuzu-emu/unicorn.git
synced 2025-07-07 19:20:41 +00:00
target/arm: Remove floatX_maybe_silence_nan from conversions
This is now handled properly by the generic softfloat code. Backports commit a9d173dc603af74102c24c1c92d479ba580bbf07 from qemu
This commit is contained in:
parent
5e532f6d20
commit
1b6cac4e7e
|
@ -464,7 +464,6 @@ float32 HELPER(fcvtx_f64_to_f32)(float64 a, CPUARMState *env)
|
||||||
set_float_rounding_mode(float_round_to_zero, &tstat);
|
set_float_rounding_mode(float_round_to_zero, &tstat);
|
||||||
set_float_exception_flags(0, &tstat);
|
set_float_exception_flags(0, &tstat);
|
||||||
r = float64_to_float32(a, &tstat);
|
r = float64_to_float32(a, &tstat);
|
||||||
r = float32_maybe_silence_nan(r, &tstat);
|
|
||||||
exflags = get_float_exception_flags(&tstat);
|
exflags = get_float_exception_flags(&tstat);
|
||||||
if (exflags & float_flag_inexact) {
|
if (exflags & float_flag_inexact) {
|
||||||
r = make_float32(float32_val(r) | 1);
|
r = make_float32(float32_val(r) | 1);
|
||||||
|
|
|
@ -10604,20 +10604,12 @@ FLOAT_CONVS(ui, d, 64, u)
|
||||||
/* floating point conversion */
|
/* floating point conversion */
|
||||||
float64 VFP_HELPER(fcvtd, s)(float32 x, CPUARMState *env)
|
float64 VFP_HELPER(fcvtd, s)(float32 x, CPUARMState *env)
|
||||||
{
|
{
|
||||||
float64 r = float32_to_float64(x, &env->vfp.fp_status);
|
return 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, &env->vfp.fp_status);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
float32 VFP_HELPER(fcvts, d)(float64 x, CPUARMState *env)
|
float32 VFP_HELPER(fcvts, d)(float64 x, CPUARMState *env)
|
||||||
{
|
{
|
||||||
float32 r = float64_to_float32(x, &env->vfp.fp_status);
|
return 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, &env->vfp.fp_status);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* VFP3 fixed point conversion. */
|
/* VFP3 fixed point conversion. */
|
||||||
|
|
Loading…
Reference in a new issue