Browse Source

disas: Rename include/disas/bfd.h back to include/disas/dis-asm.h

Commit dc99065b5f (v0.1.0) added dis-asm.h from binutils.

Commit 43d4145a98 (v0.1.5) inlined bfd.h into dis-asm.h to remove the
dependency on binutils.

Commit 76cad71136 (v1.4.0) moved dis-asm.h to include/disas/bfd.h.
The new name is confusing when you try to match against (pre GPLv3+)
binutils.  Rename it back.  Keep it in the same directory, of course.

Cc: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20190417191805.28198-17-armbru@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
tags/v4.1.0-rc0
Markus Armbruster 8 months ago
parent
commit
3979fca4b6
25 changed files with 24 additions and 24 deletions
  1. +1
    -1
      disas.c
  2. +1
    -1
      disas/alpha.c
  3. +1
    -1
      disas/arm-a64.cc
  4. +1
    -1
      disas/arm.c
  5. +1
    -1
      disas/cris.c
  6. +1
    -1
      disas/hppa.c
  7. +1
    -1
      disas/i386.c
  8. +1
    -1
      disas/lm32.c
  9. +1
    -1
      disas/m68k.c
  10. +1
    -1
      disas/microblaze.c
  11. +1
    -1
      disas/mips.c
  12. +1
    -1
      disas/moxie.c
  13. +1
    -1
      disas/nanomips.cpp
  14. +1
    -1
      disas/nios2.c
  15. +1
    -1
      disas/ppc.c
  16. +1
    -1
      disas/riscv.c
  17. +1
    -1
      disas/s390.c
  18. +1
    -1
      disas/sh4.c
  19. +1
    -1
      disas/sparc.c
  20. +1
    -1
      disas/tci.c
  21. +1
    -1
      disas/xtensa.c
  22. +0
    -0
      include/disas/dis-asm.h
  23. +1
    -1
      include/qom/cpu.h
  24. +1
    -1
      target/openrisc/disas.c
  25. +1
    -1
      target/ppc/translate_init.inc.c

+ 1
- 1
disas.c View File

@@ -1,7 +1,7 @@
/* General "disassemble this chunk" code. Used for debugging. */
#include "qemu/osdep.h"
#include "qemu-common.h"
#include "disas/bfd.h"
#include "disas/dis-asm.h"
#include "elf.h"
#include "qemu/qemu-print.h"


+ 1
- 1
disas/alpha.c View File

@@ -20,7 +20,7 @@ along with this file; see the file COPYING. If not, see
<http://www.gnu.org/licenses/>. */

#include "qemu/osdep.h"
#include "disas/bfd.h"
#include "disas/dis-asm.h"

/* MAX is redefined below, so remove any previous definition. */
#undef MAX

+ 1
- 1
disas/arm-a64.cc View File

@@ -19,7 +19,7 @@

extern "C" {
#include "qemu/osdep.h"
#include "disas/bfd.h"
#include "disas/dis-asm.h"
}

#include "vixl/a64/disasm-a64.h"

+ 1
- 1
disas/arm.c View File

@@ -23,7 +23,7 @@
for things we don't care about. */

#include "qemu/osdep.h"
#include "disas/bfd.h"
#include "disas/dis-asm.h"

#define ARM_EXT_V1 0
#define ARM_EXT_V2 0

+ 1
- 1
disas/cris.c View File

@@ -20,7 +20,7 @@

#include "qemu/osdep.h"
#include "qemu-common.h"
#include "disas/bfd.h"
#include "disas/dis-asm.h"
#include "target/cris/opcode-cris.h"

#define CONST_STRNEQ(STR1,STR2) (strncmp ((STR1), (STR2), sizeof (STR2) - 1) == 0)

+ 1
- 1
disas/hppa.c View File

@@ -19,7 +19,7 @@
along with this program; if not, see <http://www.gnu.org/licenses/>. */

#include "qemu/osdep.h"
#include "disas/bfd.h"
#include "disas/dis-asm.h"

/* HP PA-RISC SOM object file format: definitions internal to BFD.
Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000,

+ 1
- 1
disas/i386.c View File

@@ -32,7 +32,7 @@
the Intel manual for details. */

#include "qemu/osdep.h"
#include "disas/bfd.h"
#include "disas/dis-asm.h"
#include "qemu/cutils.h"

/* include/opcode/i386.h r1.78 */

+ 1
- 1
disas/lm32.c View File

@@ -19,7 +19,7 @@
*/

#include "qemu/osdep.h"
#include "disas/bfd.h"
#include "disas/dis-asm.h"

