| Message ID | 20231020204331.139847-14-richard.henderson@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | target/hppa: Implement hppa64-cpu | expand |
On 20/10/23 22:42, Richard Henderson wrote: > Prepare for the qemu binary supporting both pa10 and pa20 > at the same time. > > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > --- > target/hppa/cpu-qom.h | 1 + > target/hppa/cpu.h | 5 +++++ > target/hppa/cpu.c | 34 +++++++++++++++++++--------------- > target/hppa/translate.c | 2 ++ > 4 files changed, 27 insertions(+), 15 deletions(-) > diff --git a/target/hppa/cpu.c b/target/hppa/cpu.c > index 1644297bf8..192aae268d 100644 > --- a/target/hppa/cpu.c > +++ b/target/hppa/cpu.c > @@ -207,20 +207,24 @@ static void hppa_cpu_class_init(ObjectClass *oc, void *data) > cc->tcg_ops = &hppa_tcg_ops; > } > > -static const TypeInfo hppa_cpu_type_info = { > - .name = TYPE_HPPA_CPU, > - .parent = TYPE_CPU, > - .instance_size = sizeof(HPPACPU), > - .instance_align = __alignof(HPPACPU), > - .instance_init = hppa_cpu_initfn, > - .abstract = false, > - .class_size = sizeof(HPPACPUClass), > - .class_init = hppa_cpu_class_init, > +static const TypeInfo hppa_cpu_type_infos[] = { > + { > + .name = TYPE_HPPA_CPU, > + .parent = TYPE_CPU, > + .instance_size = sizeof(HPPACPU), > + .instance_align = __alignof(HPPACPU), > + .instance_init = hppa_cpu_initfn, > + .abstract = false, > + .class_size = sizeof(HPPACPUClass), > + .class_init = hppa_cpu_class_init, > + }, > +#ifdef TARGET_HPPA64 > + { > + .name = TYPE_HPPA64_CPU, > + .parent = TYPE_HPPA_CPU, > + .instance_init = hppa64_cpu_initfn, hppa64_cpu_initfn() is never declared and removed in patch #29, remnant from old branch? Otherwise, Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> (and thanks for converting to DEFINE_TYPES). > + }, > +#endif > };
diff --git a/target/hppa/cpu-qom.h b/target/hppa/cpu-qom.h index b96e0318c7..4a85ebf5e0 100644 --- a/target/hppa/cpu-qom.h +++ b/target/hppa/cpu-qom.h @@ -24,6 +24,7 @@ #include "qom/object.h" #define TYPE_HPPA_CPU "hppa-cpu" +#define TYPE_HPPA64_CPU "hppa64-cpu" OBJECT_DECLARE_CPU_TYPE(HPPACPU, HPPACPUClass, HPPA_CPU) diff --git a/target/hppa/cpu.h b/target/hppa/cpu.h index 798d0c26d7..6995eb69ef 100644 --- a/target/hppa/cpu.h +++ b/target/hppa/cpu.h @@ -243,6 +243,11 @@ struct ArchCPU { #include "exec/cpu-all.h" +static inline bool hppa_is_pa20(CPUHPPAState *env) +{ + return object_dynamic_cast(OBJECT(env_cpu(env)), TYPE_HPPA64_CPU) != NULL; +} + static inline int cpu_mmu_index(CPUHPPAState *env, bool ifetch) { #ifdef CONFIG_USER_ONLY diff --git a/target/hppa/cpu.c b/target/hppa/cpu.c index 1644297bf8..192aae268d 100644 --- a/target/hppa/cpu.c +++ b/target/hppa/cpu.c @@ -207,20 +207,24 @@ static void hppa_cpu_class_init(ObjectClass *oc, void *data) cc->tcg_ops = &hppa_tcg_ops; } -static const TypeInfo hppa_cpu_type_info = { - .name = TYPE_HPPA_CPU, - .parent = TYPE_CPU, - .instance_size = sizeof(HPPACPU), - .instance_align = __alignof(HPPACPU), - .instance_init = hppa_cpu_initfn, - .abstract = false, - .class_size = sizeof(HPPACPUClass), - .class_init = hppa_cpu_class_init, +static const TypeInfo hppa_cpu_type_infos[] = { + { + .name = TYPE_HPPA_CPU, + .parent = TYPE_CPU, + .instance_size = sizeof(HPPACPU), + .instance_align = __alignof(HPPACPU), + .instance_init = hppa_cpu_initfn, + .abstract = false, + .class_size = sizeof(HPPACPUClass), + .class_init = hppa_cpu_class_init, + }, +#ifdef TARGET_HPPA64 + { + .name = TYPE_HPPA64_CPU, + .parent = TYPE_HPPA_CPU, + .instance_init = hppa64_cpu_initfn, + }, +#endif }; -static void hppa_cpu_register_types(void) -{ - type_register_static(&hppa_cpu_type_info); -} - -type_init(hppa_cpu_register_types) +DEFINE_TYPES(hppa_cpu_type_infos) diff --git a/target/hppa/translate.c b/target/hppa/translate.c index f86ea9b9ca..83115c944b 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -262,6 +262,7 @@ typedef struct DisasContext { int mmu_idx; int privilege; bool psw_n_nonzero; + bool is_pa20; #ifdef CONFIG_USER_ONLY MemOp unalign; @@ -4091,6 +4092,7 @@ static void hppa_tr_init_disas_context(DisasContextBase *dcbase, CPUState *cs) ctx->cs = cs; ctx->tb_flags = ctx->base.tb->flags; + ctx->is_pa20 = hppa_is_pa20(cpu_env(cs)); #ifdef CONFIG_USER_ONLY ctx->privilege = MMU_IDX_TO_PRIV(MMU_USER_IDX);
Prepare for the qemu binary supporting both pa10 and pa20 at the same time. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> --- target/hppa/cpu-qom.h | 1 + target/hppa/cpu.h | 5 +++++ target/hppa/cpu.c | 34 +++++++++++++++++++--------------- target/hppa/translate.c | 2 ++ 4 files changed, 27 insertions(+), 15 deletions(-)