target/arm: Use the float-to-int-scale softfloat routines
Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Message-id: 20180814002653.12828-5-richard.henderson@linaro.org Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
parent
b9b903cf24
commit
323cd49084
|
@ -11566,38 +11566,28 @@ float##fsz HELPER(vfp_##name##to##p)(uint##isz##_t x, uint32_t shift, \
|
||||||
void *fpstp) \
|
void *fpstp) \
|
||||||
{ return itype##_to_##float##fsz##_scalbn(x, -shift, fpstp); }
|
{ return itype##_to_##float##fsz##_scalbn(x, -shift, fpstp); }
|
||||||
|
|
||||||
/* Notice that we want only input-denormal exception flags from the
|
#define VFP_CONV_FLOAT_FIX_ROUND(name, p, fsz, isz, itype, ROUND, suff) \
|
||||||
* scalbn operation: the other possible flags (overflow+inexact if
|
uint##isz##_t HELPER(vfp_to##name##p##suff)(float##fsz x, uint32_t shift, \
|
||||||
* we overflow to infinity, output-denormal) aren't correct for the
|
void *fpst) \
|
||||||
* complete scale-and-convert operation.
|
{ \
|
||||||
*/
|
if (unlikely(float##fsz##_is_any_nan(x))) { \
|
||||||
#define VFP_CONV_FLOAT_FIX_ROUND(name, p, fsz, isz, itype, round) \
|
float_raise(float_flag_invalid, fpst); \
|
||||||
uint##isz##_t HELPER(vfp_to##name##p##round)(float##fsz x, \
|
return 0; \
|
||||||
uint32_t shift, \
|
} \
|
||||||
void *fpstp) \
|
return float##fsz##_to_##itype##_scalbn(x, ROUND, shift, fpst); \
|
||||||
{ \
|
|
||||||
float_status *fpst = fpstp; \
|
|
||||||
int old_exc_flags = get_float_exception_flags(fpst); \
|
|
||||||
float##fsz tmp; \
|
|
||||||
if (float##fsz##_is_any_nan(x)) { \
|
|
||||||
float_raise(float_flag_invalid, fpst); \
|
|
||||||
return 0; \
|
|
||||||
} \
|
|
||||||
tmp = float##fsz##_scalbn(x, shift, fpst); \
|
|
||||||
old_exc_flags |= get_float_exception_flags(fpst) \
|
|
||||||
& float_flag_input_denormal; \
|
|
||||||
set_float_exception_flags(old_exc_flags, fpst); \
|
|
||||||
return float##fsz##_to_##itype##round(tmp, fpst); \
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#define VFP_CONV_FIX(name, p, fsz, isz, itype) \
|
#define VFP_CONV_FIX(name, p, fsz, isz, itype) \
|
||||||
VFP_CONV_FIX_FLOAT(name, p, fsz, isz, itype) \
|
VFP_CONV_FIX_FLOAT(name, p, fsz, isz, itype) \
|
||||||
VFP_CONV_FLOAT_FIX_ROUND(name, p, fsz, isz, itype, _round_to_zero) \
|
VFP_CONV_FLOAT_FIX_ROUND(name, p, fsz, isz, itype, \
|
||||||
VFP_CONV_FLOAT_FIX_ROUND(name, p, fsz, isz, itype, )
|
float_round_to_zero, _round_to_zero) \
|
||||||
|
VFP_CONV_FLOAT_FIX_ROUND(name, p, fsz, isz, itype, \
|
||||||
|
get_float_rounding_mode(fpst), )
|
||||||
|
|
||||||
#define VFP_CONV_FIX_A64(name, p, fsz, isz, itype) \
|
#define VFP_CONV_FIX_A64(name, p, fsz, isz, itype) \
|
||||||
VFP_CONV_FIX_FLOAT(name, p, fsz, isz, itype) \
|
VFP_CONV_FIX_FLOAT(name, p, fsz, isz, itype) \
|
||||||
VFP_CONV_FLOAT_FIX_ROUND(name, p, fsz, isz, itype, )
|
VFP_CONV_FLOAT_FIX_ROUND(name, p, fsz, isz, itype, \
|
||||||
|
get_float_rounding_mode(fpst), )
|
||||||
|
|
||||||
VFP_CONV_FIX(sh, d, 64, 64, int16)
|
VFP_CONV_FIX(sh, d, 64, 64, int16)
|
||||||
VFP_CONV_FIX(sl, d, 64, 64, int32)
|
VFP_CONV_FIX(sl, d, 64, 64, int32)
|
||||||
|
@ -11637,53 +11627,64 @@ uint32_t HELPER(vfp_uqtoh)(uint64_t x, uint32_t shift, void *fpst)
|
||||||
return uint64_to_float16_scalbn(x, -shift, fpst);
|
return uint64_to_float16_scalbn(x, -shift, fpst);
|
||||||
}
|
}
|
||||||
|
|
||||||
static float64 do_prescale_fp16(float16 f, int shift, float_status *fpst)
|
|
||||||
{
|
|
||||||
if (unlikely(float16_is_any_nan(f))) {
|
|
||||||
float_raise(float_flag_invalid, fpst);
|
|
||||||
return 0;
|
|
||||||
} else {
|
|
||||||
int old_exc_flags = get_float_exception_flags(fpst);
|
|
||||||
float64 ret;
|
|
||||||
|
|
||||||
ret = float16_to_float64(f, true, fpst);
|
|
||||||
ret = float64_scalbn(ret, shift, fpst);
|
|
||||||
old_exc_flags |= get_float_exception_flags(fpst)
|
|
||||||
& float_flag_input_denormal;
|
|
||||||
set_float_exception_flags(old_exc_flags, fpst);
|
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
uint32_t HELPER(vfp_toshh)(uint32_t x, uint32_t shift, void *fpst)
|
uint32_t HELPER(vfp_toshh)(uint32_t x, uint32_t shift, void *fpst)
|
||||||
{
|
{
|
||||||
return float64_to_int16(do_prescale_fp16(x, shift, fpst), fpst);
|
if (unlikely(float16_is_any_nan(x))) {
|
||||||
|
float_raise(float_flag_invalid, fpst);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
return float16_to_int16_scalbn(x, get_float_rounding_mode(fpst),
|
||||||
|
shift, fpst);
|
||||||
}
|
}
|
||||||
|
|
||||||
uint32_t HELPER(vfp_touhh)(uint32_t x, uint32_t shift, void *fpst)
|
uint32_t HELPER(vfp_touhh)(uint32_t x, uint32_t shift, void *fpst)
|
||||||
{
|
{
|
||||||
return float64_to_uint16(do_prescale_fp16(x, shift, fpst), fpst);
|
if (unlikely(float16_is_any_nan(x))) {
|
||||||
|
float_raise(float_flag_invalid, fpst);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
return float16_to_uint16_scalbn(x, get_float_rounding_mode(fpst),
|
||||||
|
shift, fpst);
|
||||||
}
|
}
|
||||||
|
|
||||||
uint32_t HELPER(vfp_toslh)(uint32_t x, uint32_t shift, void *fpst)
|
uint32_t HELPER(vfp_toslh)(uint32_t x, uint32_t shift, void *fpst)
|
||||||
{
|
{
|
||||||
return float64_to_int32(do_prescale_fp16(x, shift, fpst), fpst);
|
if (unlikely(float16_is_any_nan(x))) {
|
||||||
|
float_raise(float_flag_invalid, fpst);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
return float16_to_int32_scalbn(x, get_float_rounding_mode(fpst),
|
||||||
|
shift, fpst);
|
||||||
}
|
}
|
||||||
|
|
||||||
uint32_t HELPER(vfp_toulh)(uint32_t x, uint32_t shift, void *fpst)
|
uint32_t HELPER(vfp_toulh)(uint32_t x, uint32_t shift, void *fpst)
|
||||||
{
|
{
|
||||||
return float64_to_uint32(do_prescale_fp16(x, shift, fpst), fpst);
|
if (unlikely(float16_is_any_nan(x))) {
|
||||||
|
float_raise(float_flag_invalid, fpst);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
return float16_to_uint32_scalbn(x, get_float_rounding_mode(fpst),
|
||||||
|
shift, fpst);
|
||||||
}
|
}
|
||||||
|
|
||||||
uint64_t HELPER(vfp_tosqh)(uint32_t x, uint32_t shift, void *fpst)
|
uint64_t HELPER(vfp_tosqh)(uint32_t x, uint32_t shift, void *fpst)
|
||||||
{
|
{
|
||||||
return float64_to_int64(do_prescale_fp16(x, shift, fpst), fpst);
|
if (unlikely(float16_is_any_nan(x))) {
|
||||||
|
float_raise(float_flag_invalid, fpst);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
return float16_to_int64_scalbn(x, get_float_rounding_mode(fpst),
|
||||||
|
shift, fpst);
|
||||||
}
|
}
|
||||||
|
|
||||||
uint64_t HELPER(vfp_touqh)(uint32_t x, uint32_t shift, void *fpst)
|
uint64_t HELPER(vfp_touqh)(uint32_t x, uint32_t shift, void *fpst)
|
||||||
{
|
{
|
||||||
return float64_to_uint64(do_prescale_fp16(x, shift, fpst), fpst);
|
if (unlikely(float16_is_any_nan(x))) {
|
||||||
|
float_raise(float_flag_invalid, fpst);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
return float16_to_uint64_scalbn(x, get_float_rounding_mode(fpst),
|
||||||
|
shift, fpst);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Set the current fp rounding mode and return the old one.
|
/* Set the current fp rounding mode and return the old one.
|
||||||
|
|
Loading…
Reference in a new issue