diff options
| author | Igor Mammedov <imammedo@redhat.com> | 2017-08-24 18:31:47 +0200 |
|---|---|---|
| committer | Eduardo Habkost <ehabkost@redhat.com> | 2017-09-01 11:54:25 -0300 |
| commit | 13b884e1d78591c302ea4bf429336f8ca49c4b89 (patch) | |
| tree | f624adf0871f0e542a720d8521cb99ca62ae765c | |
| parent | f6f8b2609564b027fdf7803edc45de7bc55e4833 (diff) | |
unicore32: replace uc32_cpu_init() with cpu_generic_init()
it's just a wrapper, drop it and use cpu_generic_init() directly
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <1503592308-93913-25-git-send-email-imammedo@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
| -rw-r--r-- | hw/unicore32/puv3.c | 2 | ||||
| -rw-r--r-- | target/unicore32/cpu.h | 4 | ||||
| -rw-r--r-- | target/unicore32/helper.c | 5 |
3 files changed, 2 insertions, 9 deletions
diff --git a/hw/unicore32/puv3.c b/hw/unicore32/puv3.c index ff62efb4df..eb9862fa2f 100644 --- a/hw/unicore32/puv3.c +++ b/hw/unicore32/puv3.c @@ -127,7 +127,7 @@ static void puv3_init(MachineState *machine) cpu_model = "UniCore-II"; } - cpu = uc32_cpu_init(cpu_model); + cpu = UNICORE32_CPU(cpu_generic_init(TYPE_UNICORE32_CPU, cpu_model)); if (!cpu) { error_report("Unable to find CPU definition"); exit(1); diff --git a/target/unicore32/cpu.h b/target/unicore32/cpu.h index 7b5b405e79..7724108281 100644 --- a/target/unicore32/cpu.h +++ b/target/unicore32/cpu.h @@ -165,9 +165,7 @@ static inline int cpu_mmu_index(CPUUniCore32State *env, bool ifetch) #include "exec/cpu-all.h" -UniCore32CPU *uc32_cpu_init(const char *cpu_model); - -#define cpu_init(cpu_model) CPU(uc32_cpu_init(cpu_model)) +#define cpu_init(cpu_model) cpu_generic_init(TYPE_UNICORE32_CPU, cpu_model) static inline void cpu_get_tb_cpu_state(CPUUniCore32State *env, target_ulong *pc, target_ulong *cs_base, uint32_t *flags) diff --git a/target/unicore32/helper.c b/target/unicore32/helper.c index f9239dc7b8..309dcd1ae1 100644 --- a/target/unicore32/helper.c +++ b/target/unicore32/helper.c @@ -27,11 +27,6 @@ #define DPRINTF(fmt, ...) do {} while (0) #endif -UniCore32CPU *uc32_cpu_init(const char *cpu_model) -{ - return UNICORE32_CPU(cpu_generic_init(TYPE_UNICORE32_CPU, cpu_model)); -} - #ifndef CONFIG_USER_ONLY void helper_cp0_set(CPUUniCore32State *env, uint32_t val, uint32_t creg, uint32_t cop) |