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>
This commit is contained in:
Markus Armbruster 2019-04-17 21:18:04 +02:00
parent 30cc98315f
commit 3979fca4b6
25 changed files with 24 additions and 24 deletions

View file

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

View file

@ -20,7 +20,7 @@ along with this file; see the file COPYING. If not, see
<http://www.gnu.org/licenses/>. */ <http://www.gnu.org/licenses/>. */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "disas/bfd.h" #include "disas/dis-asm.h"
/* MAX is redefined below, so remove any previous definition. */ /* MAX is redefined below, so remove any previous definition. */
#undef MAX #undef MAX

View file

@ -19,7 +19,7 @@
extern "C" { extern "C" {
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "disas/bfd.h" #include "disas/dis-asm.h"
} }
#include "vixl/a64/disasm-a64.h" #include "vixl/a64/disasm-a64.h"

View file

@ -23,7 +23,7 @@
for things we don't care about. */ for things we don't care about. */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "disas/bfd.h" #include "disas/dis-asm.h"
#define ARM_EXT_V1 0 #define ARM_EXT_V1 0
#define ARM_EXT_V2 0 #define ARM_EXT_V2 0

View file

@ -20,7 +20,7 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qemu-common.h" #include "qemu-common.h"
#include "disas/bfd.h" #include "disas/dis-asm.h"
#include "target/cris/opcode-cris.h" #include "target/cris/opcode-cris.h"
#define CONST_STRNEQ(STR1,STR2) (strncmp ((STR1), (STR2), sizeof (STR2) - 1) == 0) #define CONST_STRNEQ(STR1,STR2) (strncmp ((STR1), (STR2), sizeof (STR2) - 1) == 0)

View file

@ -19,7 +19,7 @@
along with this program; if not, see <http://www.gnu.org/licenses/>. */ along with this program; if not, see <http://www.gnu.org/licenses/>. */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "disas/bfd.h" #include "disas/dis-asm.h"
/* HP PA-RISC SOM object file format: definitions internal to BFD. /* HP PA-RISC SOM object file format: definitions internal to BFD.
Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000,

View file

@ -32,7 +32,7 @@
the Intel manual for details. */ the Intel manual for details. */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "disas/bfd.h" #include "disas/dis-asm.h"
#include "qemu/cutils.h" #include "qemu/cutils.h"
/* include/opcode/i386.h r1.78 */ /* include/opcode/i386.h r1.78 */

View file

