[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 04/12] target-sh4: QOM'ify CPU reset
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH 04/12] target-sh4: QOM'ify CPU reset |
Date: |
Wed, 25 Apr 2012 16:23:32 +0200 |
Move code from cpu_state_reset() to QOM superh_cpu_reset().
Signed-off-by: Andreas Färber <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
---
target-sh4/cpu.c | 21 ++++++++++++++++++++-
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;
--
1.7.7
- [Qemu-devel] [PULL] QOM CPUState for sh4, m68k and mips, Andreas Färber, 2012/04/25
- [Qemu-devel] [PATCH 05/12] target-sh4: Start QOM'ifying CPU init, Andreas Färber, 2012/04/25
- [Qemu-devel] [PATCH 08/12] target-m68k: Start QOM'ifying CPU init, Andreas Färber, 2012/04/25
- [Qemu-devel] [PATCH 01/12] MAINTAINERS: Downgrade target-m68k to Odd Fixes, Andreas Färber, 2012/04/25
- [Qemu-devel] [PATCH 06/12] target-m68k: QOM'ify CPU, Andreas Färber, 2012/04/25
- [Qemu-devel] [PATCH 04/12] target-sh4: QOM'ify CPU reset,
Andreas Färber <=
- [Qemu-devel] [PATCH 10/12] target-mips: QOM'ify CPU, Andreas Färber, 2012/04/25
- [Qemu-devel] [PATCH 07/12] target-m68k: QOM'ify CPU reset, Andreas Färber, 2012/04/25
- [Qemu-devel] [PATCH 12/12] Makefile: Simplify compilation of target-*/cpu.c, Andreas Färber, 2012/04/25
- [Qemu-devel] [PATCH 02/12] MAINTAINERS: Downgrade target-mips and target-sh4 to Odd Fixes, Andreas Färber, 2012/04/25
- [Qemu-devel] [PATCH 11/12] target-mips: Start QOM'ifying CPU init, Andreas Färber, 2012/04/25
- [Qemu-devel] [PATCH 03/12] target-sh4: QOM'ify CPU, Andreas Färber, 2012/04/25
- [Qemu-devel] [PATCH 09/12] target-m68k: Add QOM CPU subclasses, Andreas Färber, 2012/04/25
- Re: [Qemu-devel] [PULL] QOM CPUState for sh4, m68k and mips, Andreas Färber, 2012/04/30