target/rx: Explicitly set 2-NaN propagation rule

Set the NaN propagation rule explicitly for the float_status word
used in the rx target.

This not the architecturally correct behaviour, but since this is a
no-behaviour-change patch, we leave a TODO note to that effect.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20241025141254.2141506-21-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2024-11-05 10:09:57 +00:00
parent 355e6cfb94
commit ba6558461c
2 changed files with 9 additions and 1 deletions

View File

@ -407,7 +407,8 @@ static int pickNaN(FloatClass a_cls, FloatClass b_cls,
|| defined(TARGET_S390X) || defined(TARGET_PPC) || defined(TARGET_M68K) \ || defined(TARGET_S390X) || defined(TARGET_PPC) || defined(TARGET_M68K) \
|| defined(TARGET_SPARC) || defined(TARGET_XTENSA) \ || defined(TARGET_SPARC) || defined(TARGET_XTENSA) \
|| defined(TARGET_I386) || defined(TARGET_ALPHA) \ || defined(TARGET_I386) || defined(TARGET_ALPHA) \
|| defined(TARGET_MICROBLAZE) || defined(TARGET_OPENRISC) || defined(TARGET_MICROBLAZE) || defined(TARGET_OPENRISC) \
|| defined(TARGET_RX)
g_assert_not_reached(); g_assert_not_reached();
#else #else
rule = float_2nan_prop_x87; rule = float_2nan_prop_x87;

View File

@ -93,6 +93,13 @@ static void rx_cpu_reset_hold(Object *obj, ResetType type)
env->fpsw = 0; env->fpsw = 0;
set_flush_to_zero(1, &env->fp_status); set_flush_to_zero(1, &env->fp_status);
set_flush_inputs_to_zero(1, &env->fp_status); set_flush_inputs_to_zero(1, &env->fp_status);
/*
* TODO: this is not the correct NaN propagation rule for this
* architecture. The "RX Family User's Manual: Software" table 1.6
* defines the propagation rules as "prefer SNaN over QNaN;
* then prefer dest over source", which is float_2nan_prop_s_ab.
*/
set_float_2nan_prop_rule(float_2nan_prop_x87, &env->fp_status);
} }
static ObjectClass *rx_cpu_class_by_name(const char *cpu_model) static ObjectClass *rx_cpu_class_by_name(const char *cpu_model)