diff options
| author | Andreas Färber <afaerber@suse.de> | 2012-05-05 13:33:04 +0200 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2012-06-04 23:00:43 +0200 |
| commit | 30bf942d8cd822b22530be602084a0810db45936 (patch) | |
| tree | 83ed89e5e77a98b455bdb80ee90f20fe1bd3f1a7 | |
| parent | fca1be7cbcb8535fd9f6de707ac81878f34d5470 (diff) | |
target-mips: Let cpu_mips_init() return MIPSCPU
Turn cpu_init macro into a static inline function returning CPUMIPSState
for backwards compatibility.
Signed-off-by: Andreas Färber <afaerber@suse.de>
| -rw-r--r-- | target-mips/cpu.h | 12 | ||||
| -rw-r--r-- | target-mips/translate.c | 4 |
2 files changed, 12 insertions, 4 deletions
diff --git a/target-mips/cpu.h b/target-mips/cpu.h index 44c1152a3a..c7c9cb9a6a 100644 --- a/target-mips/cpu.h +++ b/target-mips/cpu.h @@ -496,7 +496,6 @@ void cpu_unassigned_access(CPUMIPSState *env, target_phys_addr_t addr, void mips_cpu_list (FILE *f, fprintf_function cpu_fprintf); -#define cpu_init cpu_mips_init #define cpu_exec cpu_mips_exec #define cpu_gen_code cpu_mips_gen_code #define cpu_signal_handler cpu_mips_signal_handler @@ -626,9 +625,18 @@ enum { #define CPU_INTERRUPT_WAKE CPU_INTERRUPT_TGT_INT_0 int cpu_mips_exec(CPUMIPSState *s); -CPUMIPSState *cpu_mips_init(const char *cpu_model); +MIPSCPU *cpu_mips_init(const char *cpu_model); int cpu_mips_signal_handler(int host_signum, void *pinfo, void *puc); +static inline CPUMIPSState *cpu_init(const char *cpu_model) +{ + MIPSCPU *cpu = cpu_mips_init(cpu_model); + if (cpu == NULL) { + return NULL; + } + return &cpu->env; +} + /* mips_timer.c */ uint32_t cpu_mips_get_random (CPUMIPSState *env); uint32_t cpu_mips_get_count (CPUMIPSState *env); diff --git a/target-mips/translate.c b/target-mips/translate.c index 1ab44ed9c9..4e15ee36b8 100644 --- a/target-mips/translate.c +++ b/target-mips/translate.c @@ -12689,7 +12689,7 @@ static void mips_tcg_init(void) #include "translate_init.c" -CPUMIPSState *cpu_mips_init (const char *cpu_model) +MIPSCPU *cpu_mips_init(const char *cpu_model) { MIPSCPU *cpu; CPUMIPSState *env; @@ -12711,7 +12711,7 @@ CPUMIPSState *cpu_mips_init (const char *cpu_model) mips_tcg_init(); cpu_reset(CPU(cpu)); qemu_init_vcpu(env); - return env; + return cpu; } void cpu_state_reset(CPUMIPSState *env) |