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 /binutils | |
| parent | ec68b08387d9dbda1a4470de82c12cebc896a614 (diff) | |
| download | fsf-binutils-gdb-1316c8b37f7e034b92e26695eea207e9a4cf25a0.zip fsf-binutils-gdb-1316c8b37f7e034b92e26695eea207e9a4cf25a0.tar.gz fsf-binutils-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 'binutils')
| -rw-r--r-- | binutils/ChangeLog | 7 | ||||
| -rw-r--r-- | binutils/objdump.c | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog index cc1e87d..e008e95 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,10 @@ +2009-06-15 Nick Clifton <nickc@redhat.com> + + PR 10263 + * 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. + 2009-06-12 Homer Xing <homer.xing@yahoo.com> * NEWS: Mention new feature added to gprof. diff --git a/binutils/objdump.c b/binutils/objdump.c index 265a8ea..3cf03f7 100644 --- a/binutils/objdump.c +++ b/binutils/objdump.c @@ -1525,7 +1525,7 @@ disassemble_bytes (struct disassemble_info * info, info->stream = &sfile; info->bytes_per_line = 0; info->bytes_per_chunk = 0; - info->flags = 0; + info->flags = disassemble_all ? DISASSEMBLE_DATA : 0; if (info->disassembler_needs_relocs && (bfd_get_file_flags (aux->abfd) & EXEC_P) == 0 @@ -1554,7 +1554,7 @@ disassemble_bytes (struct disassemble_info * info, || (distance_to_rel > 0 && distance_to_rel < (bfd_signed_vma) (previous_octets/ opb))) { - info->flags = INSN_HAS_RELOC; + info->flags |= INSN_HAS_RELOC; aux->reloc = **relppp; } else |