ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Peter Crosthwaite <crosthwaite.peter@gmail.com>
Acked-by: Leon Alrae <leon.alrae@imgtec.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Peter Crosthwaite 2015-07-11 19:00:04 -07:00 committed by Andreas Färber
parent d49dd523e4
commit 63a946c7e3
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
disas.c
View File

@ -230,12 +230,6 @@ void target_disas(FILE *out, CPUState *cpu, target_ulong code,
} }
s.info.disassembler_options = (char *)"any"; s.info.disassembler_options = (char *)"any";
s.info.print_insn = print_insn_ppc; 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) #elif defined(TARGET_ALPHA)
s.info.mach = bfd_mach_alpha_ev6; s.info.mach = bfd_mach_alpha_ev6;
s.info.print_insn = print_insn_alpha; 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.endian = BFD_ENDIAN_LITTLE;
} }
s.info.print_insn = print_insn_ppc; 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 #endif
if (!s.info.print_insn) { if (!s.info.print_insn) {
monitor_printf(mon, "0x" TARGET_FMT_lx monitor_printf(mon, "0x" TARGET_FMT_lx

9
target-mips/cpu.c
View File

@ -97,6 +97,14 @@ static void mips_cpu_reset(CPUState *s)
#endif #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) static void mips_cpu_realizefn(DeviceState *dev, Error **errp)
{ {
CPUState *cs = CPU(dev); 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->get_phys_page_debug = mips_cpu_get_phys_page_debug;
cc->vmsd = &vmstate_mips_cpu; cc->vmsd = &vmstate_mips_cpu;
#endif #endif
cc->disas_set_info = mips_cpu_disas_set_info;
cc->gdb_num_core_regs = 73; cc->gdb_num_core_regs = 73;
cc->gdb_stop_before_watchpoint = true; cc->gdb_stop_before_watchpoint = true;