From 5d48e9174e3bfa8655e1dc8f80887acd9040b427 Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Mon, 10 Jan 2011 16:16:26 +0000 Subject: [PATCH] arm-dis: Include opcode hex when doing disassembly Enhance the ARM disassembler used for debugging so that it includes the hex dump of the opcode as well as the symbolic disassembly. Signed-off-by: Peter Maydell Signed-off-by: Aurelien Jarno --- arm-dis.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/arm-dis.c b/arm-dis.c index af217397d4..3ece02c1b3 100644 --- a/arm-dis.c +++ b/arm-dis.c @@ -4101,6 +4101,30 @@ print_insn_arm (bfd_vma pc, struct disassemble_info *info) addresses, since the addend is not currently pc-relative. */ pc = 0; + /* We include the hexdump of the instruction. The format here + matches that used by objdump and the ARM ARM (in particular, + 32 bit Thumb instructions are displayed as pairs of halfwords, + not as a single word.) */ + if (is_thumb) + { + if (size == 2) + { + info->fprintf_func(info->stream, "%04lx ", + ((unsigned long)given) & 0xffff); + } + else + { + info->fprintf_func(info->stream, "%04lx %04lx ", + (((unsigned long)given) >> 16) & 0xffff, + ((unsigned long)given) & 0xffff); + } + } + else + { + info->fprintf_func(info->stream, "%08lx ", + ((unsigned long)given) & 0xffffffff); + } + printer (pc, info, given); if (is_thumb)