SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fpu: Pass float_status to floatx80_invalid_encoding()

Browse Source 
The definition of which floatx80 encodings are invalid is
target-specific.  Currently we handle this with an ifdef, but we
would like to defer this decision to runtime.  In preparation, pass a
float_status argument to floatx80_invalid_encoding().

We will change the implementation from ifdef to looking at
the status argument in the following commit.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-id: 20250224111524.1101196-7-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2025-02-24 11:15:18 +00:00
parent 44eb32a983
commit 765fe845cc
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fpu/softfloat.c
View File

@ -1810,7 +1810,7 @@ static bool floatx80_unpack_canonical(FloatParts128 *p, floatx80 f,
g_assert_not_reached(); g_assert_not_reached();
} }
if (unlikely(floatx80_invalid_encoding(f))) { if (unlikely(floatx80_invalid_encoding(f, s))) {
float_raise(float_flag_invalid, s); float_raise(float_flag_invalid, s);
return false; return false;
} }

2
include/fpu/softfloat.h
View File

@ -1081,7 +1081,7 @@ static inline bool floatx80_unordered_quiet(floatx80 a, floatx80 b,
| pseudo-denormals, which must still be correctly handled as inputs even | pseudo-denormals, which must still be correctly handled as inputs even
| if they are never generated as outputs. | if they are never generated as outputs.
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
static inline bool floatx80_invalid_encoding(floatx80 a) static inline bool floatx80_invalid_encoding(floatx80 a, float_status *s)
{ {
#if defined(TARGET_M68K) #if defined(TARGET_M68K)
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------

24
target/i386/tcg/fpu_helper.c
View File

@ -1141,7 +1141,7 @@ void helper_f2xm1(CPUX86State *env)
int32_t exp = extractFloatx80Exp(ST0); int32_t exp = extractFloatx80Exp(ST0);
bool sign = extractFloatx80Sign(ST0); bool sign = extractFloatx80Sign(ST0);
if (floatx80_invalid_encoding(ST0)) { if (floatx80_invalid_encoding(ST0, &env->fp_status)) {
float_raise(float_flag_invalid, &env->fp_status); float_raise(float_flag_invalid, &env->fp_status);
ST0 = floatx80_default_nan(&env->fp_status); ST0 = floatx80_default_nan(&env->fp_status);
} else if (floatx80_is_any_nan(ST0)) { } else if (floatx80_is_any_nan(ST0)) {
@ -1383,8 +1383,8 @@ void helper_fpatan(CPUX86State *env)
} else if (floatx80_is_signaling_nan(ST1, &env->fp_status)) { } else if (floatx80_is_signaling_nan(ST1, &env->fp_status)) {
float_raise(float_flag_invalid, &env->fp_status); float_raise(float_flag_invalid, &env->fp_status);
ST1 = floatx80_silence_nan(ST1, &env->fp_status); ST1 = floatx80_silence_nan(ST1, &env->fp_status);
} else if (floatx80_invalid_encoding(ST0) || } else if (floatx80_invalid_encoding(ST0, &env->fp_status) ||
floatx80_invalid_encoding(ST1)) { floatx80_invalid_encoding(ST1, &env->fp_status)) {
float_raise(float_flag_invalid, &env->fp_status); float_raise(float_flag_invalid, &env->fp_status);
ST1 = floatx80_default_nan(&env->fp_status); ST1 = floatx80_default_nan(&env->fp_status);
} else if (floatx80_is_any_nan(ST0)) { } else if (floatx80_is_any_nan(ST0)) {
@ -1819,7 +1819,7 @@ void helper_fxtract(CPUX86State *env)
&env->fp_status); &env->fp_status);
fpush(env); fpush(env);
ST0 = temp.d; ST0 = temp.d;
} else if (floatx80_invalid_encoding(ST0)) { } else if (floatx80_invalid_encoding(ST0, &env->fp_status)) {
float_raise(float_flag_invalid, &env->fp_status); float_raise(float_flag_invalid, &env->fp_status);
ST0 = floatx80_default_nan(&env->fp_status); ST0 = floatx80_default_nan(&env->fp_status);
fpush(env); fpush(env);
@ -1870,7 +1870,8 @@ static void helper_fprem_common(CPUX86State *env, bool mod)
env->fpus &= ~0x4700; /* (C3,C2,C1,C0) <-- 0000 */ env->fpus &= ~0x4700; /* (C3,C2,C1,C0) <-- 0000 */
if (floatx80_is_zero(ST0) || floatx80_is_zero(ST1) || if (floatx80_is_zero(ST0) || floatx80_is_zero(ST1) ||
exp0 == 0x7fff || exp1 == 0x7fff || exp0 == 0x7fff || exp1 == 0x7fff ||
floatx80_invalid_encoding(ST0) || floatx80_invalid_encoding(ST1)) { floatx80_invalid_encoding(ST0, &env->fp_status) ||
floatx80_invalid_encoding(ST1, &env->fp_status)) {
ST0 = floatx80_modrem(ST0, ST1, mod, &quotient, &env->fp_status); ST0 = floatx80_modrem(ST0, ST1, mod, &quotient, &env->fp_status);
} else { } else {
if (exp0 == 0) { if (exp0 == 0) {
@ -2066,8 +2067,8 @@ void helper_fyl2xp1(CPUX86State *env)
} else if (floatx80_is_signaling_nan(ST1, &env->fp_status)) { } else if (floatx80_is_signaling_nan(ST1, &env->fp_status)) {
float_raise(float_flag_invalid, &env->fp_status); float_raise(float_flag_invalid, &env->fp_status);
ST1 = floatx80_silence_nan(ST1, &env->fp_status); ST1 = floatx80_silence_nan(ST1, &env->fp_status);
} else if (floatx80_invalid_encoding(ST0) || } else if (floatx80_invalid_encoding(ST0, &env->fp_status) ||
floatx80_invalid_encoding(ST1)) { floatx80_invalid_encoding(ST1, &env->fp_status)) {
float_raise(float_flag_invalid, &env->fp_status); float_raise(float_flag_invalid, &env->fp_status);
ST1 = floatx80_default_nan(&env->fp_status); ST1 = floatx80_default_nan(&env->fp_status);
} else if (floatx80_is_any_nan(ST0)) { } else if (floatx80_is_any_nan(ST0)) {
@ -2164,8 +2165,8 @@ void helper_fyl2x(CPUX86State *env)
} else if (floatx80_is_signaling_nan(ST1, &env->fp_status)) { } else if (floatx80_is_signaling_nan(ST1, &env->fp_status)) {
float_raise(float_flag_invalid, &env->fp_status); float_raise(float_flag_invalid, &env->fp_status);
ST1 = floatx80_silence_nan(ST1, &env->fp_status); ST1 = floatx80_silence_nan(ST1, &env->fp_status);
} else if (floatx80_invalid_encoding(ST0) || } else if (floatx80_invalid_encoding(ST0, &env->fp_status) ||
floatx80_invalid_encoding(ST1)) { floatx80_invalid_encoding(ST1, &env->fp_status)) {
float_raise(float_flag_invalid, &env->fp_status); float_raise(float_flag_invalid, &env->fp_status);
ST1 = floatx80_default_nan(&env->fp_status); ST1 = floatx80_default_nan(&env->fp_status);
} else if (floatx80_is_any_nan(ST0)) { } else if (floatx80_is_any_nan(ST0)) {
@ -2331,7 +2332,8 @@ void helper_frndint(CPUX86State *env)
void helper_fscale(CPUX86State *env) void helper_fscale(CPUX86State *env)
{ {
uint8_t old_flags = save_exception_flags(env); uint8_t old_flags = save_exception_flags(env);
if (floatx80_invalid_encoding(ST1) || floatx80_invalid_encoding(ST0)) { if (floatx80_invalid_encoding(ST1, &env->fp_status) ||
floatx80_invalid_encoding(ST0, &env->fp_status)) {
float_raise(float_flag_invalid, &env->fp_status); float_raise(float_flag_invalid, &env->fp_status);
ST0 = floatx80_default_nan(&env->fp_status); ST0 = floatx80_default_nan(&env->fp_status);
} else if (floatx80_is_any_nan(ST1)) { } else if (floatx80_is_any_nan(ST1)) {
@ -2344,7 +2346,7 @@ void helper_fscale(CPUX86State *env)
ST0 = floatx80_silence_nan(ST0, &env->fp_status); ST0 = floatx80_silence_nan(ST0, &env->fp_status);
} }
} else if (floatx80_is_infinity(ST1, &env->fp_status) && } else if (floatx80_is_infinity(ST1, &env->fp_status) &&
!floatx80_invalid_encoding(ST0) && !floatx80_invalid_encoding(ST0, &env->fp_status) &&
!floatx80_is_any_nan(ST0)) { !floatx80_is_any_nan(ST0)) {
if (floatx80_is_neg(ST1)) { if (floatx80_is_neg(ST1)) {
if (floatx80_is_infinity(ST0, &env->fp_status)) { if (floatx80_is_infinity(ST0, &env->fp_status)) {