diff options
| author | Andreas Färber <afaerber@suse.de> | 2012-04-15 00:59:50 +0200 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2012-04-30 11:32:12 +0200 |
| commit | 11c1986817fa8ec515b87291445786734f78e4e0 (patch) | |
| tree | 0e5647f1bde80b920cc2e647ba4473c8a6337bfe /target-m68k | |
| parent | b9e7a234343501e2498680fd7bc0cd2aad947560 (diff) | |
target-m68k: QOM'ify CPU reset
Move code from cpu_state_reset() into QOM m68k_cpu_reset().
Signed-off-by: Andreas Färber <afaerber@suse.de>
Reviewed-by: Laurent Vivier <Laurent@Vivier.EU>
Tested-by: Laurent Vivier <Laurent@Vivier.EU>
Diffstat (limited to 'target-m68k')
| -rw-r--r-- | target-m68k/cpu.c | 16 | ||||
| -rw-r--r-- | target-m68k/helper.c | 18 |
2 files changed, 17 insertions, 17 deletions
diff --git a/target-m68k/cpu.c b/target-m68k/cpu.c index 457c5c1940..e599ece430 100644 --- a/target-m68k/cpu.c +++ b/target-m68k/cpu.c @@ -29,9 +29,23 @@ static void m68k_cpu_reset(CPUState *s) M68kCPUClass *mcc = M68K_CPU_GET_CLASS(cpu); CPUM68KState *env = &cpu->env; + if (qemu_loglevel_mask(CPU_LOG_RESET)) { + qemu_log("CPU Reset (CPU %d)\n", env->cpu_index); + log_cpu_state(env, 0); + } + mcc->parent_reset(s); - cpu_state_reset(env); + memset(env, 0, offsetof(CPUM68KState, breakpoints)); +#if !defined(CONFIG_USER_ONLY) + env->sr = 0x2700; +#endif + m68k_switch_sp(env); + /* ??? FP regs should be initialized to NaN. */ + env->cc_op = CC_OP_FLAGS; + /* TODO: We should set PC from the interrupt vector. */ + env->pc = 0; + tlb_flush(env, 1); } static void m68k_cpu_class_init(ObjectClass *c, void *data) diff --git a/target-m68k/helper.c b/target-m68k/helper.c index e91acdbf0d..69fb147526 100644 --- a/target-m68k/helper.c +++ b/target-m68k/helper.c @@ -145,21 +145,7 @@ static int cpu_m68k_set_model(CPUM68KState *env, const char *name) void cpu_state_reset(CPUM68KState *env) { - if (qemu_loglevel_mask(CPU_LOG_RESET)) { - qemu_log("CPU Reset (CPU %d)\n", env->cpu_index); - log_cpu_state(env, 0); - } - - memset(env, 0, offsetof(CPUM68KState, breakpoints)); -#if !defined (CONFIG_USER_ONLY) - env->sr = 0x2700; -#endif - m68k_switch_sp(env); - /* ??? FP regs should be initialized to NaN. */ - env->cc_op = CC_OP_FLAGS; - /* TODO: We should set PC from the interrupt vector. */ - env->pc = 0; - tlb_flush(env, 1); + cpu_reset(ENV_GET_CPU(env)); } CPUM68KState *cpu_m68k_init(const char *cpu_model) @@ -183,7 +169,7 @@ CPUM68KState *cpu_m68k_init(const char *cpu_model) return NULL; } - cpu_state_reset(env); + cpu_reset(ENV_GET_CPU(env)); qemu_init_vcpu(env); return env; } |