On Tue, May 25, 2021 at 08:53:52AM -0300, Bruno Larsen (billionai) wrote: > The write calback decision when registering the MAS SPR has been turned > into a ternary operation, rather than an if-then-else block. > > This was done because when building without TCG, even though the > compiler will optimize away the pointers to spr_write_generic*, it > doesn't optimize away the decision and assignment to the local pointer, > creating compiler errors. This cleanup looked better than using ifdefs, > so we decided to with it. > > Signed-off-by: Bruno Larsen (billionai) <[email protected]> > Reviewed-by: Richard Henderson <[email protected]>
Applied to ppc-for-6.1, thanks.
> ---
> target/ppc/cpu_init.c | 9 +++------
> 1 file changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c
> index b696469d1a..40719f6480 100644
> --- a/target/ppc/cpu_init.c
> +++ b/target/ppc/cpu_init.c
> @@ -1205,15 +1205,12 @@ static void register_BookE206_sprs(CPUPPCState *env,
> uint32_t mas_mask,
> /* TLB assist registers */
> /* XXX : not implemented */
> for (i = 0; i < 8; i++) {
> - void (*uea_write)(DisasContext *ctx, int sprn, int gprn) =
> - &spr_write_generic32;
> - if (i == 2 && (mas_mask & (1 << i)) && (env->insns_flags & PPC_64B))
> {
> - uea_write = &spr_write_generic;
> - }
> if (mas_mask & (1 << i)) {
> spr_register(env, mas_sprn[i], mas_names[i],
> SPR_NOACCESS, SPR_NOACCESS,
> - &spr_read_generic, uea_write,
> + &spr_read_generic,
> + (i == 2 && (env->insns_flags & PPC_64B))
> + ? &spr_write_generic : &spr_write_generic32,
> 0x00000000);
> }
> }
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature
