Commit 9f87a4ca authored by Peter Crosthwaite's avatar Peter Crosthwaite Committed by Andreas Färber
Browse files

disas: QOMify moxie specific disas setup 



Move the target_disas() moxie specifics to the CPUClass::disas_set_info()
hook and delete the #ifdef specific code in disas.c.

Cc: Anthony Green <green@moxielogic.com>
Signed-off-by: default avatarPeter Crosthwaite <crosthwaite.peter@gmail.com>
Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
parent dbad6b74

disas.c

+0 −6
Original line number Diff line number Diff line
@@ -249,9 +249,6 @@ void target_disas(FILE *out, CPUState *cpu, target_ulong code, 
#elif defined(TARGET_ALPHA)

    s.info.mach = bfd_mach_alpha_ev6;

    s.info.print_insn = print_insn_alpha;

#elif defined(TARGET_MOXIE)

    s.info.mach = bfd_arch_moxie;

    s.info.print_insn = print_insn_moxie;

#elif defined(TARGET_LM32)

    s.info.mach = bfd_mach_lm32;

    s.info.print_insn = print_insn_lm32;
@@ -459,9 +456,6 @@ void monitor_disas(Monitor *mon, CPUState *cpu, 
#elif defined(TARGET_SH4)

    s.info.mach = bfd_mach_sh4;

    s.info.print_insn = print_insn_sh;

#elif defined(TARGET_MOXIE)

    s.info.mach = bfd_arch_moxie;

    s.info.print_insn = print_insn_moxie;

#elif defined(TARGET_LM32)

    s.info.mach = bfd_mach_lm32;

    s.info.print_insn = print_insn_lm32;

target-moxie/cpu.c

+7 −0
Original line number Diff line number Diff line
@@ -48,6 +48,12 @@ static void moxie_cpu_reset(CPUState *s) 
    tlb_flush(s, 1);

}



static void moxie_cpu_disas_set_info(CPUState *cpu, disassemble_info *info)

{

    info->mach = bfd_arch_moxie;

    info->print_insn = print_insn_moxie;

}



static void moxie_cpu_realizefn(DeviceState *dev, Error **errp)

{

    CPUState *cs = CPU(dev);
@@ -114,6 +120,7 @@ static void moxie_cpu_class_init(ObjectClass *oc, void *data) 
    cc->get_phys_page_debug = moxie_cpu_get_phys_page_debug;

    cc->vmsd = &vmstate_moxie_cpu;

#endif

    cc->disas_set_info = moxie_cpu_disas_set_info;



    /*

     * Reason: moxie_cpu_initfn() calls cpu_exec_init(), which saves