falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

moxie: replace cpu_moxie_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-23-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:45 +02:00 committed by Eduardo Habkost
parent 1d197417a3
commit a328ad9647
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/moxie/moxiesim.c
View File

@ -118,7 +118,7 @@ static void moxiesim_init(MachineState *machine)
if (cpu_model == NULL) { if (cpu_model == NULL) {
cpu_model = "MoxieLite-moxie-cpu"; cpu_model = "MoxieLite-moxie-cpu";
} }
cpu = cpu_moxie_init(cpu_model); cpu = MOXIE_CPU(cpu_generic_init(TYPE_MOXIE_CPU, cpu_model));
if (!cpu) { if (!cpu) {
fprintf(stderr, "Unable to find CPU definition\n"); fprintf(stderr, "Unable to find CPU definition\n");
exit(1); exit(1);

5
target/moxie/cpu.c
View File

@ -150,11 +150,6 @@ static const MoxieCPUInfo moxie_cpus[] = {
{ .name = "any", .initfn = moxie_any_initfn }, { .name = "any", .initfn = moxie_any_initfn },
}; };
MoxieCPU *cpu_moxie_init(const char *cpu_model)
{
return MOXIE_CPU(cpu_generic_init(TYPE_MOXIE_CPU, cpu_model));
}
static void cpu_register(const MoxieCPUInfo *info) static void cpu_register(const MoxieCPUInfo *info)
{ {
TypeInfo type_info = { TypeInfo type_info = {

3
target/moxie/cpu.h
View File

@ -112,7 +112,6 @@ static inline MoxieCPU *moxie_env_get_cpu(CPUMoxieState *env)
#define ENV_OFFSET offsetof(MoxieCPU, env) #define ENV_OFFSET offsetof(MoxieCPU, env)
MoxieCPU *cpu_moxie_init(const char *cpu_model);
void moxie_cpu_do_interrupt(CPUState *cs); void moxie_cpu_do_interrupt(CPUState *cs);
void moxie_cpu_dump_state(CPUState *cpu, FILE *f, void moxie_cpu_dump_state(CPUState *cpu, FILE *f,
fprintf_function cpu_fprintf, int flags); fprintf_function cpu_fprintf, int flags);
@ -121,7 +120,7 @@ void moxie_translate_init(void);
int cpu_moxie_signal_handler(int host_signum, void *pinfo, int cpu_moxie_signal_handler(int host_signum, void *pinfo,
void *puc); void *puc);
#define cpu_init(cpu_model) CPU(cpu_moxie_init(cpu_model)) #define cpu_init(cpu_model) cpu_generic_init(TYPE_MOXIE_CPU, cpu_model)
#define cpu_signal_handler cpu_moxie_signal_handler #define cpu_signal_handler cpu_moxie_signal_handler