jcs.org / qemu
qemu with hax to log dma reads & writes jcs.org/2018/11/12/vfio
fork atom

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

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

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

Commit 76cad71136b (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>

Markus Armbruster 3979fca4 30cc9831

+24 -24
+1 -1
disas.c
··· 1 1 /* General "disassemble this chunk" code. Used for debugging. */ 2 2 #include "qemu/osdep.h" 3 3 #include "qemu-common.h" 4 - #include "disas/bfd.h" 4 + #include "disas/dis-asm.h" 5 5 #include "elf.h" 6 6 #include "qemu/qemu-print.h" 7 7
+1 -1
disas/alpha.c
··· 20 20 <http://www.gnu.org/licenses/>. */ 21 21 22 22 #include "qemu/osdep.h" 23 - #include "disas/bfd.h" 23 + #include "disas/dis-asm.h" 24 24 25 25 /* MAX is redefined below, so remove any previous definition. */ 26 26 #undef MAX
+1 -1
disas/arm-a64.cc
··· 19 19 20 20 extern "C" { 21 21 #include "qemu/osdep.h" 22 - #include "disas/bfd.h" 22 + #include "disas/dis-asm.h" 23 23 } 24 24 25 25 #include "vixl/a64/disasm-a64.h"
+1 -1
disas/arm.c
··· 23 23 for things we don't care about. */ 24 24 25 25 #include "qemu/osdep.h" 26 - #include "disas/bfd.h" 26 + #include "disas/dis-asm.h" 27 27 28 28 #define ARM_EXT_V1 0 29 29 #define ARM_EXT_V2 0
+1 -1
disas/cris.c
··· 20 20 21 21 #include "qemu/osdep.h" 22 22 #include "qemu-common.h" 23 - #include "disas/bfd.h" 23 + #include "disas/dis-asm.h" 24 24 #include "target/cris/opcode-cris.h" 25 25 26 26 #define CONST_STRNEQ(STR1,STR2) (strncmp ((STR1), (STR2), sizeof (STR2) - 1) == 0)
+1 -1
disas/hppa.c
··· 19 19 along with this program; if not, see <http://www.gnu.org/licenses/>. */ 20 20 21 21 #include "qemu/osdep.h" 22 - #include "disas/bfd.h" 22 + #include "disas/dis-asm.h" 23 23 24 24 /* HP PA-RISC SOM object file format: definitions internal to BFD. 25 25 Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000,
+1 -1
disas/i386.c
··· 32 32 the Intel manual for details. */ 33 33 34 34 #include "qemu/osdep.h" 35 - #include "disas/bfd.h" 35 + #include "disas/dis-asm.h" 36 36 #include "qemu/cutils.h" 37 37 38 38 /* include/opcode/i386.h r1.78 */
+1 -1
disas/lm32.c
··· 19 19 */ 20 20 21 21 #include "qemu/osdep.h" 22 - #include "disas/bfd.h" 22 + #include "disas/dis-asm.h" 23 23 24 24 typedef enum { 25 25 LM32_OP_SRUI = 0, LM32_OP_NORI, LM32_OP_MULI, LM32_OP_SH, LM32_OP_LB,
+1 -1
disas/m68k.c
··· 4 4 #include "qemu/osdep.h" 5 5 #include <math.h> 6 6 7 - #include "disas/bfd.h" 7 + #include "disas/dis-asm.h" 8 8 9 9 /* **** floatformat.h from sourceware.org CVS 2005-08-14. */ 10 10 /* IEEE floating point support declarations, for GDB, the GNU Debugger.
+1 -1
disas/microblaze.c
··· 577 577 578 578 #endif /* MICROBLAZE_OPC */ 579 579 580 - #include "disas/bfd.h" 580 + #include "disas/dis-asm.h" 581 581 582 582 #define get_field_rd(instr) get_field(instr, RD_MASK, RD_LOW) 583 583 #define get_field_r1(instr) get_field(instr, RA_MASK, RA_LOW)
+1 -1
disas/mips.c
··· 20 20 along with this program; if not, see <http://www.gnu.org/licenses/>. */ 21 21 22 22 #include "qemu/osdep.h" 23 - #include "disas/bfd.h" 23 + #include "disas/dis-asm.h" 24 24 25 25 /* mips.h. Mips opcode list for GDB, the GNU debugger. 26 26 Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+1 -1
disas/moxie.c
··· 18 18 #define STATIC_TABLE 19 19 #define DEFINE_TABLE 20 20 21 - #include "disas/bfd.h" 21 + #include "disas/dis-asm.h" 22 22 23 23 static void *stream; 24 24
+1 -1
disas/nanomips.cpp
··· 29 29 30 30 extern "C" { 31 31 #include "qemu/osdep.h" 32 - #include "disas/bfd.h" 32 + #include "disas/dis-asm.h" 33 33 } 34 34 35 35 #include <cstring>
+1 -1
disas/nios2.c
··· 36 36 37 37 /*#include "bfd.h"*/ 38 38 #include "qemu/osdep.h" 39 - #include "disas/bfd.h" 39 + #include "disas/dis-asm.h" 40 40 41 41 42 42 /****************************************************************************
+1 -1
disas/ppc.c
··· 19 19 along with this file; see the file COPYING. If not, 20 20 see <http://www.gnu.org/licenses/>. */ 21 21 #include "qemu/osdep.h" 22 - #include "disas/bfd.h" 22 + #include "disas/dis-asm.h" 23 23 #define BFD_DEFAULT_TARGET_SIZE 64 24 24 25 25 /* ppc.h -- Header file for PowerPC opcode table
+1 -1
disas/riscv.c
··· 18 18 */ 19 19 20 20 #include "qemu/osdep.h" 21 - #include "disas/bfd.h" 21 + #include "disas/dis-asm.h" 22 22 23 23 24 24 /* types */
+1 -1
disas/s390.c
··· 22 22 23 23 #include "qemu/osdep.h" 24 24 #include "qemu-common.h" 25 - #include "disas/bfd.h" 25 + #include "disas/dis-asm.h" 26 26 27 27 /* include/opcode/s390.h revision 1.9 */ 28 28 /* s390.h -- Header file for S390 opcode table
+1 -1
disas/sh4.c
··· 16 16 along with this program; if not, see <http://www.gnu.org/licenses/>. */ 17 17 18 18 #include "qemu/osdep.h" 19 - #include "disas/bfd.h" 19 + #include "disas/dis-asm.h" 20 20 21 21 #define DEFINE_TABLE 22 22
+1 -1
disas/sparc.c
··· 27 27 see <http://www.gnu.org/licenses/>. */ 28 28 29 29 #include "qemu/osdep.h" 30 - #include "disas/bfd.h" 30 + #include "disas/dis-asm.h" 31 31 32 32 /* The SPARC opcode table (and other related data) is defined in 33 33 the opcodes library in sparc-opc.c. If you change anything here, make
+1 -1
disas/tci.c
··· 19 19 20 20 #include "qemu/osdep.h" 21 21 #include "qemu-common.h" 22 - #include "disas/bfd.h" 22 + #include "disas/dis-asm.h" 23 23 #include "tcg/tcg.h" 24 24 25 25 /* Disassemble TCI bytecode. */
+1 -1
disas/xtensa.c
··· 26 26 */ 27 27 28 28 #include "qemu/osdep.h" 29 - #include "disas/bfd.h" 29 + #include "disas/dis-asm.h" 30 30 #include "hw/xtensa/xtensa-isa.h" 31 31 32 32 int print_insn_xtensa(bfd_vma memaddr, struct disassemble_info *info)
include/disas/bfd.h include/disas/dis-asm.h
+1 -1
include/qom/cpu.h
··· 21 21 #define QEMU_CPU_H 22 22 23 23 #include "hw/qdev-core.h" 24 - #include "disas/bfd.h" 24 + #include "disas/dis-asm.h" 25 25 #include "exec/hwaddr.h" 26 26 #include "exec/memattrs.h" 27 27 #include "qapi/qapi-types-run-state.h"
+1 -1
target/openrisc/disas.c
··· 19 19 20 20 #include "qemu/osdep.h" 21 21 #include "qemu-common.h" 22 - #include "disas/bfd.h" 22 + #include "disas/dis-asm.h" 23 23 #include "qemu/bitops.h" 24 24 #include "cpu.h" 25 25
+1 -1
target/ppc/translate_init.inc.c
··· 18 18 * License along with this library; if not, see <http://www.gnu.org/licenses/>. 19 19 */ 20 20 21 - #include "disas/bfd.h" 21 + #include "disas/dis-asm.h" 22 22 #include "exec/gdbstub.h" 23 23 #include "kvm_ppc.h" 24 24 #include "sysemu/arch_init.h"