Skip to content

Commit

Permalink
target/ppc: introduce dfp_finalize_decimal{64,128}() helper functions
Browse files Browse the repository at this point in the history 
Most of the DFP helper functions call decimal{64,128}FromNumber() just before
returning in order to convert the decNumber stored in dfp.t64 back to a
Decimal{64,128} to write back to the FP registers.

Introduce new dfp_finalize_decimal{64,128}() helper functions which both enable
the parameter list to be reduced considerably, and also help minimise the
changes required in the next patch.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20190926185801.11176-5-mark.cave-ayland@ilande.co.uk>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
  • Loading branch information
@mcayland @dgibson
mcayland authored and dgibson committed Oct 4, 2019
1 parent d9acba3 commit 474c2e9
Showing 1 changed file with 23 additions and 19 deletions.
42 changes: 23 additions & 19 deletions target/ppc/dfp_helper.c
View file
Expand Up @@ -191,6 +191,16 @@ static void dfp_prepare_decimal128(struct PPC_DFP *dfp, ppc_fprp_t *a,
}
}

static void dfp_finalize_decimal64(struct PPC_DFP *dfp)
{
decimal64FromNumber((decimal64 *)&dfp->t64, &dfp->t, &dfp->context);
}

static void dfp_finalize_decimal128(struct PPC_DFP *dfp)
{
decimal128FromNumber((decimal128 *)&dfp->t64, &dfp->t, &dfp->context);
}

static void dfp_set_FPSCR_flag(struct PPC_DFP *dfp, uint64_t flag,
uint64_t enabled)
{
Expand Down Expand Up @@ -422,7 +432,7 @@ void helper_##op(CPUPPCState *env, ppc_fprp_t *t, ppc_fprp_t *a, \
struct PPC_DFP dfp; \
dfp_prepare_decimal##size(&dfp, a, b, env); \
dnop(&dfp.t, &dfp.a, &dfp.b, &dfp.context); \
decimal##size##FromNumber((decimal##size *)dfp.t64, &dfp.t, &dfp.context); \
dfp_finalize_decimal##size(&dfp); \
postprocs(&dfp); \
if (size == 64) { \
set_dfp64(t, dfp.t64); \
Expand Down Expand Up @@ -491,7 +501,7 @@ uint32_t helper_##op(CPUPPCState *env, ppc_fprp_t *a, ppc_fprp_t *b) \
struct PPC_DFP dfp; \
dfp_prepare_decimal##size(&dfp, a, b, env); \
dnop(&dfp.t, &dfp.a, &dfp.b, &dfp.context); \
decimal##size##FromNumber((decimal##size *)dfp.t64, &dfp.t, &dfp.context); \
dfp_finalize_decimal##size(&dfp); \
postprocs(&dfp); \
return dfp.crbf; \
}
Expand Down Expand Up @@ -741,8 +751,7 @@ void helper_##op(CPUPPCState *env, ppc_fprp_t *t, ppc_fprp_t *b, \
dfp.a.exponent = (int32_t)((int8_t)(te << 3) >> 3); \
\
dfp_quantize(rmc, &dfp); \
decimal##size##FromNumber((decimal##size *)dfp.t64, &dfp.t, \
&dfp.context); \
dfp_finalize_decimal##size(&dfp); \
QUA_PPs(&dfp); \
\
if (size == 64) { \
Expand All @@ -764,8 +773,7 @@ void helper_##op(CPUPPCState *env, ppc_fprp_t *t, ppc_fprp_t *a, \
dfp_prepare_decimal##size(&dfp, a, b, env); \
\
dfp_quantize(rmc, &dfp); \
decimal##size##FromNumber((decimal##size *)dfp.t64, &dfp.t, \
&dfp.context); \
dfp_finalize_decimal##size(&dfp); \
QUA_PPs(&dfp); \
\
if (size == 64) { \
Expand Down Expand Up @@ -847,8 +855,7 @@ void helper_##op(CPUPPCState *env, ppc_fprp_t *t, ppc_fprp_t *a, \
ref_sig = a64 & 0x3f; \
\
_dfp_reround(rmc, ref_sig, xmax, &dfp); \
decimal##size##FromNumber((decimal##size *)dfp.t64, &dfp.t, \
&dfp.context); \
dfp_finalize_decimal##size(&dfp); \
QUA_PPs(&dfp); \
\
if (size == 64) { \
Expand All @@ -871,7 +878,7 @@ void helper_##op(CPUPPCState *env, ppc_fprp_t *t, ppc_fprp_t *b, \
\
dfp_set_round_mode_from_immediate(r, rmc, &dfp); \
decNumberToIntegralExact(&dfp.t, &dfp.b, &dfp.context); \
decimal##size##FromNumber((decimal##size *)dfp.t64, &dfp.t, &dfp.context); \
dfp_finalize_decimal##size(&dfp); \
postprocs(&dfp); \
\
if (size == 64) { \
Expand Down Expand Up @@ -911,7 +918,7 @@ void helper_dctdp(CPUPPCState *env, ppc_fprp_t *t, ppc_fprp_t *b)

dfp_prepare_decimal64(&dfp, 0, 0, env);
decimal32ToNumber((decimal32 *)&b_short, &dfp.t);
decimal64FromNumber((decimal64 *)&dfp.t64, &dfp.t, &dfp.context);
dfp_finalize_decimal64(&dfp);
set_dfp64(t, dfp.t64);
dfp_set_FPRF_from_FRT(&dfp);
}
Expand All @@ -927,7 +934,7 @@ void helper_dctqpq(CPUPPCState *env, ppc_fprp_t *t, ppc_fprp_t *b)
dfp_check_for_VXSNAN_and_convert_to_QNaN(&dfp);
dfp_set_FPRF_from_FRT(&dfp);

decimal128FromNumber((decimal128 *)&dfp.t64, &dfp.t, &dfp.context);
dfp_finalize_decimal128(&dfp);
set_dfp128(t, dfp.t64);
}

