Use parts{64,128}_uncanon at each call site.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
fpu/softfloat.c | 44 ++++++++++++++++++--------------------------
1 file changed, 18 insertions(+), 26 deletions(-)
diff --git a/fpu/softfloat.c b/fpu/softfloat.c
index f9997f5236..7c13a7848e 100644
--- a/fpu/softfloat.c
+++ b/fpu/softfloat.c
@@ -814,14 +814,6 @@ static void parts128_uncanon_normal(FloatParts128 *p, float_status *status,
#define parts_uncanon_normal(A, S, F, X) \
PARTS_GENERIC_64_128(uncanon_normal, A)(A, S, F, X)
-static void parts64_uncanon(FloatParts64 *p, float_status *status,
- const FloatFmt *fmt, bool saturate);
-static void parts128_uncanon(FloatParts128 *p, float_status *status,
- const FloatFmt *fmt, bool saturate);
-
-#define parts_uncanon(A, S, F, X) \
- PARTS_GENERIC_64_128(uncanon, A)(A, S, F, X)
-
static void parts64_add_normal(FloatParts64 *a, FloatParts64 *b);
static void parts128_add_normal(FloatParts128 *a, FloatParts128 *b);
static void parts256_add_normal(FloatParts256 *a, FloatParts256 *b);
@@ -1756,7 +1748,7 @@ static float8_e4m3 float8_e4m3_round_pack_canonical(FloatParts64 *p,
float_status *s,
bool saturate)
{
- parts_uncanon(p, s, &float8_e4m3_params, saturate);
+ parts64_uncanon(p, s, &float8_e4m3_params, saturate);
return float8_e4m3_pack_raw(p);
}
@@ -1764,7 +1756,7 @@ static float8_e5m2 float8_e5m2_round_pack_canonical(FloatParts64 *p,
float_status *s,
bool saturate)
{
- parts_uncanon(p, s, &float8_e5m2_params, saturate);
+ parts64_uncanon(p, s, &float8_e5m2_params, saturate);
return float8_e5m2_pack_raw(p);
}
@@ -1772,7 +1764,7 @@ static float16 float16a_round_pack_canonical(FloatParts64 *p,
float_status *s,
const FloatFmt *params)
{
- parts_uncanon(p, s, params, false);
+ parts64_uncanon(p, s, params, false);
return float16_pack_raw(p);
}
@@ -1785,7 +1777,7 @@ static float16 float16_round_pack_canonical(FloatParts64 *p,
static bfloat16 bfloat16_round_pack_canonical(FloatParts64 *p,
float_status *s)
{
- parts_uncanon(p, s, &bfloat16_params, false);
+ parts64_uncanon(p, s, &bfloat16_params, false);
return bfloat16_pack_raw(p);
}
@@ -1799,7 +1791,7 @@ static void float32_unpack_canonical(FloatParts64 *p, float32 f,
static float32 float32_round_pack_canonical(FloatParts64 *p,
float_status *s)
{
- parts_uncanon(p, s, &float32_params, false);
+ parts64_uncanon(p, s, &float32_params, false);
return float32_pack_raw(p);
}
@@ -1813,14 +1805,14 @@ static void float64_unpack_canonical(FloatParts64 *p, float64 f,
static float64 float64_round_pack_canonical(FloatParts64 *p,
float_status *s)
{
- parts_uncanon(p, s, &float64_params, false);
+ parts64_uncanon(p, s, &float64_params, false);
return float64_pack_raw(p);
}
static float64 float64r32_pack_raw(FloatParts64 *p)
{
/*
- * In parts_uncanon, we placed the fraction for float32 at the lsb.
+ * In parts64_uncanon, we placed the fraction for float32 at the lsb.
* We need to adjust the fraction higher so that the least N bits are
* zero, and the fraction is adjacent to the float64 implicit bit.
*/
@@ -1862,7 +1854,7 @@ static float64 float64r32_pack_raw(FloatParts64 *p)
static float64 float64r32_round_pack_canonical(FloatParts64 *p,
float_status *s)
{
- parts_uncanon(p, s, &float32_params, false);
+ parts64_uncanon(p, s, &float32_params, false);
return float64r32_pack_raw(p);
}
@@ -1876,7 +1868,7 @@ static void float128_unpack_canonical(FloatParts128 *p, float128 f,
static float128 float128_round_pack_canonical(FloatParts128 *p,
float_status *s)
{
- parts_uncanon(p, s, &float128_params, false);
+ parts128_uncanon(p, s, &float128_params, false);
return float128_pack_raw(p);
}
@@ -1924,7 +1916,7 @@ static floatx80 floatx80_round_pack_canonical(FloatParts128 *p,
case float_class_normal:
case float_class_denormal:
if (s->floatx80_rounding_precision == floatx80_precision_x) {
- parts_uncanon_normal(p, s, fmt, false);
+ parts128_uncanon_normal(p, s, fmt, false);
frac = p->frac_hi;
exp = p->exp;
} else {
@@ -1933,7 +1925,7 @@ static floatx80 floatx80_round_pack_canonical(FloatParts128 *p,
p64.sign = p->sign;
p64.exp = p->exp;
frac_truncjam(&p64, p);
- parts_uncanon_normal(&p64, s, fmt, false);
+ parts64_uncanon_normal(&p64, s, fmt, false);
frac = p64.frac;
exp = p64.exp;
}
@@ -2331,7 +2323,7 @@ float16_muladd_scalbn(float16 a, float16 b, float16 c,
pr = parts_muladd_scalbn(&pa, &pb, &pc, scale, flags, status);
/* Round before applying negate result. */
- parts_uncanon(pr, status, &float16_params, false);
+ parts64_uncanon(pr, status, &float16_params, false);
if ((flags & float_muladd_negate_result) && !is_nan(pr->cls)) {
pr->sign ^= 1;
}
@@ -2356,7 +2348,7 @@ float32_muladd_scalbn(float32 a, float32 b, float32 c,
pr = parts_muladd_scalbn(&pa, &pb, &pc, scale, flags, status);
/* Round before applying negate result. */
- parts_uncanon(pr, status, &float32_params, false);
+ parts64_uncanon(pr, status, &float32_params, false);
if ((flags & float_muladd_negate_result) && !is_nan(pr->cls)) {
pr->sign ^= 1;
}
@@ -2375,7 +2367,7 @@ float64_muladd_scalbn(float64 a, float64 b, float64 c,
pr = parts_muladd_scalbn(&pa, &pb, &pc, scale, flags, status);
/* Round before applying negate result. */
- parts_uncanon(pr, status, &float64_params, false);
+ parts64_uncanon(pr, status, &float64_params, false);
if ((flags & float_muladd_negate_result) && !is_nan(pr->cls)) {
pr->sign ^= 1;
}
@@ -2534,7 +2526,7 @@ float64 float64r32_muladd(float64 a, float64 b, float64 c,
pr = parts_muladd_scalbn(&pa, &pb, &pc, 0, flags, status);
/* Round before applying negate result. */
- parts_uncanon(pr, status, &float32_params, false);
+ parts64_uncanon(pr, status, &float32_params, false);
if ((flags & float_muladd_negate_result) && !is_nan(pr->cls)) {
pr->sign ^= 1;
}
@@ -2552,7 +2544,7 @@ bfloat16 QEMU_FLATTEN bfloat16_muladd(bfloat16 a, bfloat16 b, bfloat16 c,
pr = parts_muladd_scalbn(&pa, &pb, &pc, 0, flags, status);
/* Round before applying negate result. */
- parts_uncanon(pr, status, &bfloat16_params, false);
+ parts64_uncanon(pr, status, &bfloat16_params, false);
if ((flags & float_muladd_negate_result) && !is_nan(pr->cls)) {
pr->sign ^= 1;
}
@@ -2570,7 +2562,7 @@ float128 QEMU_FLATTEN float128_muladd(float128 a, float128 b, float128 c,
pr = parts_muladd_scalbn(&pa, &pb, &pc, 0, flags, status);
/* Round before applying negate result. */
- parts_uncanon(pr, status, &float128_params, false);
+ parts128_uncanon(pr, status, &float128_params, false);
if ((flags & float_muladd_negate_result) && !is_nan(pr->cls)) {
pr->sign ^= 1;
}
@@ -5600,7 +5592,7 @@ static void parts_s390_divide_to_integer(FloatParts64 *a, FloatParts64 *b,
/* Round remainder to the target format */
*r = *r_precise;
status->float_exception_flags = 0;
- parts_uncanon(r, status, fmt, false);
+ parts64_uncanon(r, status, fmt, false);
r_flags = status->float_exception_flags;
r->frac &= (1ULL << fmt->frac_size) - 1;
parts64_canonicalize(r, status, fmt);
--
2.43.0