| Message ID | 1503050939-227939-5-git-send-email-imammedo@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 08/18/2017 07:08 AM, Igor Mammedov wrote: > SPARCCPU::env was initialized from previosuly set properties "previously" > (with help of sparc_cpu_parse_features) in cpu_sparc_register(). > However there is not reason to keep it there as this task is > typically done at realize time. So move post properties > initialization into sparc_cpu_realizefn, which brings > cpu_sparc_init() closer to cpu_generic_init(). > > Signed-off-by: Igor Mammedov <imammedo@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > CC: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> > CC: Artyom Tarasenko <atar4qemu@gmail.com> > --- > target/sparc/cpu.c | 30 +++++++++++++++--------------- > 1 file changed, 15 insertions(+), 15 deletions(-) > > diff --git a/target/sparc/cpu.c b/target/sparc/cpu.c > index e735d73..7f74b1c 100644 > --- a/target/sparc/cpu.c > +++ b/target/sparc/cpu.c > @@ -109,7 +109,6 @@ static void sparc_cpu_parse_features(CPUState *cs, char *features, > > static int cpu_sparc_register(SPARCCPU *cpu, const char *cpu_model) > { > - CPUSPARCState *env = &cpu->env; > char *s = g_strdup(cpu_model); > char *featurestr = strtok(s, ","); > Error *err = NULL; > @@ -122,19 +121,6 @@ static int cpu_sparc_register(SPARCCPU *cpu, const char *cpu_model) > return -1; > } > > - env->version = env->def.iu_version; > - env->fsr = env->def.fpu_version; > - env->nwindows = env->def.nwindows; > -#if !defined(TARGET_SPARC64) > - env->mmuregs[0] |= env->def.mmu_version; > - cpu_sparc_set_id(env, 0); > - env->mxccregs[7] |= env->def.mxcc_version; > -#else > - env->mmu_version = env->def.mmu_version; > - env->maxtl = env->def.maxtl; > - env->version |= env->def.maxtl << 8; > - env->version |= env->def.nwindows - 1; > -#endif > return 0; > } > > @@ -817,15 +803,29 @@ static void sparc_cpu_realizefn(DeviceState *dev, Error **errp) > CPUState *cs = CPU(dev); > SPARCCPUClass *scc = SPARC_CPU_GET_CLASS(dev); > Error *local_err = NULL; > -#if defined(CONFIG_USER_ONLY) > SPARCCPU *cpu = SPARC_CPU(dev); > CPUSPARCState *env = &cpu->env; > > +#if defined(CONFIG_USER_ONLY) > if ((env->def.features & CPU_FEATURE_FLOAT)) { > env->def.features |= CPU_FEATURE_FLOAT128; > } > #endif > > + env->version = env->def.iu_version; > + env->fsr = env->def.fpu_version; > + env->nwindows = env->def.nwindows; > +#if !defined(TARGET_SPARC64) > + env->mmuregs[0] |= env->def.mmu_version; > + cpu_sparc_set_id(env, 0); > + env->mxccregs[7] |= env->def.mxcc_version; > +#else > + env->mmu_version = env->def.mmu_version; > + env->maxtl = env->def.maxtl; > + env->version |= env->def.maxtl << 8; > + env->version |= env->def.nwindows - 1; > +#endif > + > cpu_exec_realizefn(cs, &local_err); > if (local_err != NULL) { > error_propagate(errp, local_err); >
diff --git a/target/sparc/cpu.c b/target/sparc/cpu.c index e735d73..7f74b1c 100644 --- a/target/sparc/cpu.c +++ b/target/sparc/cpu.c @@ -109,7 +109,6 @@ static void sparc_cpu_parse_features(CPUState *cs, char *features, static int cpu_sparc_register(SPARCCPU *cpu, const char *cpu_model) { - CPUSPARCState *env = &cpu->env; char *s = g_strdup(cpu_model); char *featurestr = strtok(s, ","); Error *err = NULL; @@ -122,19 +121,6 @@ static int cpu_sparc_register(SPARCCPU *cpu, const char *cpu_model) return -1; } - env->version = env->def.iu_version; - env->fsr = env->def.fpu_version; - env->nwindows = env->def.nwindows; -#if !defined(TARGET_SPARC64) - env->mmuregs[0] |= env->def.mmu_version; - cpu_sparc_set_id(env, 0); - env->mxccregs[7] |= env->def.mxcc_version; -#else - env->mmu_version = env->def.mmu_version; - env->maxtl = env->def.maxtl; - env->version |= env->def.maxtl << 8; - env->version |= env->def.nwindows - 1; -#endif return 0; } @@ -817,15 +803,29 @@ static void sparc_cpu_realizefn(DeviceState *dev, Error **errp) CPUState *cs = CPU(dev); SPARCCPUClass *scc = SPARC_CPU_GET_CLASS(dev); Error *local_err = NULL; -#if defined(CONFIG_USER_ONLY) SPARCCPU *cpu = SPARC_CPU(dev); CPUSPARCState *env = &cpu->env; +#if defined(CONFIG_USER_ONLY) if ((env->def.features & CPU_FEATURE_FLOAT)) { env->def.features |= CPU_FEATURE_FLOAT128; } #endif + env->version = env->def.iu_version; + env->fsr = env->def.fpu_version; + env->nwindows = env->def.nwindows; +#if !defined(TARGET_SPARC64) + env->mmuregs[0] |= env->def.mmu_version; + cpu_sparc_set_id(env, 0); + env->mxccregs[7] |= env->def.mxcc_version; +#else + env->mmu_version = env->def.mmu_version; + env->maxtl = env->def.maxtl; + env->version |= env->def.maxtl << 8; + env->version |= env->def.nwindows - 1; +#endif + cpu_exec_realizefn(cs, &local_err); if (local_err != NULL) { error_propagate(errp, local_err);
SPARCCPU::env was initialized from previosuly set properties (with help of sparc_cpu_parse_features) in cpu_sparc_register(). However there is not reason to keep it there as this task is typically done at realize time. So move post properties initialization into sparc_cpu_realizefn, which brings cpu_sparc_init() closer to cpu_generic_init(). Signed-off-by: Igor Mammedov <imammedo@redhat.com> --- CC: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> CC: Artyom Tarasenko <atar4qemu@gmail.com> --- target/sparc/cpu.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-)