On Tue, Feb 15, 2022 at 06:41:44PM -0300, Fabiano Rosas wrote:
> This function registers just one SPR and has only two callers, so open
> code it.
>
> Signed-off-by: Fabiano Rosas <farosas@linux.ibm.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
> ---
> target/ppc/cpu_init.c | 21 +++++++++++----------
> 1 file changed, 11 insertions(+), 10 deletions(-)
>
> diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c
> index 621812d079..3585dc69bc 100644
> --- a/target/ppc/cpu_init.c
> +++ b/target/ppc/cpu_init.c
> @@ -1072,14 +1072,6 @@ static void register_l3_ctrl(CPUPPCState *env)
> 0x00000000);
> }
>
> -static void register_usprg3_sprs(CPUPPCState *env)
> -{
> - spr_register(env, SPR_USPRG3, "USPRG3",
> - &spr_read_ureg, SPR_NOACCESS,
> - &spr_read_ureg, SPR_NOACCESS,
> - 0x00000000);
> -}
> -
> static void register_usprgh_sprs(CPUPPCState *env)
> {
> spr_register(env, SPR_USPRG4, "USPRG4",
> @@ -3310,7 +3302,12 @@ static void init_proc_e500(CPUPPCState *env, int version)
> break;
> }
> register_BookE_sprs(env, ivor_mask);
> - register_usprg3_sprs(env);
> +
> + spr_register(env, SPR_USPRG3, "USPRG3",
> + &spr_read_ureg, SPR_NOACCESS,
> + &spr_read_ureg, SPR_NOACCESS,
> + 0x00000000);
> +
> /* Processor identification */
> spr_register(env, SPR_BOOKE_PIR, "PIR",
> SPR_NOACCESS, SPR_NOACCESS,
> @@ -6200,7 +6197,6 @@ static void init_tcg_pmu_power8(CPUPPCState *env)
> static void init_proc_book3s_common(CPUPPCState *env)
> {
> register_non_embedded_sprs(env);
> - register_usprg3_sprs(env);
> register_book3s_altivec_sprs(env);
> register_book3s_pmu_sup_sprs(env);
> register_book3s_pmu_user_sprs(env);
> @@ -6210,6 +6206,11 @@ static void init_proc_book3s_common(CPUPPCState *env)
> * value is the one used by 74xx processors.
> */
> vscr_init(env, 0x00010000);
> +
> + spr_register(env, SPR_USPRG3, "USPRG3",
> + &spr_read_ureg, SPR_NOACCESS,
> + &spr_read_ureg, SPR_NOACCESS,
> + 0x00000000);
> }
>
> static void init_proc_970(CPUPPCState *env)
--
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