friedkiwi/qemu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fpu: Return struct from parts{64,128}_addsub

Browse Source 
At the same time, export.

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson
2026-04-26 17:09:52 +10:00
parent e007622768
commit 24b46e7bb7
3 changed files with 43 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
fpu/softfloat-parts.c.inc
View File

@@ -524,11 +524,11 @@ static void partsN(uncanon)(FloatPartsN *p, float_status *s,
* according to the IEC/IEEE Standard for Binary Floating-Point
* Arithmetic.
*/
static FloatPartsN *partsN(addsub)(FloatPartsN *a, FloatPartsN *b,
float_status *s, bool subtract)
FloatPartsN partsN(addsub)(const FloatPartsN *a_orig,
const FloatPartsN *b_orig,
float_status *s, bool subtract)
{
bool b_sign = b->sign ^ subtract;
int ab_mask = float_cmask(a->cls) | float_cmask(b->cls);
int ab_mask = float_cmask(a_orig->cls) | float_cmask(b_orig->cls);
/*
* For addition and subtraction, we will consume an
@@ -538,10 +538,15 @@ static FloatPartsN *partsN(addsub)(FloatPartsN *a, FloatPartsN *b,
record_denormals_used(ab_mask, s);
}
if (a->sign != b_sign) {
FloatPartsN a = *a_orig;
FloatPartsN b = *b_orig;
b.sign ^= subtract;
if (a.sign != b.sign) {
/* Subtraction */
if (likely(cmask_is_only_normals(ab_mask))) {
if (partsN(sub_normal)(a, b)) {
if (partsN(sub_normal)(&a, &b)) {
return a;
}
/* Subtract was exact, fall through to set sign. */
@@ -549,7 +554,7 @@ static FloatPartsN *partsN(addsub)(FloatPartsN *a, FloatPartsN *b,
}
if (ab_mask == float_cmask_zero) {
a->sign = s->float_rounding_mode == float_round_down;
a.sign = s->float_rounding_mode == float_round_down;
return a;
}
@@ -558,23 +563,22 @@ static FloatPartsN *partsN(addsub)(FloatPartsN *a, FloatPartsN *b,
}
if (ab_mask & float_cmask_inf) {
if (a->cls != float_class_inf) {
if (a.cls != float_class_inf) {
/* N - Inf */
goto return_b;
return b;
}
if (b->cls != float_class_inf) {
if (b.cls != float_class_inf) {
/* Inf - N */
return a;
}
/* Inf - Inf */
float_raise(float_flag_invalid | float_flag_invalid_isi, s);
*a = partsN(default_nan)(s);
return a;
return partsN(default_nan)(s);
}
} else {
/* Addition */
if (likely(cmask_is_only_normals(ab_mask))) {
partsN(add_normal)(a, b);
partsN(add_normal)(&a, &b);
return a;
}
@@ -587,25 +591,22 @@ static FloatPartsN *partsN(addsub)(FloatPartsN *a, FloatPartsN *b,
}
if (ab_mask & float_cmask_inf) {
a->cls = float_class_inf;
a.cls = float_class_inf;
return a;
}
}
if (b->cls == float_class_zero) {
g_assert(is_anynorm(a->cls));
if (b.cls == float_class_zero) {
g_assert(is_anynorm(a.cls));
return a;
}
g_assert(a->cls == float_class_zero);
g_assert(is_anynorm(b->cls));
return_b:
b->sign = b_sign;
g_assert(a.cls == float_class_zero);
g_assert(is_anynorm(b.cls));
return b;
p_nan:
*a = partsN(pick_nan)(a, b, s);
return a;
return partsN(pick_nan)(a_orig, b_orig, s);
}
/*

30
fpu/softfloat.c
View File

@@ -1582,9 +1582,9 @@ float16_addsub(float16 a, float16 b, float_status *status, bool subtract)
{
FloatParts64 pa = float16_unpack_canonical(a, status);
FloatParts64 pb = float16_unpack_canonical(b, status);
FloatParts64 *pr = parts64_addsub(&pa, &pb, status, subtract);
FloatParts64 pr = parts64_addsub(&pa, &pb, status, subtract);
return float16_round_pack_canonical(pr, status);
return float16_round_pack_canonical(&pr, status);
}
float16 float16_add(float16 a, float16 b, float_status *status)
@@ -1602,9 +1602,9 @@ soft_f32_addsub(float32 a, float32 b, float_status *status, bool subtract)
{
FloatParts64 pa = float32_unpack_canonical(a, status);
FloatParts64 pb = float32_unpack_canonical(b, status);
FloatParts64 *pr = parts64_addsub(&pa, &pb, status, subtract);
FloatParts64 pr = parts64_addsub(&pa, &pb, status, subtract);
return float32_round_pack_canonical(pr, status);
return float32_round_pack_canonical(&pr, status);
}
static float32 soft_f32_add(float32 a, float32 b, float_status *status)
@@ -1622,9 +1622,9 @@ soft_f64_addsub(float64 a, float64 b, float_status *status, bool subtract)
{
FloatParts64 pa = float64_unpack_canonical(a, status);
FloatParts64 pb = float64_unpack_canonical(b, status);
FloatParts64 *pr = parts64_addsub(&pa, &pb, status, subtract);
FloatParts64 pr = parts64_addsub(&pa, &pb, status, subtract);
return float64_round_pack_canonical(pr, status);
return float64_round_pack_canonical(&pr, status);
}
static float64 soft_f64_add(float64 a, float64 b, float_status *status)
@@ -1717,9 +1717,9 @@ static float64 float64r32_addsub(float64 a, float64 b, float_status *status,
{
FloatParts64 pa = float64_unpack_canonical(a, status);
FloatParts64 pb = float64_unpack_canonical(b, status);
FloatParts64 *pr = parts64_addsub(&pa, &pb, status, subtract);
FloatParts64 pr = parts64_addsub(&pa, &pb, status, subtract);
return float64r32_round_pack_canonical(pr, status);
return float64r32_round_pack_canonical(&pr, status);
}
float64 float64r32_add(float64 a, float64 b, float_status *status)
@@ -1737,9 +1737,9 @@ bfloat16_addsub(bfloat16 a, bfloat16 b, float_status *status, bool subtract)
{
FloatParts64 pa = bfloat16_unpack_canonical(a, status);
FloatParts64 pb = bfloat16_unpack_canonical(b, status);
FloatParts64 *pr = parts64_addsub(&pa, &pb, status, subtract);
FloatParts64 pr = parts64_addsub(&pa, &pb, status, subtract);
return bfloat16_round_pack_canonical(pr, status);
return bfloat16_round_pack_canonical(&pr, status);
}
bfloat16 bfloat16_add(bfloat16 a, bfloat16 b, float_status *status)
@@ -1757,9 +1757,9 @@ float128_addsub(float128 a, float128 b, float_status *status, bool subtract)
{
FloatParts128 pa = float128_unpack_canonical(a, status);
FloatParts128 pb = float128_unpack_canonical(b, status);
FloatParts128 *pr = parts128_addsub(&pa, &pb, status, subtract);
FloatParts128 pr = parts128_addsub(&pa, &pb, status, subtract);
return float128_round_pack_canonical(pr, status);
return float128_round_pack_canonical(&pr, status);
}
float128 float128_add(float128 a, float128 b, float_status *status)
@@ -1775,15 +1775,15 @@ float128 float128_sub(float128 a, float128 b, float_status *status)
static floatx80 QEMU_FLATTEN
floatx80_addsub(floatx80 a, floatx80 b, float_status *status, bool subtract)
{
FloatParts128 pa, pb, *pr;
FloatParts128 pa, pb;
if (!floatx80_unpack_canonical(&pa, a, status) ||
!floatx80_unpack_canonical(&pb, b, status)) {
return floatx80_default_nan(status);
}
pr = parts128_addsub(&pa, &pb, status, subtract);
return floatx80_round_pack_canonical(pr, status);
pa = parts128_addsub(&pa, &pb, status, subtract);
return floatx80_round_pack_canonical(&pa, status);
}
floatx80 floatx80_add(floatx80 a, floatx80 b, float_status *status)

5
include/fpu/softfloat-parts.h
View File

@@ -182,6 +182,11 @@ FloatParts128 parts128_return_nan(const FloatParts128 *a, float_status *s);
* Operations
*/
FloatParts64 parts64_addsub(const FloatParts64 *a, const FloatParts64 *b,
float_status *s, bool subtract);
FloatParts128 parts128_addsub(const FloatParts128 *a, const FloatParts128 *b,
float_status *s, bool subtract);
FloatRelation parts64_compare(const FloatParts64 *a, const FloatParts64 *b,
float_status *s, bool quiet);
FloatRelation parts128_compare(const FloatParts128 *a, const FloatParts128 *b,