We have, in the past, used any of uint8_t, uint16_t or int
to hold the set of exception flags. Use a typedef instead.
Signed-off-by: Richard Henderson
---
include/fpu/softfloat-helpers.h | 6 --
include/fpu/softfloat-types.h | 4 +++-
include/fpu/softfloat.h | 2 +-
fpu/softfloat.c | 2 +-
fpu/softfloat-parts.c.inc | 7 ---
5 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/include/fpu/softfloat-helpers.h b/include/fpu/softfloat-helpers.h
index 90862f5cd2..745a49f07a 100644
--- a/include/fpu/softfloat-helpers.h
+++ b/include/fpu/softfloat-helpers.h
@@ -64,7 +64,8 @@ static inline void set_float_rounding_mode(FloatRoundMode val,
status->float_rounding_mode = val;
}
-static inline void set_float_exception_flags(int val, float_status *status)
+static inline void
+set_float_exception_flags(FloatExceptionFlags val, float_status *status)
{
status->float_exception_flags = val;
}
@@ -146,7 +147,8 @@ static inline FloatRoundMode get_float_rounding_mode(const
float_status *status)
return status->float_rounding_mode;
}
-static inline int get_float_exception_flags(const float_status *status)
+static inline FloatExceptionFlags
+get_float_exception_flags(const float_status *status)
{
return status->float_exception_flags;
}
diff --git a/include/fpu/softfloat-types.h b/include/fpu/softfloat-types.h
index ead146c22d..5048faa76f 100644
--- a/include/fpu/softfloat-types.h
+++ b/include/fpu/softfloat-types.h
@@ -181,6 +181,8 @@ enum {
float_flag_input_denormal_used = 0x4000,
};
+typedef uint16_t FloatExceptionFlags;
+
/*
* Rounding precision for floatx80.
*/
@@ -385,7 +387,7 @@ typedef enum __attribute__((__packed__)) {
*/
typedef struct float_status {
-uint16_t float_exception_flags;
+FloatExceptionFlags float_exception_flags;
FloatRoundMode float_rounding_mode;
FloatX80RoundPrec floatx80_rounding_precision;
FloatX80Behaviour floatx80_behaviour;
diff --git a/include/fpu/softfloat.h b/include/fpu/softfloat.h
index 1580d956d5..4ae4ddc799 100644
--- a/include/fpu/softfloat.h
+++ b/include/fpu/softfloat.h
@@ -101,7 +101,7 @@ typedef enum {
| Routine to raise any or all of the software IEC/IEEE floating-point
| exception flags.
**/
-static inline void float_raise(uint16_t flags, float_status *status)
+static inline void float_raise(FloatExceptionFlags flags, float_status *status)
{
status->float_exception_flags |= flags;
}
diff --git a/fpu/softfloat.c b/fpu/softfloat.c
index a6ab3ee0f8..9fc0b83cd1 100644
--- a/fpu/softfloat.c
+++ b/fpu/softfloat.c
@@ -2964,7 +2964,7 @@ static int64_t float128_to_int64_scalbn(float128 a,
FloatRoundMode rmode,
static Int128 float128_to_int128_scalbn(float128 a, FloatRoundMode rmode,
int scale, float_status *s)
{
-int flags = 0;
+FloatExceptionFlags flags = 0;
Int128 r;
FloatParts128 p = float128_unpack_canonical(a, s);
diff --git a/fpu/softfloat-parts.c.inc b/fpu/softfloat-parts.c.inc
index 789a41d24e..8253d480f5 100644
--- a/fpu/softfloat-parts.c.inc
+++ b/fpu/softfloat-parts.c.inc
@@ -297,7 +297,8 @@ static void partsN(uncanon_normal)(FloatPartsN *p,
float_status *s,
const uint64_t roundeven_mask = round_mask | frac_lsb;
uint64_t inc;
bool overflow_norm = saturate;
-int exp, flags = 0;
+int exp;
+FloatExceptionFlags flags = 0;
switch (s->float_rounding_mode) {
case float_round_nearest_even_max:
@@ -1265,7 +1266,7 @@ static int64_t partsN(float_to_sint)(FloatPartsN *p,
FloatRoundMode rmode,
int scale, int64_t min, int64_t max,
float_status *s)
{
-int flags = 0;
+FloatExceptionFlags flags = 0;
uint64_t r;
switch (p->cls) {
@@ -1333,7 +1334,7 @@ static int64_t partsN(float_to_sint)(FloatPartsN *p,
FloatRoundMode rmode,
static uint64_t partsN(float_to_uint)(FloatPartsN *p, FloatRoundMode rmode,
int scale, uint64_t max, float_status *s)
{
-int flags = 0;
+FloatExceptionFlags flags = 0;
uint64_t r;
switch (p->cls) {
--
2.43.0
