* 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.
This commit is contained in:
Nick Clifton 2009-06-15 11:37:26 +00:00
parent fee56469d4
commit e586b9d5c5
2 changed files with 21 additions and 10 deletions

View File

@ -1,3 +1,8 @@
2009-06-15 Nick Clifton <nickc@redhat.com>
* dis-asm.h (struct disassemble_info): New value for the flags
field.
2009-06-02 Ian Lance Taylor <iant@google.com> 2009-06-02 Ian Lance Taylor <iant@google.com>
* ansidecl.h (EXPORTED_CONST): Define. * ansidecl.h (EXPORTED_CONST): Define.

View File

@ -1,6 +1,6 @@
/* Interface between the opcode library and its callers. /* Interface between the opcode library and its callers.
Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
Free Software Foundation, Inc. Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
@ -39,14 +39,14 @@ extern "C" {
enum dis_insn_type enum dis_insn_type
{ {
dis_noninsn, /* Not a valid instruction */ dis_noninsn, /* Not a valid instruction. */
dis_nonbranch, /* Not a branch instruction */ dis_nonbranch, /* Not a branch instruction. */
dis_branch, /* Unconditional branch */ dis_branch, /* Unconditional branch. */
dis_condbranch, /* Conditional branch */ dis_condbranch, /* Conditional branch. */
dis_jsr, /* Jump to subroutine */ dis_jsr, /* Jump to subroutine. */
dis_condjsr, /* Conditional jump to subroutine */ dis_condjsr, /* Conditional jump to subroutine. */
dis_dref, /* Data reference instruction */ dis_dref, /* Data reference instruction. */
dis_dref2 /* Two data references in instruction */ dis_dref2 /* Two data references in instruction. */
}; };
/* This struct is passed into the instruction decoding routine, /* This struct is passed into the instruction decoding routine,
@ -108,7 +108,13 @@ typedef struct disassemble_info
The top 16 bits are reserved for public use (and are documented here). The top 16 bits are reserved for public use (and are documented here).
The bottom 16 bits are for the internal use of the disassembler. */ The bottom 16 bits are for the internal use of the disassembler. */
unsigned long flags; unsigned long flags;
#define INSN_HAS_RELOC 0x80000000 /* Set if the disassembler has determined that there are one or more
relocations associated with the instruction being disassembled. */
#define INSN_HAS_RELOC (1 << 31)
/* Set if the user has requested the disassembly of data as well as code. */
#define DISASSEMBLE_DATA (1 << 30)
/* Use internally by the target specific disassembly code. */
void *private_data; void *private_data;
/* Function used to get bytes to disassemble. MEMADDR is the /* Function used to get bytes to disassemble. MEMADDR is the