diff options
| author | Andreas Färber <afaerber@suse.de> | 2012-04-13 02:16:02 +0200 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2012-04-30 11:32:10 +0200 |
| commit | c4bb0f99e797e5e5720c27544a2fc61a0b722023 (patch) | |
| tree | 5a467180b162617ec2bf71c26fa1c740c422bdcf /target-sh4 | |
| parent | 339894bec9bb99aaeb695173006322c37a102408 (diff) | |
| download | qemu-c4bb0f99e797e5e5720c27544a2fc61a0b722023.zip qemu-c4bb0f99e797e5e5720c27544a2fc61a0b722023.tar.gz qemu-c4bb0f99e797e5e5720c27544a2fc61a0b722023.tar.bz2 | |
target-sh4: QOM'ify CPU reset
Move code from cpu_state_reset() to QOM superh_cpu_reset().
Signed-off-by: Andreas Färber <afaerber@suse.de>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target-sh4')
| -rw-r--r-- | target-sh4/cpu.c | 21 | ||||
| -rw-r--r-- | target-sh4/translate.c | 22 |
2 files changed, 22 insertions, 21 deletions
diff --git a/target-sh4/cpu.c b/target-sh4/cpu.c index e110f98..84d4672 100644 --- a/target-sh4/cpu.c +++ b/target-sh4/cpu.c @@ -1,6 +1,7 @@ /* * QEMU SuperH CPU * + * Copyright (c) 2005 Samuel Tardieu * Copyright (c) 2012 SUSE LINUX Products GmbH * * This library is free software; you can redistribute it and/or @@ -29,9 +30,27 @@ static void superh_cpu_reset(CPUState *s) SuperHCPUClass *scc = SUPERH_CPU_GET_CLASS(cpu); CPUSH4State *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); + } + scc->parent_reset(s); - cpu_state_reset(env); + memset(env, 0, offsetof(CPUSH4State, breakpoints)); + tlb_flush(env, 1); + + env->pc = 0xA0000000; +#if defined(CONFIG_USER_ONLY) + env->fpscr = FPSCR_PR; /* value for userspace according to the kernel */ + set_float_rounding_mode(float_round_nearest_even, &env->fp_status); /* ?! */ +#else + env->sr = SR_MD | SR_RB | SR_BL | SR_I3 | SR_I2 | SR_I1 | SR_I0; + env->fpscr = FPSCR_DN | FPSCR_RM_ZERO; /* CPU reset value according to SH4 manual */ + set_float_rounding_mode(float_round_to_zero, &env->fp_status); + set_flush_to_zero(1, &env->fp_status); +#endif + set_default_nan_mode(1, &env->fp_status); } static void superh_cpu_class_init(ObjectClass *oc, void *data) diff --git a/target-sh4/translate.c b/target-sh4/translate.c index 6309e85..d0568e2 100644 --- a/target-sh4/translate.c +++ b/target-sh4/translate.c @@ -180,25 +180,7 @@ void cpu_dump_state(CPUSH4State * env, FILE * f, void cpu_state_reset(CPUSH4State *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(CPUSH4State, breakpoints)); - tlb_flush(env, 1); - - env->pc = 0xA0000000; -#if defined(CONFIG_USER_ONLY) - env->fpscr = FPSCR_PR; /* value for userspace according to the kernel */ - set_float_rounding_mode(float_round_nearest_even, &env->fp_status); /* ?! */ -#else - env->sr = SR_MD | SR_RB | SR_BL | SR_I3 | SR_I2 | SR_I1 | SR_I0; - env->fpscr = FPSCR_DN | FPSCR_RM_ZERO; /* CPU reset value according to SH4 manual */ - set_float_rounding_mode(float_round_to_zero, &env->fp_status); - set_flush_to_zero(1, &env->fp_status); -#endif - set_default_nan_mode(1, &env->fp_status); + cpu_reset(ENV_GET_CPU(env)); } typedef struct { @@ -281,7 +263,7 @@ CPUSH4State *cpu_sh4_init(const char *cpu_model) env->movcal_backup_tail = &(env->movcal_backup); sh4_translate_init(); env->cpu_model_str = cpu_model; - cpu_state_reset(env); + cpu_reset(CPU(cpu)); cpu_register(env, def); qemu_init_vcpu(env); return env; |