mirror of https://github.com/proxmox/mirror_qemu
target-arm: Update ARMCPU to QOM realizefn
Turn arm_cpu_realize() into a QOM realize function, no longer called via cpu.h prototype. To maintain the semantics of cpu_init(), set realized = true explicitly in cpu_arm_init(). Move GDB coprocessor registration, CPU reset and vCPU initialization into the realizefn. Signed-off-by: Andreas Färber <afaerber@suse.de>master
parent
bd1b282836
commit
149692667f
|
@ -33,6 +33,7 @@
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* ARMCPUClass:
|
* ARMCPUClass:
|
||||||
|
* @parent_realize: The parent class' realize handler.
|
||||||
* @parent_reset: The parent class' reset handler.
|
* @parent_reset: The parent class' reset handler.
|
||||||
*
|
*
|
||||||
* An ARM CPU model.
|
* An ARM CPU model.
|
||||||
|
@ -42,6 +43,7 @@ typedef struct ARMCPUClass {
|
||||||
CPUClass parent_class;
|
CPUClass parent_class;
|
||||||
/*< public >*/
|
/*< public >*/
|
||||||
|
|
||||||
|
DeviceRealize parent_realize;
|
||||||
void (*parent_reset)(CPUState *cpu);
|
void (*parent_reset)(CPUState *cpu);
|
||||||
} ARMCPUClass;
|
} ARMCPUClass;
|
||||||
|
|
||||||
|
@ -107,7 +109,6 @@ static inline ARMCPU *arm_env_get_cpu(CPUARMState *env)
|
||||||
|
|
||||||
#define ENV_GET_CPU(e) CPU(arm_env_get_cpu(e))
|
#define ENV_GET_CPU(e) CPU(arm_env_get_cpu(e))
|
||||||
|
|
||||||
void arm_cpu_realize(ARMCPU *cpu);
|
|
||||||
void register_cp_regs_for_features(ARMCPU *cpu);
|
void register_cp_regs_for_features(ARMCPU *cpu);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -147,15 +147,12 @@ static void arm_cpu_finalizefn(Object *obj)
|
||||||
g_hash_table_destroy(cpu->cp_regs);
|
g_hash_table_destroy(cpu->cp_regs);
|
||||||
}
|
}
|
||||||
|
|
||||||
void arm_cpu_realize(ARMCPU *cpu)
|
static void arm_cpu_realizefn(DeviceState *dev, Error **errp)
|
||||||
{
|
{
|
||||||
/* This function is called by cpu_arm_init() because it
|
ARMCPU *cpu = ARM_CPU(dev);
|
||||||
* needs to do common actions based on feature bits, etc
|
ARMCPUClass *acc = ARM_CPU_GET_CLASS(dev);
|
||||||
* that have been set by the subclass init functions.
|
|
||||||
* When we have QOM realize support it should become
|
|
||||||
* a true realize function instead.
|
|
||||||
*/
|
|
||||||
CPUARMState *env = &cpu->env;
|
CPUARMState *env = &cpu->env;
|
||||||
|
|
||||||
/* Some features automatically imply others: */
|
/* Some features automatically imply others: */
|
||||||
if (arm_feature(env, ARM_FEATURE_V7)) {
|
if (arm_feature(env, ARM_FEATURE_V7)) {
|
||||||
set_feature(env, ARM_FEATURE_VAPA);
|
set_feature(env, ARM_FEATURE_VAPA);
|
||||||
|
@ -197,6 +194,12 @@ void arm_cpu_realize(ARMCPU *cpu)
|
||||||
}
|
}
|
||||||
|
|
||||||
register_cp_regs_for_features(cpu);
|
register_cp_regs_for_features(cpu);
|
||||||
|
arm_cpu_register_gdb_regs_for_features(cpu);
|
||||||
|
|
||||||
|
cpu_reset(CPU(cpu));
|
||||||
|
qemu_init_vcpu(env);
|
||||||
|
|
||||||
|
acc->parent_realize(dev, errp);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* CPU models */
|
/* CPU models */
|
||||||
|
@ -782,6 +785,10 @@ static void arm_cpu_class_init(ObjectClass *oc, void *data)
|
||||||
{
|
{
|
||||||
ARMCPUClass *acc = ARM_CPU_CLASS(oc);
|
ARMCPUClass *acc = ARM_CPU_CLASS(oc);
|
||||||
CPUClass *cc = CPU_CLASS(acc);
|
CPUClass *cc = CPU_CLASS(acc);
|
||||||
|
DeviceClass *dc = DEVICE_CLASS(oc);
|
||||||
|
|
||||||
|
acc->parent_realize = dc->realize;
|
||||||
|
dc->realize = arm_cpu_realizefn;
|
||||||
|
|
||||||
acc->parent_reset = cc->reset;
|
acc->parent_reset = cc->reset;
|
||||||
cc->reset = arm_cpu_reset;
|
cc->reset = arm_cpu_reset;
|
||||||
|
|
|
@ -234,6 +234,7 @@ typedef struct CPUARMState {
|
||||||
|
|
||||||
ARMCPU *cpu_arm_init(const char *cpu_model);
|
ARMCPU *cpu_arm_init(const char *cpu_model);
|
||||||
void arm_translate_init(void);
|
void arm_translate_init(void);
|
||||||
|
void arm_cpu_register_gdb_regs_for_features(ARMCPU *cpu);
|
||||||
int cpu_arm_exec(CPUARMState *s);
|
int cpu_arm_exec(CPUARMState *s);
|
||||||
void do_interrupt(CPUARMState *);
|
void do_interrupt(CPUARMState *);
|
||||||
void switch_mode(CPUARMState *, int);
|
void switch_mode(CPUARMState *, int);
|
||||||
|
|
|
@ -1272,14 +1272,22 @@ ARMCPU *cpu_arm_init(const char *cpu_model)
|
||||||
cpu = ARM_CPU(object_new(object_class_get_name(oc)));
|
cpu = ARM_CPU(object_new(object_class_get_name(oc)));
|
||||||
env = &cpu->env;
|
env = &cpu->env;
|
||||||
env->cpu_model_str = cpu_model;
|
env->cpu_model_str = cpu_model;
|
||||||
arm_cpu_realize(cpu);
|
|
||||||
|
/* TODO this should be set centrally, once possible */
|
||||||
|
object_property_set_bool(OBJECT(cpu), true, "realized", NULL);
|
||||||
|
|
||||||
if (tcg_enabled() && !inited) {
|
if (tcg_enabled() && !inited) {
|
||||||
inited = 1;
|
inited = 1;
|
||||||
arm_translate_init();
|
arm_translate_init();
|
||||||
}
|
}
|
||||||
|
|
||||||
cpu_reset(CPU(cpu));
|
return cpu;
|
||||||
|
}
|
||||||
|
|
||||||
|
void arm_cpu_register_gdb_regs_for_features(ARMCPU *cpu)
|
||||||
|
{
|
||||||
|
CPUARMState *env = &cpu->env;
|
||||||
|
|
||||||
if (arm_feature(env, ARM_FEATURE_NEON)) {
|
if (arm_feature(env, ARM_FEATURE_NEON)) {
|
||||||
gdb_register_coprocessor(env, vfp_gdb_get_reg, vfp_gdb_set_reg,
|
gdb_register_coprocessor(env, vfp_gdb_get_reg, vfp_gdb_set_reg,
|
||||||
51, "arm-neon.xml", 0);
|
51, "arm-neon.xml", 0);
|
||||||
|
@ -1290,8 +1298,6 @@ ARMCPU *cpu_arm_init(const char *cpu_model)
|
||||||
gdb_register_coprocessor(env, vfp_gdb_get_reg, vfp_gdb_set_reg,
|
gdb_register_coprocessor(env, vfp_gdb_get_reg, vfp_gdb_set_reg,
|
||||||
19, "arm-vfp.xml", 0);
|
19, "arm-vfp.xml", 0);
|
||||||
}
|
}
|
||||||
qemu_init_vcpu(env);
|
|
||||||
return cpu;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Sort alphabetically by type name, except for "any". */
|
/* Sort alphabetically by type name, except for "any". */
|
||||||
|
|
Loading…
Reference in New Issue