[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-next 38/74] target-sh4: Let cpu_sh4_init() retur
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH for-next 38/74] target-sh4: Let cpu_sh4_init() return SuperHCPU |
Date: |
Sun, 6 May 2012 17:34:38 +0200 |
Let cpu_init() return CPUSH4State for backwards compatibility.
Signed-off-by: Andreas Färber <address@hidden>
---
target-sh4/cpu.h | 4 ++--
target-sh4/translate.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/target-sh4/cpu.h b/target-sh4/cpu.h
index b6768f1..1bee13c 100644
--- a/target-sh4/cpu.h
+++ b/target-sh4/cpu.h
@@ -191,7 +191,7 @@ typedef struct CPUSH4State {
#include "cpu-qom.h"
-CPUSH4State *cpu_sh4_init(const char *cpu_model);
+SuperHCPU *cpu_sh4_init(const char *cpu_model);
int cpu_sh4_exec(CPUSH4State * s);
int cpu_sh4_signal_handler(int host_signum, void *pinfo,
void *puc);
@@ -232,7 +232,7 @@ void cpu_load_tlb(CPUSH4State * env);
#include "softfloat.h"
-#define cpu_init cpu_sh4_init
+#define cpu_init(model) (&cpu_sh4_init(model)->env)
#define cpu_exec cpu_sh4_exec
#define cpu_gen_code cpu_sh4_gen_code
#define cpu_signal_handler cpu_sh4_signal_handler
diff --git a/target-sh4/translate.c b/target-sh4/translate.c
index d25f0c5..7d35b84 100644
--- a/target-sh4/translate.c
+++ b/target-sh4/translate.c
@@ -247,7 +247,7 @@ static void cpu_register(CPUSH4State *env, const sh4_def_t
*def)
env->id = def->id;
}
-CPUSH4State *cpu_sh4_init(const char *cpu_model)
+SuperHCPU *cpu_sh4_init(const char *cpu_model)
{
SuperHCPU *cpu;
CPUSH4State *env;
@@ -264,7 +264,7 @@ CPUSH4State *cpu_sh4_init(const char *cpu_model)
cpu_reset(CPU(cpu));
cpu_register(env, def);
qemu_init_vcpu(env);
- return env;
+ return cpu;
}
static void gen_goto_tb(DisasContext * ctx, int n, target_ulong dest)
--
1.7.7
- [Qemu-devel] [PATCH for-next 33/74] pxa2xx: Use cpu_arm_init() and store ARMCPU, (continued)
- [Qemu-devel] [PATCH for-next 33/74] pxa2xx: Use cpu_arm_init() and store ARMCPU, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 44/74] milkymist: Use cpu_lm32_init() to obtain LM32CPU, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 39/74] r2d: Use cpu_sh4_init() to obtain SuperHCPU, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 37/74] arm_boot: Pass ARMCPU to do_cpu_reset(), Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 36/74] armv7m: Pass ARMCPU to armv7m_reset(), Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 35/74] armv7m: Use cpu_arm_init() to obtain ARMCPU, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 41/74] target-lm32: Let cpu_lm32_init() return LM32CPU, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 40/74] r2d: Store SuperHCPU in ResetData, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 38/74] target-sh4: Let cpu_sh4_init() return SuperHCPU,
Andreas Färber <=
- [Qemu-devel] [PATCH for-next 45/74] milkymist: Store LM32 in ResetInfo, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 53/74] axis_dev88: Use cpu_cris_init() to obtain CRISCPU, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 50/74] xtensa_lx60: Pass XtensaCPU to lx60_reset(), Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 42/74] lm32_boards: Use cpu_lm32_init() to obtain LM32CPU, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 48/74] xtensa_sim: Pass XtensaCPU to sim_reset(), Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 46/74] target-xtensa: Let cpu_xtensa_init() return XtensaCPU, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 47/74] xtensa_sim: Use cpu_xtensa_init() to obtain XtensaCPU, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 52/74] target-cris: Let cpu_cris_init() return CRISCPU, Andreas Färber, 2012/05/06