[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-2.11 18/27] sh4: replace cpu_sh4_init() with cpu
From: |
Igor Mammedov |
Subject: |
[Qemu-devel] [PATCH for-2.11 18/27] sh4: replace cpu_sh4_init() with cpu_generic_init() |
Date: |
Fri, 18 Aug 2017 12:08:50 +0200 |
it's just a wrapper, drop it and use cpu_generic_init() directly
Signed-off-by: Igor Mammedov <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>
---
target/sh4/cpu.h | 3 +--
hw/sh4/r2d.c | 2 +-
hw/sh4/shix.c | 2 +-
target/sh4/cpu.c | 5 -----
4 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/target/sh4/cpu.h b/target/sh4/cpu.h
index 3c47f0d..79f85d3 100644
--- a/target/sh4/cpu.h
+++ b/target/sh4/cpu.h
@@ -238,7 +238,6 @@ void superh_cpu_do_unaligned_access(CPUState *cpu, vaddr
addr,
int mmu_idx, uintptr_t retaddr);
void sh4_translate_init(void);
-SuperHCPU *cpu_sh4_init(const char *cpu_model);
int cpu_sh4_signal_handler(int host_signum, void *pinfo,
void *puc);
int superh_cpu_handle_mmu_fault(CPUState *cpu, vaddr address, int rw,
@@ -269,7 +268,7 @@ int cpu_sh4_is_cached(CPUSH4State * env, target_ulong addr);
void cpu_load_tlb(CPUSH4State * env);
-#define cpu_init(cpu_model) CPU(cpu_sh4_init(cpu_model))
+#define cpu_init(cpu_model) cpu_generic_init(TYPE_SUPERH_CPU, cpu_model)
#define cpu_signal_handler cpu_sh4_signal_handler
#define cpu_list sh4_cpu_list
diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c
index a0462ad..22bc534 100644
--- a/hw/sh4/r2d.c
+++ b/hw/sh4/r2d.c
@@ -246,7 +246,7 @@ static void r2d_init(MachineState *machine)
cpu_model = "SH7751R";
}
- cpu = cpu_sh4_init(cpu_model);
+ cpu = SUPERH_CPU(cpu_generic_init(TYPE_SUPERH_CPU, cpu_model));
if (cpu == NULL) {
fprintf(stderr, "Unable to find CPU definition\n");
exit(1);
diff --git a/hw/sh4/shix.c b/hw/sh4/shix.c
index e22eaf0..7f8a4b6 100644
--- a/hw/sh4/shix.c
+++ b/hw/sh4/shix.c
@@ -56,7 +56,7 @@ static void shix_init(MachineState *machine)
if (!cpu_model)
cpu_model = "any";
- cpu = cpu_sh4_init(cpu_model);
+ cpu = SUPERH_CPU(cpu_generic_init(TYPE_SUPERH_CPU, cpu_model));
if (cpu == NULL) {
fprintf(stderr, "Unable to find CPU definition\n");
exit(1);
diff --git a/target/sh4/cpu.c b/target/sh4/cpu.c
index 8536f6d..6ce7cba 100644
--- a/target/sh4/cpu.c
+++ b/target/sh4/cpu.c
@@ -156,11 +156,6 @@ static ObjectClass *superh_cpu_class_by_name(const char
*cpu_model)
return oc;
}
-SuperHCPU *cpu_sh4_init(const char *cpu_model)
-{
- return SUPERH_CPU(cpu_generic_init(TYPE_SUPERH_CPU, cpu_model));
-}
-
static void sh7750r_cpu_initfn(Object *obj)
{
SuperHCPU *cpu = SUPERH_CPU(obj);
--
2.7.4
- Re: [Qemu-devel] [PATCH for-2.11 06/27] x86: extract legacy cpu features format parser, (continued)
- Re: [Qemu-devel] [PATCH for-2.11 06/27] x86: extract legacy cpu features format parser, Eduardo Habkost, 2017/08/18
- Re: [Qemu-devel] [PATCH for-2.11 06/27] x86: extract legacy cpu features format parser, Eduardo Habkost, 2017/08/23
- Re: [Qemu-devel] [PATCH for-2.11 06/27] x86: extract legacy cpu features format parser, Igor Mammedov, 2017/08/23
- Re: [Qemu-devel] [PATCH for-2.11 06/27] x86: extract legacy cpu features format parser, Eduardo Habkost, 2017/08/23
- Re: [Qemu-devel] [PATCH for-2.11 06/27] x86: extract legacy cpu features format parser, Igor Mammedov, 2017/08/23
- Re: [Qemu-devel] [PATCH for-2.11 06/27] x86: extract legacy cpu features format parser, Eduardo Habkost, 2017/08/23
- Re: [Qemu-devel] [PATCH for-2.11 06/27] x86: extract legacy cpu features format parser, Igor Mammedov, 2017/08/24
[Qemu-devel] [PATCH for-2.11 14/27] nios2: replace cpu_nios2_init() with cpu_generic_init(), Igor Mammedov, 2017/08/18
[Qemu-devel] [PATCH for-2.11 15/27] tilegx: replace cpu_tilegx_init() with cpu_generic_init(), Igor Mammedov, 2017/08/18
[Qemu-devel] [PATCH for-2.11 18/27] sh4: replace cpu_sh4_init() with cpu_generic_init(),
Igor Mammedov <=
[Qemu-devel] [PATCH for-2.11 20/27] cris: replace cpu_cris_init() with cpu_generic_init(), Igor Mammedov, 2017/08/18
[Qemu-devel] [PATCH for-2.11 22/27] lm32: replace cpu_lm32_init() with cpu_generic_init(), Igor Mammedov, 2017/08/18
[Qemu-devel] [PATCH for-2.11 08/27] sparc: replace cpu_sparc_init() with cpu_generic_init(), Igor Mammedov, 2017/08/18
Re: [Qemu-devel] [PATCH for-2.11 08/27] sparc: replace cpu_sparc_init() with cpu_generic_init(), Philippe Mathieu-Daudé, 2017/08/23
[Qemu-devel] [PATCH for-2.11 17/27] tricore: replace cpu_tricore_init() with cpu_generic_init(), Igor Mammedov, 2017/08/18
[Qemu-devel] [PATCH for-2.11 16/27] xtensa: replace cpu_xtensa_init() with cpu_generic_init(), Igor Mammedov, 2017/08/18