mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-02 15:23:53 -06:00
softfloat: Name rounding mode enum
Give the previously unnamed enum a typedef name. Use the packed attribute so that we do not affect the layout of the float_status struct. Use it in the prototypes of relevant functions. Adjust switch statements as necessary to avoid compiler warnings. Reviewed-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
parent
a828b373bd
commit
3dede407cc
6 changed files with 66 additions and 51 deletions
|
@ -759,6 +759,8 @@ static FloatParts round_canonical(FloatParts p, float_status *s,
|
|||
case float_round_to_odd:
|
||||
inc = frac & frac_lsb ? 0 : round_mask;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
flags |= float_flag_inexact;
|
||||
frac += inc;
|
||||
|
@ -1928,7 +1930,7 @@ float32 float64_to_float32(float64 a, float_status *s)
|
|||
* Arithmetic.
|
||||
*/
|
||||
|
||||
static FloatParts round_to_int(FloatParts a, int rmode,
|
||||
static FloatParts round_to_int(FloatParts a, FloatRoundMode rmode,
|
||||
int scale, float_status *s)
|
||||
{
|
||||
switch (a.cls) {
|
||||
|
@ -2061,8 +2063,8 @@ float64 float64_round_to_int(float64 a, float_status *s)
|
|||
* is returned.
|
||||
*/
|
||||
|
||||
static int64_t round_to_int_and_pack(FloatParts in, int rmode, int scale,
|
||||
int64_t min, int64_t max,
|
||||
static int64_t round_to_int_and_pack(FloatParts in, FloatRoundMode rmode,
|
||||
int scale, int64_t min, int64_t max,
|
||||
float_status *s)
|
||||
{
|
||||
uint64_t r;
|
||||
|
@ -2107,63 +2109,63 @@ static int64_t round_to_int_and_pack(FloatParts in, int rmode, int scale,
|
|||
}
|
||||
}
|
||||
|
||||
int16_t float16_to_int16_scalbn(float16 a, int rmode, int scale,
|
||||
int16_t float16_to_int16_scalbn(float16 a, FloatRoundMode rmode, int scale,
|
||||
float_status *s)
|
||||
{
|
||||
return round_to_int_and_pack(float16_unpack_canonical(a, s),
|
||||
rmode, scale, INT16_MIN, INT16_MAX, s);
|
||||
}
|
||||
|
||||
int32_t float16_to_int32_scalbn(float16 a, int rmode, int scale,
|
||||
int32_t float16_to_int32_scalbn(float16 a, FloatRoundMode rmode, int scale,
|
||||
float_status *s)
|
||||
{
|
||||
return round_to_int_and_pack(float16_unpack_canonical(a, s),
|
||||
rmode, scale, INT32_MIN, INT32_MAX, s);
|
||||
}
|
||||
|
||||
int64_t float16_to_int64_scalbn(float16 a, int rmode, int scale,
|
||||
int64_t float16_to_int64_scalbn(float16 a, FloatRoundMode rmode, int scale,
|
||||
float_status *s)
|
||||
{
|
||||
return round_to_int_and_pack(float16_unpack_canonical(a, s),
|
||||
rmode, scale, INT64_MIN, INT64_MAX, s);
|
||||
}
|
||||
|
||||
int16_t float32_to_int16_scalbn(float32 a, int rmode, int scale,
|
||||
int16_t float32_to_int16_scalbn(float32 a, FloatRoundMode rmode, int scale,
|
||||
float_status *s)
|
||||
{
|
||||
return round_to_int_and_pack(float32_unpack_canonical(a, s),
|
||||
rmode, scale, INT16_MIN, INT16_MAX, s);
|
||||
}
|
||||
|
||||
int32_t float32_to_int32_scalbn(float32 a, int rmode, int scale,
|
||||
int32_t float32_to_int32_scalbn(float32 a, FloatRoundMode rmode, int scale,
|
||||
float_status *s)
|
||||
{
|
||||
return round_to_int_and_pack(float32_unpack_canonical(a, s),
|
||||
rmode, scale, INT32_MIN, INT32_MAX, s);
|
||||
}
|
||||
|
||||
int64_t float32_to_int64_scalbn(float32 a, int rmode, int scale,
|
||||
int64_t float32_to_int64_scalbn(float32 a, FloatRoundMode rmode, int scale,
|
||||
float_status *s)
|
||||
{
|
||||
return round_to_int_and_pack(float32_unpack_canonical(a, s),
|
||||
rmode, scale, INT64_MIN, INT64_MAX, s);
|
||||
}
|
||||
|
||||
int16_t float64_to_int16_scalbn(float64 a, int rmode, int scale,
|
||||
int16_t float64_to_int16_scalbn(float64 a, FloatRoundMode rmode, int scale,
|
||||
float_status *s)
|
||||
{
|
||||
return round_to_int_and_pack(float64_unpack_canonical(a, s),
|
||||
rmode, scale, INT16_MIN, INT16_MAX, s);
|
||||
}
|
||||
|
||||
int32_t float64_to_int32_scalbn(float64 a, int rmode, int scale,
|
||||
int32_t float64_to_int32_scalbn(float64 a, FloatRoundMode rmode, int scale,
|
||||
float_status *s)
|
||||
{
|
||||
return round_to_int_and_pack(float64_unpack_canonical(a, s),
|
||||
rmode, scale, INT32_MIN, INT32_MAX, s);
|
||||
}
|
||||
|
||||
int64_t float64_to_int64_scalbn(float64 a, int rmode, int scale,
|
||||
int64_t float64_to_int64_scalbn(float64 a, FloatRoundMode rmode, int scale,
|
||||
float_status *s)
|
||||
{
|
||||
return round_to_int_and_pack(float64_unpack_canonical(a, s),
|
||||
|
@ -2273,8 +2275,9 @@ int64_t float64_to_int64_round_to_zero(float64 a, float_status *s)
|
|||
* flag.
|
||||
*/
|
||||
|
||||
static uint64_t round_to_uint_and_pack(FloatParts in, int rmode, int scale,
|
||||
uint64_t max, float_status *s)
|
||||
static uint64_t round_to_uint_and_pack(FloatParts in, FloatRoundMode rmode,
|
||||
int scale, uint64_t max,
|
||||
float_status *s)
|
||||
{
|
||||
int orig_flags = get_float_exception_flags(s);
|
||||
FloatParts p = round_to_int(in, rmode, scale, s);
|
||||
|
@ -2319,63 +2322,63 @@ static uint64_t round_to_uint_and_pack(FloatParts in, int rmode, int scale,
|
|||
}
|
||||
}
|
||||
|
||||
uint16_t float16_to_uint16_scalbn(float16 a, int rmode, int scale,
|
||||
uint16_t float16_to_uint16_scalbn(float16 a, FloatRoundMode rmode, int scale,
|
||||
float_status *s)
|
||||
{
|
||||
return round_to_uint_and_pack(float16_unpack_canonical(a, s),
|
||||
rmode, scale, UINT16_MAX, s);
|
||||
}
|
||||
|
||||
uint32_t float16_to_uint32_scalbn(float16 a, int rmode, int scale,
|
||||
uint32_t float16_to_uint32_scalbn(float16 a, FloatRoundMode rmode, int scale,
|
||||
float_status *s)
|
||||
{
|
||||
return round_to_uint_and_pack(float16_unpack_canonical(a, s),
|
||||
rmode, scale, UINT32_MAX, s);
|
||||
}
|
||||
|
||||
uint64_t float16_to_uint64_scalbn(float16 a, int rmode, int scale,
|
||||
uint64_t float16_to_uint64_scalbn(float16 a, FloatRoundMode rmode, int scale,
|
||||
float_status *s)
|
||||
{
|
||||
return round_to_uint_and_pack(float16_unpack_canonical(a, s),
|
||||
rmode, scale, UINT64_MAX, s);
|
||||
}
|
||||
|
||||
uint16_t float32_to_uint16_scalbn(float32 a, int rmode, int scale,
|
||||
uint16_t float32_to_uint16_scalbn(float32 a, FloatRoundMode rmode, int scale,
|
||||
float_status *s)
|
||||
{
|
||||
return round_to_uint_and_pack(float32_unpack_canonical(a, s),
|
||||
rmode, scale, UINT16_MAX, s);
|
||||
}
|
||||
|
||||
uint32_t float32_to_uint32_scalbn(float32 a, int rmode, int scale,
|
||||
uint32_t float32_to_uint32_scalbn(float32 a, FloatRoundMode rmode, int scale,
|
||||
float_status *s)
|
||||
{
|
||||
return round_to_uint_and_pack(float32_unpack_canonical(a, s),
|
||||
rmode, scale, UINT32_MAX, s);
|
||||
}
|
||||
|
||||
uint64_t float32_to_uint64_scalbn(float32 a, int rmode, int scale,
|
||||
uint64_t float32_to_uint64_scalbn(float32 a, FloatRoundMode rmode, int scale,
|
||||
float_status *s)
|
||||
{
|
||||
return round_to_uint_and_pack(float32_unpack_canonical(a, s),
|
||||
rmode, scale, UINT64_MAX, s);
|
||||
}
|
||||
|
||||
uint16_t float64_to_uint16_scalbn(float64 a, int rmode, int scale,
|
||||
uint16_t float64_to_uint16_scalbn(float64 a, FloatRoundMode rmode, int scale,
|
||||
float_status *s)
|
||||
{
|
||||
return round_to_uint_and_pack(float64_unpack_canonical(a, s),
|
||||
rmode, scale, UINT16_MAX, s);
|
||||
}
|
||||
|
||||
uint32_t float64_to_uint32_scalbn(float64 a, int rmode, int scale,
|
||||
uint32_t float64_to_uint32_scalbn(float64 a, FloatRoundMode rmode, int scale,
|
||||
float_status *s)
|
||||
{
|
||||
return round_to_uint_and_pack(float64_unpack_canonical(a, s),
|
||||
rmode, scale, UINT32_MAX, s);
|
||||
}
|
||||
|
||||
uint64_t float64_to_uint64_scalbn(float64 a, int rmode, int scale,
|
||||
uint64_t float64_to_uint64_scalbn(float64 a, FloatRoundMode rmode, int scale,
|
||||
float_status *s)
|
||||
{
|
||||
return round_to_uint_and_pack(float64_unpack_canonical(a, s),
|
||||
|
@ -5715,6 +5718,11 @@ floatx80 floatx80_round_to_int(floatx80 a, float_status *status)
|
|||
return
|
||||
aSign ? packFloatx80( 1, 0, 0 )
|
||||
: packFloatx80( 0, 0x3FFF, UINT64_C(0x8000000000000000));
|
||||
|
||||
case float_round_to_zero:
|
||||
break;
|
||||
default:
|
||||
g_assert_not_reached();
|
||||
}
|
||||
return packFloatx80( aSign, 0, 0 );
|
||||
}
|
||||
|
@ -7047,6 +7055,9 @@ float128 float128_round_to_int(float128 a, float_status *status)
|
|||
|
||||
case float_round_to_odd:
|
||||
return packFloat128(aSign, 0x3FFF, 0, 0);
|
||||
|
||||
case float_round_to_zero:
|
||||
break;
|
||||
}
|
||||
return packFloat128( aSign, 0, 0, 0 );
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue