OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

sh4: replace cpu_sh4_init() with cpu_generic_init()

Browse Source 
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-18-git-send-email-imammedo@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Igor Mammedov 2017-08-24 18:31:40 +02:00 committed by Eduardo Habkost
parent a69773122b
commit 66b7977518
4 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/sh4/r2d.c
View File

@ -246,7 +246,7 @@ static void r2d_init(MachineState *machine)
cpu_model = "SH7751R"; cpu_model = "SH7751R";
} }
cpu = cpu_sh4_init(cpu_model); cpu = SUPERH_CPU(cpu_generic_init(TYPE_SUPERH_CPU, cpu_model));
if (cpu == NULL) { if (cpu == NULL) {
fprintf(stderr, "Unable to find CPU definition\n"); fprintf(stderr, "Unable to find CPU definition\n");
exit(1); exit(1);

2
hw/sh4/shix.c
View File

@ -56,7 +56,7 @@ static void shix_init(MachineState *machine)
if (!cpu_model) if (!cpu_model)
cpu_model = "any"; cpu_model = "any";
cpu = cpu_sh4_init(cpu_model); cpu = SUPERH_CPU(cpu_generic_init(TYPE_SUPERH_CPU, cpu_model));
if (cpu == NULL) { if (cpu == NULL) {
fprintf(stderr, "Unable to find CPU definition\n"); fprintf(stderr, "Unable to find CPU definition\n");
exit(1); exit(1);

5
target/sh4/cpu.c
View File

@ -156,11 +156,6 @@ static ObjectClass *superh_cpu_class_by_name(const char *cpu_model)
return oc; 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) static void sh7750r_cpu_initfn(Object *obj)
{ {
SuperHCPU *cpu = SUPERH_CPU(obj); SuperHCPU *cpu = SUPERH_CPU(obj);

3
target/sh4/cpu.h
View File

@ -238,7 +238,6 @@ void superh_cpu_do_unaligned_access(CPUState *cpu, vaddr addr,
int mmu_idx, uintptr_t retaddr); int mmu_idx, uintptr_t retaddr);
void sh4_translate_init(void); void sh4_translate_init(void);
SuperHCPU *cpu_sh4_init(const char *cpu_model);
int cpu_sh4_signal_handler(int host_signum, void *pinfo, int cpu_sh4_signal_handler(int host_signum, void *pinfo,
void *puc); void *puc);
int superh_cpu_handle_mmu_fault(CPUState *cpu, vaddr address, int rw, 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); 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_signal_handler cpu_sh4_signal_handler
#define cpu_list sh4_cpu_list #define cpu_list sh4_cpu_list