Commit 63a946c7 authored by Peter Crosthwaite's avatar Peter Crosthwaite Committed by Andreas Färber
Browse files

disas: QOMify mips specific disas setup 



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

Cc: Aurelien Jarno <aurelien@aurel32.net>
Signed-off-by: default avatarPeter Crosthwaite <crosthwaite.peter@gmail.com>
Acked-by: default avatarLeon Alrae <leon.alrae@imgtec.com>
Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
parent d49dd523

disas.c

+0 −12
Original line number Diff line number Diff line
@@ -230,12 +230,6 @@ void target_disas(FILE *out, CPUState *cpu, target_ulong code, 
    }

    s.info.disassembler_options = (char *)"any";

    s.info.print_insn = print_insn_ppc;

#elif defined(TARGET_MIPS)

#ifdef TARGET_WORDS_BIGENDIAN

    s.info.print_insn = print_insn_big_mips;

#else

    s.info.print_insn = print_insn_little_mips;

#endif

#elif defined(TARGET_ALPHA)

    s.info.mach = bfd_mach_alpha_ev6;

    s.info.print_insn = print_insn_alpha;
@@ -427,12 +421,6 @@ void monitor_disas(Monitor *mon, CPUState *cpu, 
        s.info.endian = BFD_ENDIAN_LITTLE;

    }

    s.info.print_insn = print_insn_ppc;

#elif defined(TARGET_MIPS)

#ifdef TARGET_WORDS_BIGENDIAN

    s.info.print_insn = print_insn_big_mips;

#else

    s.info.print_insn = print_insn_little_mips;

#endif

#endif

    if (!s.info.print_insn) {

        monitor_printf(mon, "0x" TARGET_FMT_lx

target-mips/cpu.c

+9 −0
Original line number Diff line number Diff line
@@ -97,6 +97,14 @@ static void mips_cpu_reset(CPUState *s) 
#endif

}



static void mips_cpu_disas_set_info(CPUState *s, disassemble_info *info) {

#ifdef TARGET_WORDS_BIGENDIAN

    info->print_insn = print_insn_big_mips;

#else

    info->print_insn = print_insn_little_mips;

#endif

}



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

{

    CPUState *cs = CPU(dev);
@@ -150,6 +158,7 @@ static void mips_cpu_class_init(ObjectClass *c, void *data) 
    cc->get_phys_page_debug = mips_cpu_get_phys_page_debug;

    cc->vmsd = &vmstate_mips_cpu;

#endif

    cc->disas_set_info = mips_cpu_disas_set_info;



    cc->gdb_num_core_regs = 73;

    cc->gdb_stop_before_watchpoint = true;