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

disas: QOMify sh4 specific disas setup 



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

Signed-off-by: default avatarPeter Crosthwaite <crosthwaite.peter@gmail.com>
Acked-by: default avatarAurelien Jarno <aurelien@aurel32.net>
Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
parent 20984673

disas.c

+0 −6
Original line number Diff line number Diff line
@@ -236,9 +236,6 @@ void target_disas(FILE *out, CPUState *cpu, target_ulong code, 
#else

    s.info.print_insn = print_insn_little_mips;

#endif

#elif defined(TARGET_SH4)

    s.info.mach = bfd_mach_sh4;

    s.info.print_insn = print_insn_sh;

#elif defined(TARGET_ALPHA)

    s.info.mach = bfd_mach_alpha_ev6;

    s.info.print_insn = print_insn_alpha;
@@ -436,9 +433,6 @@ void monitor_disas(Monitor *mon, CPUState *cpu, 
#else

    s.info.print_insn = print_insn_little_mips;

#endif

#elif defined(TARGET_SH4)

    s.info.mach = bfd_mach_sh4;

    s.info.print_insn = print_insn_sh;

#endif

    if (!s.info.print_insn) {

        monitor_printf(mon, "0x" TARGET_FMT_lx

target-sh4/cpu.c

+10 −1
Original line number Diff line number Diff line
@@ -70,6 +70,12 @@ static void superh_cpu_reset(CPUState *s) 
    set_default_nan_mode(1, &env->fp_status);

}



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

{

    info->mach = bfd_mach_sh4;

    info->print_insn = print_insn_sh;

}



typedef struct SuperHCPUListState {

    fprintf_function cpu_fprintf;

    FILE *file;
@@ -288,9 +294,12 @@ static void superh_cpu_class_init(ObjectClass *oc, void *data) 
#else

    cc->get_phys_page_debug = superh_cpu_get_phys_page_debug;

#endif

    dc->vmsd = &vmstate_sh_cpu;

    cc->disas_set_info = superh_cpu_disas_set_info;



    cc->gdb_num_core_regs = 59;



    dc->vmsd = &vmstate_sh_cpu;



    /*

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

     * the object in cpus -> dangling pointer after final