[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 09/29] sparc: move adhoc CPUSPARCState initialization
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL 09/29] sparc: move adhoc CPUSPARCState initialization to realize time |
Date: |
Fri, 1 Sep 2017 12:02:57 -0300 |
From: Igor Mammedov <address@hidden>
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 <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---
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 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);
--
2.13.5
- [Qemu-devel] [PULL 00/29] x86 & cpu queue, 2017-09-01, Eduardo Habkost, 2017/09/01
- [Qemu-devel] [PULL 03/29] hmp: allow apic-id for "info lapic", Eduardo Habkost, 2017/09/01
- [Qemu-devel] [PULL 02/29] cpu: cpu_by_arch_id() helper, Eduardo Habkost, 2017/09/01
- [Qemu-devel] [PULL 01/29] qom: Remove unused errp parameter from can_be_deleted(), Eduardo Habkost, 2017/09/01
- [Qemu-devel] [PULL 05/29] qom: cpu: fix parsed feature string length, Eduardo Habkost, 2017/09/01
- [Qemu-devel] [PULL 04/29] target-i386/cpu: Add new EPYC CPU model, Eduardo Habkost, 2017/09/01
- [Qemu-devel] [PULL 07/29] sparc: embed sparc_def_t into CPUSPARCState, Eduardo Habkost, 2017/09/01
- [Qemu-devel] [PULL 06/29] sparc: convert cpu models to SPARC cpu subclasses, Eduardo Habkost, 2017/09/01
- [Qemu-devel] [PULL 08/29] sparc: convert cpu features to qdev properties, Eduardo Habkost, 2017/09/01
- [Qemu-devel] [PULL 09/29] sparc: move adhoc CPUSPARCState initialization to realize time,
Eduardo Habkost <=
- [Qemu-devel] [PULL 10/29] sparc: make cpu feature parsing property based, Eduardo Habkost, 2017/09/01
- [Qemu-devel] [PULL 11/29] sparc: replace cpu_sparc_init() with cpu_generic_init(), Eduardo Habkost, 2017/09/01
- [Qemu-devel] [PULL 14/29] hppa: replace cpu_hppa_init() with cpu_generic_init(), Eduardo Habkost, 2017/09/01
- [Qemu-devel] [PULL 12/29] s390x: replace cpu_s390x_init() with cpu_generic_init(), Eduardo Habkost, 2017/09/01
- [Qemu-devel] [PULL 13/29] alpha: replace cpu_alpha_init() with cpu_generic_init(), Eduardo Habkost, 2017/09/01
- [Qemu-devel] [PULL 15/29] m68k: replace cpu_m68k_init() with cpu_generic_init(), Eduardo Habkost, 2017/09/01
- [Qemu-devel] [PULL 16/29] microblaze: replace cpu_mb_init() with cpu_generic_init(), Eduardo Habkost, 2017/09/01
- [Qemu-devel] [PULL 17/29] nios2: replace cpu_nios2_init() with cpu_generic_init(), Eduardo Habkost, 2017/09/01
- [Qemu-devel] [PULL 19/29] xtensa: replace cpu_xtensa_init() with cpu_generic_init(), Eduardo Habkost, 2017/09/01
- [Qemu-devel] [PULL 20/29] tricore: replace cpu_tricore_init() with cpu_generic_init(), Eduardo Habkost, 2017/09/01