typedef enum {
LM32_OP_SRUI = 0, LM32_OP_NORI, LM32_OP_MULI, LM32_OP_SH, LM32_OP_LB,

+ 1
- 1
disas/m68k.c View File

@@ -4,7 +4,7 @@
#include "qemu/osdep.h"
#include <math.h>

#include "disas/bfd.h"
#include "disas/dis-asm.h"

/* **** floatformat.h from sourceware.org CVS 2005-08-14. */
/* IEEE floating point support declarations, for GDB, the GNU Debugger.

+ 1
- 1
disas/microblaze.c View File

@@ -577,7 +577,7 @@ static const char pvr_register_prefix[] = "rpvr";

#endif /* MICROBLAZE_OPC */

#include "disas/bfd.h"
#include "disas/dis-asm.h"

#define get_field_rd(instr) get_field(instr, RD_MASK, RD_LOW)
#define get_field_r1(instr) get_field(instr, RA_MASK, RA_LOW)

+ 1
- 1
disas/mips.c View File

@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>. */

#include "qemu/osdep.h"
#include "disas/bfd.h"
#include "disas/dis-asm.h"

/* mips.h. Mips opcode list for GDB, the GNU debugger.
Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003

+ 1
- 1
disas/moxie.c View File

@@ -18,7 +18,7 @@
#define STATIC_TABLE
#define DEFINE_TABLE

#include "disas/bfd.h"
#include "disas/dis-asm.h"

static void *stream;


+ 1
- 1
disas/nanomips.cpp View File

@@ -29,7 +29,7 @@

extern "C" {
#include "qemu/osdep.h"
#include "disas/bfd.h"
#include "disas/dis-asm.h"
}

#include <cstring>

+ 1
- 1
disas/nios2.c View File

@@ -36,7 +36,7 @@

/*#include "bfd.h"*/
#include "qemu/osdep.h"
#include "disas/bfd.h"
#include "disas/dis-asm.h"


/****************************************************************************

+ 1
- 1
disas/ppc.c View File

@@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License
along with this file; see the file COPYING. If not,
see <http://www.gnu.org/licenses/>. */
#include "qemu/osdep.h"
#include "disas/bfd.h"
#include "disas/dis-asm.h"
#define BFD_DEFAULT_TARGET_SIZE 64

/* ppc.h -- Header file for PowerPC opcode table

+ 1
- 1
disas/riscv.c View File

@@ -18,7 +18,7 @@
*/

#include "qemu/osdep.h"
#include "disas/bfd.h"
#include "disas/dis-asm.h"


/* types */

+ 1
- 1
disas/s390.c View File

@@ -22,7 +22,7 @@

#include "qemu/osdep.h"
#include "qemu-common.h"
#include "disas/bfd.h"
#include "disas/dis-asm.h"

/* include/opcode/s390.h revision 1.9 */
/* s390.h -- Header file for S390 opcode table

+ 1
- 1
disas/sh4.c View File

@@ -16,7 +16,7 @@
along with this program; if not, see <http://www.gnu.org/licenses/>. */

#include "qemu/osdep.h"
#include "disas/bfd.h"
#include "disas/dis-asm.h"

#define DEFINE_TABLE


+ 1
- 1
disas/sparc.c View File

@@ -27,7 +27,7 @@
see <http://www.gnu.org/licenses/>. */

#include "qemu/osdep.h"
#include "disas/bfd.h"
#include "disas/dis-asm.h"

/* The SPARC opcode table (and other related data) is defined in
the opcodes library in sparc-opc.c. If you change anything here, make

+ 1
- 1
disas/tci.c View File

@@ -19,7 +19,7 @@

#include "qemu/osdep.h"
#include "qemu-common.h"
#include "disas/bfd.h"
#include "disas/dis-asm.h"
#include "tcg/tcg.h"

/* Disassemble TCI bytecode. */

+ 1
- 1
disas/xtensa.c View File

@@ -26,7 +26,7 @@
*/

#include "qemu/osdep.h"
#include "disas/bfd.h"
#include "disas/dis-asm.h"
#include "hw/xtensa/xtensa-isa.h"

int print_insn_xtensa(bfd_vma memaddr, struct disassemble_info *info)

include/disas/bfd.h → include/disas/dis-asm.h View File


+ 1
- 1
include/qom/cpu.h View File

@@ -21,7 +21,7 @@
#define QEMU_CPU_H

#include "hw/qdev-core.h"
#include "disas/bfd.h"
#include "disas/dis-asm.h"
#include "exec/hwaddr.h"
#include "exec/memattrs.h"
#include "qapi/qapi-types-run-state.h"

+ 1
- 1
target/openrisc/disas.c View File

@@ -19,7 +19,7 @@

#include "qemu/osdep.h"
#include "qemu-common.h"
#include "disas/bfd.h"
#include "disas/dis-asm.h"
#include "qemu/bitops.h"
#include "cpu.h"


+ 1
- 1
target/ppc/translate_init.inc.c View File

@@ -18,7 +18,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/

#include "disas/bfd.h"
#include "disas/dis-asm.h"
#include "exec/gdbstub.h"
#include "kvm_ppc.h"
#include "sysemu/arch_init.h"

Loading…
Cancel
Save