softfloat: Reduce FloatFmt

Remove frac_lsb, frac_lsbm1, roundeven_mask.  Compute
these from round_mask in parts$N_uncanon_normal.

With floatx80, round_mask will not be tied to frac_shift.
Everything else is easily computable.

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2020-11-20 18:28:31 -08:00
parent 25fdedf0d3
commit d6e1f0cd59
2 changed files with 15 additions and 20 deletions

View File

@ -145,10 +145,10 @@ static void partsN(uncanon_normal)(FloatPartsN *p, float_status *s,
{ {
const int exp_max = fmt->exp_max; const int exp_max = fmt->exp_max;
const int frac_shift = fmt->frac_shift; const int frac_shift = fmt->frac_shift;
const uint64_t frac_lsb = fmt->frac_lsb;
const uint64_t frac_lsbm1 = fmt->frac_lsbm1;
const uint64_t round_mask = fmt->round_mask; const uint64_t round_mask = fmt->round_mask;
const uint64_t roundeven_mask = fmt->roundeven_mask; const uint64_t frac_lsb = round_mask + 1;
const uint64_t frac_lsbm1 = round_mask ^ (round_mask >> 1);
const uint64_t roundeven_mask = round_mask | frac_lsb;
uint64_t inc; uint64_t inc;
bool overflow_norm = false; bool overflow_norm = false;
int exp, flags = 0; int exp, flags = 0;

View File

@ -563,9 +563,7 @@ typedef struct {
* frac_size: the size of the fraction field * frac_size: the size of the fraction field
* frac_shift: shift to normalise the fraction with DECOMPOSED_BINARY_POINT * frac_shift: shift to normalise the fraction with DECOMPOSED_BINARY_POINT
* The following are computed based the size of fraction * The following are computed based the size of fraction
* frac_lsb: least significant bit of fraction * round_mask: bits below lsb which must be rounded
* frac_lsbm1: the bit below the least significant bit (for rounding)
* round_mask/roundeven_mask: masks used for rounding
* The following optional modifiers are available: * The following optional modifiers are available:
* arm_althp: handle ARM Alternative Half Precision * arm_althp: handle ARM Alternative Half Precision
*/ */
@ -575,24 +573,21 @@ typedef struct {
int exp_max; int exp_max;
int frac_size; int frac_size;
int frac_shift; int frac_shift;
uint64_t frac_lsb;
uint64_t frac_lsbm1;
uint64_t round_mask;
uint64_t roundeven_mask;
bool arm_althp; bool arm_althp;
uint64_t round_mask;
} FloatFmt; } FloatFmt;
/* Expand fields based on the size of exponent and fraction */ /* Expand fields based on the size of exponent and fraction */
#define FLOAT_PARAMS(E, F) \ #define FLOAT_PARAMS_(E, F) \
.exp_size = E, \ .exp_size = E, \
.exp_bias = ((1 << E) - 1) >> 1, \ .exp_bias = ((1 << E) - 1) >> 1, \
.exp_max = (1 << E) - 1, \ .exp_max = (1 << E) - 1, \
.frac_size = F, \ .frac_size = F
.frac_shift = (-F - 1) & 63, \
.frac_lsb = 1ull << ((-F - 1) & 63), \ #define FLOAT_PARAMS(E, F) \
.frac_lsbm1 = 1ull << ((-F - 2) & 63), \ FLOAT_PARAMS_(E, F), \
.round_mask = (1ull << ((-F - 1) & 63)) - 1, \ .frac_shift = (-F - 1) & 63, \
.roundeven_mask = (2ull << ((-F - 1) & 63)) - 1 .round_mask = (1ull << ((-F - 1) & 63)) - 1
static const FloatFmt float16_params = { static const FloatFmt float16_params = {
FLOAT_PARAMS(5, 10) FLOAT_PARAMS(5, 10)