diff options
| author | Igor Mammedov <imammedo@redhat.com> | 2017-08-24 18:31:28 +0200 |
|---|---|---|
| committer | Eduardo Habkost <ehabkost@redhat.com> | 2017-09-01 11:54:24 -0300 |
| commit | 700549620b3ee15924f19b9eb79961655ce671c5 (patch) | |
| tree | cda989709ced1ec08c7b9dadb78a9ed5dbf55284 /target/sparc | |
| parent | de05005bf785315b8a1f12cfa8d8cfd98003b638 (diff) | |
| download | qemu-700549620b3ee15924f19b9eb79961655ce671c5.tar.gz | |
sparc: move adhoc CPUSPARCState initialization to realize time
SPARCCPU::env was initialized from previously 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>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <1503592308-93913-6-git-send-email-imammedo@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Diffstat (limited to 'target/sparc')
| -rw-r--r-- | target/sparc/cpu.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/target/sparc/cpu.c b/target/sparc/cpu.c index 82ab5ad8d9..9dfc15007d 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; } @@ -816,15 +802,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); |