OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

fpu/softfloat: Pass FloatClass to pickNaNMulAdd 

For each operand, pass a single enumeration instead of a pair of booleans.
The commit also merges multiple different ifdef-selected implementations
of pickNaNMulAdd into a single function whose body is ifdef-selected.

Tested-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2018-05-10 15:38:08 -07:00
parent 4f251cfd52
commit 3bd2dec1a1
2 changed files with 28 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
fpu/softfloat-specialize.h
View File

@ -594,15 +594,14 @@ static int pickNaN(FloatClass a_cls, FloatClass b_cls,
| information. | information.
| Return values : 0 : a; 1 : b; 2 : c; 3 : default-NaN | Return values : 0 : a; 1 : b; 2 : c; 3 : default-NaN
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
#if defined(TARGET_ARM) static int pickNaNMulAdd(FloatClass a_cls, FloatClass b_cls, FloatClass c_cls,
static int pickNaNMulAdd(flag aIsQNaN, flag aIsSNaN, flag bIsQNaN, flag bIsSNaN, bool infzero, float_status *status)
flag cIsQNaN, flag cIsSNaN, flag infzero,
float_status *status)
{ {
#if defined(TARGET_ARM)
/* For ARM, the (inf,zero,qnan) case sets InvalidOp and returns /* For ARM, the (inf,zero,qnan) case sets InvalidOp and returns
* the default NaN * the default NaN
*/ */
if (infzero && cIsQNaN) { if (infzero && is_qnan(c_cls)) {
float_raise(float_flag_invalid, status); float_raise(float_flag_invalid, status);
return 3; return 3;
} }
@ -610,25 +609,20 @@ static int pickNaNMulAdd(flag aIsQNaN, flag aIsSNaN, flag bIsQNaN, flag bIsSNaN,
/* This looks different from the ARM ARM pseudocode, because the ARM ARM /* This looks different from the ARM ARM pseudocode, because the ARM ARM
* puts the operands to a fused mac operation (a*b)+c in the order c,a,b. * puts the operands to a fused mac operation (a*b)+c in the order c,a,b.
*/ */
if (cIsSNaN) { if (is_snan(c_cls)) {
return 2; return 2;
} else if (aIsSNaN) { } else if (is_snan(a_cls)) {
return 0; return 0;
} else if (bIsSNaN) { } else if (is_snan(b_cls)) {
return 1; return 1;
} else if (cIsQNaN) { } else if (is_qnan(c_cls)) {
return 2; return 2;
} else if (aIsQNaN) { } else if (is_qnan(a_cls)) {
return 0; return 0;
} else { } else {
return 1; return 1;
} }
}
#elif defined(TARGET_MIPS) #elif defined(TARGET_MIPS)
static int pickNaNMulAdd(flag aIsQNaN, flag aIsSNaN, flag bIsQNaN, flag bIsSNaN,
flag cIsQNaN, flag cIsSNaN, flag infzero,
float_status *status)
{
/* For MIPS, the (inf,zero,qnan) case sets InvalidOp and returns /* For MIPS, the (inf,zero,qnan) case sets InvalidOp and returns
* the default NaN * the default NaN
*/ */
@ -639,41 +633,36 @@ static int pickNaNMulAdd(flag aIsQNaN, flag aIsSNaN, flag bIsQNaN, flag bIsSNaN,
if (snan_bit_is_one(status)) { if (snan_bit_is_one(status)) {
/* Prefer sNaN over qNaN, in the a, b, c order. */ /* Prefer sNaN over qNaN, in the a, b, c order. */
if (aIsSNaN) { if (is_snan(a_cls)) {
return 0; return 0;
} else if (bIsSNaN) { } else if (is_snan(b_cls)) {
return 1; return 1;
} else if (cIsSNaN) { } else if (is_snan(c_cls)) {
return 2; return 2;
} else if (aIsQNaN) { } else if (is_qnan(a_cls)) {
return 0; return 0;
} else if (bIsQNaN) { } else if (is_qnan(b_cls)) {
return 1; return 1;
} else { } else {
return 2; return 2;
} }
} else { } else {
/* Prefer sNaN over qNaN, in the c, a, b order. */ /* Prefer sNaN over qNaN, in the c, a, b order. */
if (cIsSNaN) { if (is_snan(c_cls)) {
return 2; return 2;
} else if (aIsSNaN) { } else if (is_snan(a_cls)) {
return 0; return 0;
} else if (bIsSNaN) { } else if (is_snan(b_cls)) {
return 1; return 1;
} else if (cIsQNaN) { } else if (is_qnan(c_cls)) {
return 2; return 2;
} else if (aIsQNaN) { } else if (is_qnan(a_cls)) {
return 0; return 0;
} else { } else {
return 1; return 1;
} }
} }
}
#elif defined(TARGET_PPC) #elif defined(TARGET_PPC)
static int pickNaNMulAdd(flag aIsQNaN, flag aIsSNaN, flag bIsQNaN, flag bIsSNaN,
flag cIsQNaN, flag cIsSNaN, flag infzero,
float_status *status)
{
/* For PPC, the (inf,zero,qnan) case sets InvalidOp, but we prefer /* For PPC, the (inf,zero,qnan) case sets InvalidOp, but we prefer
* to return an input NaN if we have one (ie c) rather than generating * to return an input NaN if we have one (ie c) rather than generating
* a default NaN * a default NaN
@ -686,31 +675,26 @@ static int pickNaNMulAdd(flag aIsQNaN, flag aIsSNaN, flag bIsQNaN, flag bIsSNaN,
/* If fRA is a NaN return it; otherwise if fRB is a NaN return it; /* If fRA is a NaN return it; otherwise if fRB is a NaN return it;
* otherwise return fRC. Note that muladd on PPC is (fRA * fRC) + frB * otherwise return fRC. Note that muladd on PPC is (fRA * fRC) + frB
*/ */
if (aIsSNaN || aIsQNaN) { if (is_nan(a_cls)) {
return 0; return 0;
} else if (cIsSNaN || cIsQNaN) { } else if (is_nan(c_cls)) {
return 2; return 2;
} else { } else {
return 1; return 1;
} }
}
#else #else
/* A default implementation: prefer a to b to c. /* A default implementation: prefer a to b to c.
* This is unlikely to actually match any real implementation. * This is unlikely to actually match any real implementation.
*/ */
static int pickNaNMulAdd(flag aIsQNaN, flag aIsSNaN, flag bIsQNaN, flag bIsSNaN, if (is_nan(a_cls)) {
flag cIsQNaN, flag cIsSNaN, flag infzero,
float_status *status)
{
if (aIsSNaN || aIsQNaN) {
return 0; return 0;
} else if (bIsSNaN || bIsQNaN) { } else if (is_nan(b_cls)) {
return 1; return 1;
} else { } else {
return 2; return 2;
} }
}
#endif #endif
}
/*---------------------------------------------------------------------------- /*----------------------------------------------------------------------------
| Takes two single-precision floating-point values `a' and `b', one of which | Takes two single-precision floating-point values `a' and `b', one of which

5
fpu/softfloat.c
View File

@ -601,10 +601,7 @@ static FloatParts pick_nan_muladd(FloatParts a, FloatParts b, FloatParts c,
s->float_exception_flags |= float_flag_invalid; s->float_exception_flags |= float_flag_invalid;
} }
which = pickNaNMulAdd(is_qnan(a.cls), is_snan(a.cls), which = pickNaNMulAdd(a.cls, b.cls, c.cls, inf_zero, s);
is_qnan(b.cls), is_snan(b.cls),
is_qnan(c.cls), is_snan(c.cls),
inf_zero, s);
if (s->default_nan_mode) { if (s->default_nan_mode) {
/* Note that this check is after pickNaNMulAdd so that function /* Note that this check is after pickNaNMulAdd so that function