From 11c1986817fa8ec515b87291445786734f78e4e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sun, 15 Apr 2012 00:59:50 +0200 Subject: target-m68k: QOM'ify CPU reset MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Move code from cpu_state_reset() into QOM m68k_cpu_reset(). Signed-off-by: Andreas Färber Reviewed-by: Laurent Vivier Tested-by: Laurent Vivier --- target-m68k/helper.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'target-m68k/helper.c') 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; } -- cgit v1.2.3