Expand Down Expand Up @@ -963,7 +970,7 @@ void helper_drdpq(CPUPPCState *env, ppc_fprp_t *t, ppc_fprp_t *b)
dfp_check_for_XX(&dfp);

dfp.t64[0] = dfp.t64[1] = 0;
decimal64FromNumber((decimal64 *)dfp.t64, &dfp.t, &dfp.context);
dfp_finalize_decimal64(&dfp);
set_dfp128(t, dfp.t64);
}

Expand All @@ -975,7 +982,7 @@ void helper_##op(CPUPPCState *env, ppc_fprp_t *t, ppc_fprp_t *b) \
dfp_prepare_decimal##size(&dfp, 0, b, env); \
get_dfp64(&b64, b); \
decNumberFromInt64(&dfp.t, (int64_t)b64); \
decimal##size##FromNumber((decimal##size *)dfp.t64, &dfp.t, &dfp.context); \
dfp_finalize_decimal##size(&dfp); \
CFFIX_PPs(&dfp); \
\
if (size == 64) { \
Expand Down Expand Up @@ -1155,8 +1162,7 @@ void helper_##op(CPUPPCState *env, ppc_fprp_t *t, ppc_fprp_t *b, \
if (s && sgn) { \
dfp.t.bits |= DECNEG; \
} \
decimal##size##FromNumber((decimal##size *)dfp.t64, &dfp.t, \
&dfp.context); \
dfp_finalize_decimal##size(&dfp); \
dfp_set_FPRF_from_FRT(&dfp); \
if ((size) == 64) { \
set_dfp64(t, dfp.t64); \
Expand Down Expand Up @@ -1259,8 +1265,7 @@ void helper_##op(CPUPPCState *env, ppc_fprp_t *t, ppc_fprp_t *a, \
dfp.t.bits &= ~DECSPECIAL; \
} \
dfp.t.exponent = exp - bias; \
decimal##size##FromNumber((decimal##size *)dfp.t64, &dfp.t, \
&dfp.context); \
dfp_finalize_decimal##size(&dfp); \
} \
if (size == 64) { \
set_dfp64(t, dfp.t64); \
Expand Down Expand Up @@ -1340,8 +1345,7 @@ void helper_##op(CPUPPCState *env, ppc_fprp_t *t, ppc_fprp_t *a, \
dfp.t.digits = max_digits - 1; \
} \
\
decimal##size##FromNumber((decimal##size *)dfp.t64, &dfp.t, \
&dfp.context); \
dfp_finalize_decimal##size(&dfp); \
} else { \
if ((size) == 64) { \
dfp.t64[0] = dfp.a64[0] & 0xFFFC000000000000ULL; \
Expand Down

0 comments on commit 474c2e9

Please sign in to comment.