diff options
| -rw-r--r-- | cpu-defs.h | 4 | ||||
| -rw-r--r-- | exec.c | 7 | ||||
| -rw-r--r-- | target-arm/helper.c | 1 | ||||
| -rw-r--r-- | target-i386/helper2.c | 1 | ||||
| -rw-r--r-- | target-m68k/helper.c | 4 | ||||
| -rw-r--r-- | target-mips/translate.c | 1 | ||||
| -rw-r--r-- | target-ppc/helper.c | 1 | ||||
| -rw-r--r-- | target-sparc/translate.c | 1 |
8 files changed, 12 insertions, 8 deletions
diff --git a/cpu-defs.h b/cpu-defs.h index 139dca2e79..5e0f04674e 100644 --- a/cpu-defs.h +++ b/cpu-defs.h @@ -146,6 +146,8 @@ typedef struct CPUTLBEntry { void *next_cpu; /* next CPU sharing TB cache */ \ int cpu_index; /* CPU index (informative) */ \ /* user data */ \ - void *opaque; + void *opaque; \ + \ + const char *cpu_model_str; #endif @@ -1317,9 +1317,7 @@ void cpu_abort(CPUState *env, const char *fmt, ...) CPUState *cpu_copy(CPUState *env) { -#if 0 - /* XXX: broken, must be handled by each CPU */ - CPUState *new_env = cpu_init(); + CPUState *new_env = cpu_init(env->cpu_model_str); /* preserve chaining and index */ CPUState *next_cpu = new_env->next_cpu; int cpu_index = new_env->cpu_index; @@ -1327,9 +1325,6 @@ CPUState *cpu_copy(CPUState *env) new_env->next_cpu = next_cpu; new_env->cpu_index = cpu_index; return new_env; -#else - return NULL; -#endif } #if !defined(CONFIG_USER_ONLY) diff --git a/target-arm/helper.c b/target-arm/helper.c index 40bdeb186e..86470dbeee 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -182,6 +182,7 @@ CPUARMState *cpu_arm_init(const char *cpu_model) if (!env) return NULL; cpu_exec_init(env); + env->cpu_model_str = cpu_model; env->cp15.c0_cpuid = id; cpu_reset(env); return env; diff --git a/target-i386/helper2.c b/target-i386/helper2.c index 67658e297d..968d9dd56a 100644 --- a/target-i386/helper2.c +++ b/target-i386/helper2.c @@ -99,6 +99,7 @@ CPUX86State *cpu_x86_init(const char *cpu_model) if (!env) return NULL; cpu_exec_init(env); + env->cpu_model_str = cpu_model; /* init various static tables */ if (!inited) { diff --git a/target-m68k/helper.c b/target-m68k/helper.c index f6b0cd6b35..c63964891d 100644 --- a/target-m68k/helper.c +++ b/target-m68k/helper.c @@ -126,11 +126,13 @@ CPUM68KState *cpu_m68k_init(const char *cpu_model) return NULL; cpu_exec_init(env); + env->cpu_model_str = cpu_model; + if (cpu_m68k_set_model(env, cpu_model) < 0) { cpu_m68k_close(env); return NULL; } - + cpu_reset(env); return env; } diff --git a/target-mips/translate.c b/target-mips/translate.c index c909463da5..abbf0677c0 100644 --- a/target-mips/translate.c +++ b/target-mips/translate.c @@ -6786,6 +6786,7 @@ CPUMIPSState *cpu_mips_init (const char *cpu_model) env->cpu_model = def; cpu_exec_init(env); + env->cpu_model_str = cpu_model; cpu_reset(env); return env; } diff --git a/target-ppc/helper.c b/target-ppc/helper.c index 7a32d4a27f..a808454a20 100644 --- a/target-ppc/helper.c +++ b/target-ppc/helper.c @@ -2976,6 +2976,7 @@ CPUPPCState *cpu_ppc_init (const char *cpu_model) if (!env) return NULL; cpu_exec_init(env); + env->cpu_model_str = cpu_model; cpu_ppc_register_internal(env, def); cpu_ppc_reset(env); return env; diff --git a/target-sparc/translate.c b/target-sparc/translate.c index 37a0d2963b..ecec372723 100644 --- a/target-sparc/translate.c +++ b/target-sparc/translate.c @@ -3792,6 +3792,7 @@ CPUSPARCState *cpu_sparc_init(const char *cpu_model) if (!env) return NULL; cpu_exec_init(env); + env->cpu_model_str = cpu_model; env->version = def->iu_version; env->fsr = def->fpu_version; #if !defined(TARGET_SPARC64) |