diff options
| author | Nick Clifton <nickc@redhat.com> | 2009-06-15 11:37:26 +0000 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2009-06-15 11:37:26 +0000 |
| commit | 1316c8b37f7e034b92e26695eea207e9a4cf25a0 (patch) | |
| tree | 58df998bb587809f33b964fdf20da7342b45c5bc /opcodes/arm-dis.c | |
| parent | ec68b08387d9dbda1a4470de82c12cebc896a614 (diff) | |
| download | gdb-1316c8b37f7e034b92e26695eea207e9a4cf25a0.zip gdb-1316c8b37f7e034b92e26695eea207e9a4cf25a0.tar.gz gdb-1316c8b37f7e034b92e26695eea207e9a4cf25a0.tar.bz2 | |
PR 10263
* arm-dis.c (print_insn): Ignore is_data if the user has requested
the disassembly of data as well as instructions.
* objdump.c (disassemble_bytes): Set the DISASSEMBLE_DATA bit in
the flags field of the disassemble_info structure if the -D switch
is in operation.
* dis-asm.h (struct disassemble_info): New value for the flags
field.
Diffstat (limited to 'opcodes/arm-dis.c')
| -rw-r--r-- | opcodes/arm-dis.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/opcodes/arm-dis.c b/opcodes/arm-dis.c index 884b5ae..cb3bc99 100644 --- a/opcodes/arm-dis.c +++ b/opcodes/arm-dis.c @@ -1,6 +1,6 @@ /* Instruction printing code for the ARM - Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 - 2007, Free Software Foundation, Inc. + Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, + 2004, 2007, 2009 Free Software Foundation, Inc. Contributed by Richard Earnshaw (rwe@pegasus.esprit.ec.org) Modification by James G. Smith (jsmith@cygnus.co.uk) @@ -4120,11 +4120,12 @@ print_insn (bfd_vma pc, struct disassemble_info *info, bfd_boolean little) info->bytes_per_line = 4; - if (is_data) + /* PR 10263: Disassemble data if requested to do so by the user. */ + if (is_data && ((info->flags & DISASSEMBLE_DATA) == 0)) { int i; - /* size was already set above. */ + /* Size was already set above. */ info->bytes_per_chunk = size; printer = print_insn_data; |