@ -19,7 +19,7 @@
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "disas/bfd.h" #include "disas/dis-asm.h"
typedef enum { typedef enum {
LM32_OP_SRUI = 0, LM32_OP_NORI, LM32_OP_MULI, LM32_OP_SH, LM32_OP_LB, LM32_OP_SRUI = 0, LM32_OP_NORI, LM32_OP_MULI, LM32_OP_SH, LM32_OP_LB,

View file

@ -4,7 +4,7 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include <math.h> #include <math.h>
#include "disas/bfd.h" #include "disas/dis-asm.h"
/* **** floatformat.h from sourceware.org CVS 2005-08-14. */ /* **** floatformat.h from sourceware.org CVS 2005-08-14. */
/* IEEE floating point support declarations, for GDB, the GNU Debugger. /* IEEE floating point support declarations, for GDB, the GNU Debugger.

View file

@ -577,7 +577,7 @@ static const char pvr_register_prefix[] = "rpvr";
#endif /* MICROBLAZE_OPC */ #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_rd(instr) get_field(instr, RD_MASK, RD_LOW)
#define get_field_r1(instr) get_field(instr, RA_MASK, RA_LOW) #define get_field_r1(instr) get_field(instr, RA_MASK, RA_LOW)

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/>. */ along with this program; if not, see <http://www.gnu.org/licenses/>. */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "disas/bfd.h" #include "disas/dis-asm.h"
/* mips.h. Mips opcode list for GDB, the GNU debugger. /* mips.h. Mips opcode list for GDB, the GNU debugger.
Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003

View file

@ -18,7 +18,7 @@
#define STATIC_TABLE #define STATIC_TABLE
#define DEFINE_TABLE #define DEFINE_TABLE
#include "disas/bfd.h" #include "disas/dis-asm.h"
static void *stream; static void *stream;

View file

@ -29,7 +29,7 @@
extern "C" { extern "C" {
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "disas/bfd.h" #include "disas/dis-asm.h"
} }
#include <cstring> #include <cstring>

View file

@ -36,7 +36,7 @@
/*#include "bfd.h"*/ /*#include "bfd.h"*/
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "disas/bfd.h" #include "disas/dis-asm.h"
/**************************************************************************** /****************************************************************************

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, along with this file; see the file COPYING. If not,
see <http://www.gnu.org/licenses/>. */ see <http://www.gnu.org/licenses/>. */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "disas/bfd.h" #include "disas/dis-asm.h"
#define BFD_DEFAULT_TARGET_SIZE 64 #define BFD_DEFAULT_TARGET_SIZE 64
/* ppc.h -- Header file for PowerPC opcode table /* ppc.h -- Header file for PowerPC opcode table

View file

@ -18,7 +18,7 @@
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "disas/bfd.h" #include "disas/dis-asm.h"
/* types */ /* types */

View file

@ -22,7 +22,7 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qemu-common.h" #include "qemu-common.h"
#include "disas/bfd.h" #include "disas/dis-asm.h"
/* include/opcode/s390.h revision 1.9 */ /* include/opcode/s390.h revision 1.9 */
/* s390.h -- Header file for S390 opcode table /* s390.h -- Header file for S390 opcode table

View file

@ -16,7 +16,7 @@
along with this program; if not, see <http://www.gnu.org/licenses/>. */ along with this program; if not, see <http://www.gnu.org/licenses/>. */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "disas/bfd.h" #include "disas/dis-asm.h"
#define DEFINE_TABLE #define DEFINE_TABLE

View file

@ -27,7 +27,7 @@
see <http://www.gnu.org/licenses/>. */ see <http://www.gnu.org/licenses/>. */
#include "qemu/osdep.h" #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 SPARC opcode table (and other related data) is defined in
the opcodes library in sparc-opc.c. If you change anything here, make the opcodes library in sparc-opc.c. If you change anything here, make

View file

@ -19,7 +19,7 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qemu-common.h" #include "qemu-common.h"
#include "disas/bfd.h" #include "disas/dis-asm.h"
#include "tcg/tcg.h" #include "tcg/tcg.h"
/* Disassemble TCI bytecode. */ /* Disassemble TCI bytecode. */

View file

@ -26,7 +26,7 @@
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "disas/bfd.h" #include "disas/dis-asm.h"
#include "hw/xtensa/xtensa-isa.h" #include "hw/xtensa/xtensa-isa.h"
int print_insn_xtensa(bfd_vma memaddr, struct disassemble_info *info) int print_insn_xtensa(bfd_vma memaddr, struct disassemble_info *info)

View file

@ -21,7 +21,7 @@
#define QEMU_CPU_H #define QEMU_CPU_H
#include "hw/qdev-core.h" #include "hw/qdev-core.h"
#include "disas/bfd.h" #include "disas/dis-asm.h"
#include "exec/hwaddr.h" #include "exec/hwaddr.h"
#include "exec/memattrs.h" #include "exec/memattrs.h"
#include "qapi/qapi-types-run-state.h" #include "qapi/qapi-types-run-state.h"

View file

@ -19,7 +19,7 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qemu-common.h" #include "qemu-common.h"
#include "disas/bfd.h" #include "disas/dis-asm.h"
#include "qemu/bitops.h" #include "qemu/bitops.h"
#include "cpu.h" #include "cpu.h"

View file

@ -18,7 +18,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>. * 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 "exec/gdbstub.h"
#include "kvm_ppc.h" #include "kvm_ppc.h"
#include "sysemu/arch_init.h" #include "sysemu/arch_init.h"