From 4f669905d95bbb6296338f9e86ffcdd8eae453d2 Mon Sep 17 00:00:00 2001 From: Peter Crosthwaite Date: Sat, 11 Jul 2015 19:00:00 -0700 Subject: disas: QOMify m68k specific disas setup MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Move the target_disas() m68k specifics to the CPUClass::disas_set_info() hook and delete the #ifdef specific code in disas.c. Signed-off-by: Peter Crosthwaite Reviewed-by: Laurent Vivier Reviewed-by: Greg Ungerer Signed-off-by: Andreas Färber --- disas.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'disas.c') diff --git a/disas.c b/disas.c index 05d409b195..1ef259632e 100644 --- a/disas.c +++ b/disas.c @@ -235,8 +235,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_M68K) - s.info.print_insn = print_insn_m68k; #elif defined(TARGET_MIPS) #ifdef TARGET_WORDS_BIGENDIAN s.info.print_insn = print_insn_big_mips; @@ -445,8 +443,6 @@ void monitor_disas(Monitor *mon, CPUState *cpu, s.info.endian = BFD_ENDIAN_LITTLE; } s.info.print_insn = print_insn_ppc; -#elif defined(TARGET_M68K) - s.info.print_insn = print_insn_m68k; #elif defined(TARGET_MIPS) #ifdef TARGET_WORDS_BIGENDIAN s.info.print_insn = print_insn_big_mips; -- cgit v1.2.1