diff options
| author | Eduardo Habkost <ehabkost@redhat.com> | 2015-02-26 17:37:46 -0300 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2015-03-10 17:07:27 +0100 |
| commit | 41979669ab756791cebc1a20c6a6ee1cb7c71caa (patch) | |
| tree | b32616a4122d165e863de41dc50e002c4de99652 | |
| parent | 6e8e26519901bc254a0db2e8aad805c4349cd3b4 (diff) | |
target-unicore32: Make uc32_cpu_init() return UniCore32CPU
This way, the cpu_init() function in target-unicore32 will follow the
same pattern used on all other architectures.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
| -rw-r--r-- | target-unicore32/cpu.h | 14 | ||||
| -rw-r--r-- | target-unicore32/helper.c | 10 |
2 files changed, 14 insertions, 10 deletions
diff --git a/target-unicore32/cpu.h b/target-unicore32/cpu.h index 50972f9494..11d76dc4c1 100644 --- a/target-unicore32/cpu.h +++ b/target-unicore32/cpu.h @@ -122,11 +122,9 @@ void cpu_asr_write(CPUUniCore32State *env1, target_ulong val, target_ulong mask) #define UC32_HWCAP_CMOV 4 /* 1 << 2 */ #define UC32_HWCAP_UCF64 8 /* 1 << 3 */ -#define cpu_init uc32_cpu_init #define cpu_exec uc32_cpu_exec #define cpu_signal_handler uc32_cpu_signal_handler -CPUUniCore32State *uc32_cpu_init(const char *cpu_model); int uc32_cpu_exec(CPUUniCore32State *s); int uc32_cpu_signal_handler(int host_signum, void *pinfo, void *puc); @@ -143,6 +141,18 @@ static inline int cpu_mmu_index(CPUUniCore32State *env) #include "cpu-qom.h" #include "exec/exec-all.h" +UniCore32CPU *uc32_cpu_init(const char *cpu_model); + +static inline CPUUniCore32State *cpu_init(const char *cpu_model) +{ + UniCore32CPU *cpu = uc32_cpu_init(cpu_model); + if (cpu == NULL) { + return NULL; + } + return &cpu->env; + +} + static inline void cpu_get_tb_cpu_state(CPUUniCore32State *env, target_ulong *pc, target_ulong *cs_base, int *flags) { diff --git a/target-unicore32/helper.c b/target-unicore32/helper.c index b4654fa98a..ae63277c84 100644 --- a/target-unicore32/helper.c +++ b/target-unicore32/helper.c @@ -25,15 +25,9 @@ #define DPRINTF(fmt, ...) do {} while (0) #endif -CPUUniCore32State *uc32_cpu_init(const char *cpu_model) +UniCore32CPU *uc32_cpu_init(const char *cpu_model) { - UniCore32CPU *cpu; - - cpu = UNICORE32_CPU(cpu_generic_init(TYPE_UNICORE32_CPU, cpu_model)); - if (cpu == NULL) { - return NULL; - } - return &cpu->env; + return UNICORE32_CPU(cpu_generic_init(TYPE_UNICORE32_CPU, cpu_model)); } uint32_t HELPER(clo)(uint32_t x) |