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

disas: QOMify sparc specific disas setup 



Move the target_disas() sparc specifics to the QOM disas_set_info hook
and delete the #ifdef specific code in disas.c.

Cc: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: default avatarPeter Crosthwaite <crosthwaite.peter@gmail.com>
Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
parent 4f669905

disas.c

+0 −10
Original line number Diff line number Diff line
@@ -214,11 +214,6 @@ void target_disas(FILE *out, CPUState *cpu, target_ulong code, 
        s.info.mach = bfd_mach_i386_i386;

    }

    s.info.print_insn = print_insn_i386;

#elif defined(TARGET_SPARC)

    s.info.print_insn = print_insn_sparc;

#ifdef TARGET_SPARC64

    s.info.mach = bfd_mach_sparc_v9b;

#endif

#elif defined(TARGET_PPC)

    if ((flags >> 16) & 1) {

        s.info.endian = BFD_ENDIAN_LITTLE;
@@ -423,11 +418,6 @@ void monitor_disas(Monitor *mon, CPUState *cpu, 
    s.info.print_insn = print_insn_i386;

#elif defined(TARGET_ALPHA)

    s.info.print_insn = print_insn_alpha;

#elif defined(TARGET_SPARC)

    s.info.print_insn = print_insn_sparc;

#ifdef TARGET_SPARC64

    s.info.mach = bfd_mach_sparc_v9b;

#endif

#elif defined(TARGET_PPC)

    if (flags & 0xFFFF) {

        /* If we have a precise definition of the instruction set, use it. */

target-sparc/cpu.c

+9 −0
Original line number Diff line number Diff line
@@ -90,6 +90,14 @@ static bool sparc_cpu_exec_interrupt(CPUState *cs, int interrupt_request) 
    return false;

}



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

{

    info->print_insn = print_insn_sparc;

#ifdef TARGET_SPARC64

    info->mach = bfd_mach_sparc_v9b;

#endif

}



static int cpu_sparc_register(SPARCCPU *cpu, const char *cpu_model)

{

    CPUClass *cc = CPU_GET_CLASS(cpu);
@@ -848,6 +856,7 @@ static void sparc_cpu_class_init(ObjectClass *oc, void *data) 
    cc->do_unaligned_access = sparc_cpu_do_unaligned_access;

    cc->get_phys_page_debug = sparc_cpu_get_phys_page_debug;

#endif

    cc->disas_set_info = cpu_sparc_disas_set_info;



#if defined(TARGET_SPARC64) && !defined(TARGET_ABI32)

    cc->gdb_num_core_regs = 86;