From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52051) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZOWyz-0000UG-1m for qemu-devel@nongnu.org; Sun, 09 Aug 2015 16:14:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZOWyw-0005Mr-Sj for qemu-devel@nongnu.org; Sun, 09 Aug 2015 16:14:12 -0400 Received: from smtp4-g21.free.fr ([2a01:e0c:1:1599::13]:2431) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZOWyw-0005Ly-MJ for qemu-devel@nongnu.org; Sun, 09 Aug 2015 16:14:10 -0400 From: Laurent Vivier Date: Sun, 9 Aug 2015 22:13:23 +0200 Message-Id: <1439151229-27747-5-git-send-email-laurent@vivier.eu> In-Reply-To: <1439151229-27747-1-git-send-email-laurent@vivier.eu> References: <1439151229-27747-1-git-send-email-laurent@vivier.eu> Subject: [Qemu-devel] [PATCH for-2.5 04/30] m68k: set disassembler mode to 680x0 or coldfire List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, peter.crosthwaite@xilinx.com, Andreas Schwab , Laurent Vivier , gerg@uclinux.org Signed-off-by: Laurent Vivier --- disas.c | 4 ++++ target-m68k/translate.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/disas.c b/disas.c index 69a6066..2512001 100644 --- a/disas.c +++ b/disas.c @@ -185,6 +185,7 @@ static int print_insn_od_target(bfd_vma pc, disassemble_info *info) i386 - 1 means 16 bit code, 2 means 64 bit code ppc - bits 0:15 specify (optionally) the machine instruction set; bit 16 indicates little endian. + m68k - 1 means 680x0 family, otherwise coldfire other targets - unused */ void target_disas(FILE *out, CPUState *cpu, target_ulong code, @@ -245,6 +246,9 @@ void target_disas(FILE *out, CPUState *cpu, target_ulong code, s.info.print_insn = print_insn_ppc; #elif defined(TARGET_M68K) s.info.print_insn = print_insn_m68k; + if (flags) { + s.info.mach = bfd_mach_m68040; + } #elif defined(TARGET_MIPS) #ifdef TARGET_WORDS_BIGENDIAN s.info.print_insn = print_insn_big_mips; diff --git a/target-m68k/translate.c b/target-m68k/translate.c index 3b87b0c..6ba71a2 100644 --- a/target-m68k/translate.c +++ b/target-m68k/translate.c @@ -3139,9 +3139,10 @@ gen_intermediate_code_internal(M68kCPU *cpu, TranslationBlock *tb, #ifdef DEBUG_DISAS if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)) { + int flags = m68k_feature(env, M68K_FEATURE_M68000); qemu_log("----------------\n"); qemu_log("IN: %s\n", lookup_symbol(pc_start)); - log_target_disas(cs, pc_start, dc->pc - pc_start, 0); + log_target_disas(cs, pc_start, dc->pc - pc_start, flags); qemu_log("\n"); } #endif -- 2.4.3