On Tue, Feb 15, 2022 at 06:41:46PM -0300, Fabiano Rosas wrote: > Put the SPR registration macros in a header that is accessible outside > of cpu_init.c. The following patches will move CPU-specific code to > separate files and will need to access it. > > Signed-off-by: Fabiano Rosas <faro...@linux.ibm.com>
Reviewed-by: David Gibson <da...@gibson.dropbear.id.au>
> ---
> The spr_tcg.h header has always been used for both TCG and KVM, due to
> its usage in cpu_init.c, but maybe we should change it to spr_common.h
> to avoid confusion?
That's probably a good idea.
> ---
> target/ppc/cpu_init.c | 65 ++++++-------------------------------------
> target/ppc/spr_tcg.h | 56 +++++++++++++++++++++++++++++++++++++
> 2 files changed, 65 insertions(+), 56 deletions(-)
>
> diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c
> index 74e26f60dd..3327ea15fd 100644
> --- a/target/ppc/cpu_init.c
> +++ b/target/ppc/cpu_init.c
> @@ -67,35 +67,15 @@ static inline void vscr_init(CPUPPCState *env, uint32_t
> val)
> * may be compiled out, and the system kvm header may not be available
> * for supplying the ID numbers. This is ugly, but the best we can do.
> */
> -
> -#ifdef CONFIG_TCG
> -# define USR_ARG(X) X,
> -# ifdef CONFIG_USER_ONLY
> -# define SYS_ARG(X)
> -# else
> -# define SYS_ARG(X) X,
> -# endif
> -#else
> -# define USR_ARG(X)
> -# define SYS_ARG(X)
> -#endif
> -#ifdef CONFIG_KVM
> -# define KVM_ARG(X) X,
> -#else
> -# define KVM_ARG(X)
> -#endif
> -
> -typedef void spr_callback(DisasContext *, int, int);
> -
> -static void _spr_register(CPUPPCState *env, int num, const char *name,
> - USR_ARG(spr_callback *uea_read)
> - USR_ARG(spr_callback *uea_write)
> - SYS_ARG(spr_callback *oea_read)
> - SYS_ARG(spr_callback *oea_write)
> - SYS_ARG(spr_callback *hea_read)
> - SYS_ARG(spr_callback *hea_write)
> - KVM_ARG(uint64_t one_reg_id)
> - target_ulong initial_value)
> +void _spr_register(CPUPPCState *env, int num, const char *name,
> + USR_ARG(spr_callback *uea_read)
> + USR_ARG(spr_callback *uea_write)
> + SYS_ARG(spr_callback *oea_read)
> + SYS_ARG(spr_callback *oea_write)
> + SYS_ARG(spr_callback *hea_read)
> + SYS_ARG(spr_callback *hea_write)
> + KVM_ARG(uint64_t one_reg_id)
> + target_ulong initial_value)
> {
> ppc_spr_t *spr = &env->spr_cb[num];
>
> @@ -122,33 +102,6 @@ static void _spr_register(CPUPPCState *env, int num,
> const char *name,
> #endif
> }
>
> -/* spr_register_kvm_hv passes all required arguments. */
> -#define spr_register_kvm_hv(env, num, name, uea_read, uea_write,
> \
> - oea_read, oea_write, hea_read, hea_write,
> \
> - one_reg_id, initial_value)
> \
> - _spr_register(env, num, name,
> \
> - USR_ARG(uea_read) USR_ARG(uea_write)
> \
> - SYS_ARG(oea_read) SYS_ARG(oea_write)
> \
> - SYS_ARG(hea_read) SYS_ARG(hea_write)
> \
> - KVM_ARG(one_reg_id) initial_value)
> -
> -/* spr_register_kvm duplicates the oea callbacks to the hea callbacks. */
> -#define spr_register_kvm(env, num, name, uea_read, uea_write,
> \
> - oea_read, oea_write, one_reg_id, ival)
> \
> - spr_register_kvm_hv(env, num, name, uea_read, uea_write, oea_read,
> \
> - oea_write, oea_read, oea_write, one_reg_id, ival)
> -
> -/* spr_register_hv and spr_register are similar, except there is no kvm id.
> */
> -#define spr_register_hv(env, num, name, uea_read, uea_write,
> \
> - oea_read, oea_write, hea_read, hea_write, ival)
> \
> - spr_register_kvm_hv(env, num, name, uea_read, uea_write, oea_read,
> \
> - oea_write, hea_read, hea_write, 0, ival)
> -
> -#define spr_register(env, num, name, uea_read, uea_write,
> \
> - oea_read, oea_write, ival)
> \
> - spr_register_kvm(env, num, name, uea_read, uea_write,
> \
> - oea_read, oea_write, 0, ival)
> -
> /* Generic PowerPC SPRs */
> static void register_generic_sprs(PowerPCCPU *cpu)
> {
> diff --git a/target/ppc/spr_tcg.h b/target/ppc/spr_tcg.h
> index a4f912faa4..786cdca80d 100644
> --- a/target/ppc/spr_tcg.h
> +++ b/target/ppc/spr_tcg.h
> @@ -21,6 +21,62 @@
>
> #define SPR_NOACCESS (&spr_noaccess)
>
> +#ifdef CONFIG_TCG
> +# define USR_ARG(X) X,
> +# ifdef CONFIG_USER_ONLY
> +# define SYS_ARG(X)
> +# else
> +# define SYS_ARG(X) X,
> +# endif
> +#else
> +# define USR_ARG(X)
> +# define SYS_ARG(X)
> +#endif
> +#ifdef CONFIG_KVM
> +# define KVM_ARG(X) X,
> +#else
> +# define KVM_ARG(X)
> +#endif
> +
> +typedef void spr_callback(DisasContext *, int, int);
> +
> +void _spr_register(CPUPPCState *env, int num, const char *name,
> + USR_ARG(spr_callback *uea_read)
> + USR_ARG(spr_callback *uea_write)
> + SYS_ARG(spr_callback *oea_read)
> + SYS_ARG(spr_callback *oea_write)
> + SYS_ARG(spr_callback *hea_read)
> + SYS_ARG(spr_callback *hea_write)
> + KVM_ARG(uint64_t one_reg_id)
> + target_ulong initial_value);
> +
> +/* spr_register_kvm_hv passes all required arguments. */
> +#define spr_register_kvm_hv(env, num, name, uea_read, uea_write,
> \
> + oea_read, oea_write, hea_read, hea_write,
> \
> + one_reg_id, initial_value)
> \
> + _spr_register(env, num, name,
> \
> + USR_ARG(uea_read) USR_ARG(uea_write)
> \
> + SYS_ARG(oea_read) SYS_ARG(oea_write)
> \
> + SYS_ARG(hea_read) SYS_ARG(hea_write)
> \
> + KVM_ARG(one_reg_id) initial_value)
> +
> +/* spr_register_kvm duplicates the oea callbacks to the hea callbacks. */
> +#define spr_register_kvm(env, num, name, uea_read, uea_write,
> \
> + oea_read, oea_write, one_reg_id, ival)
> \
> + spr_register_kvm_hv(env, num, name, uea_read, uea_write, oea_read,
> \
> + oea_write, oea_read, oea_write, one_reg_id, ival)
> +
> +/* spr_register_hv and spr_register are similar, except there is no kvm id.
> */
> +#define spr_register_hv(env, num, name, uea_read, uea_write,
> \
> + oea_read, oea_write, hea_read, hea_write, ival)
> \
> + spr_register_kvm_hv(env, num, name, uea_read, uea_write, oea_read,
> \
> + oea_write, hea_read, hea_write, 0, ival)
> +
> +#define spr_register(env, num, name, uea_read, uea_write,
> \
> + oea_read, oea_write, ival)
> \
> + spr_register_kvm(env, num, name, uea_read, uea_write,
> \
> + oea_read, oea_write, 0, ival)
> +
> /* prototypes for readers and writers for SPRs */
> void spr_noaccess(DisasContext *ctx, int gprn, int sprn);
> void spr_read_generic(DisasContext *ctx, int gprn, int sprn);
--
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
