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>
2019-04-17 21:18:04 +02:00 · 2019-04-17 21:18:04 +02:00 · 3979fca4b6
commit 3979fca4b6
parent 30cc98315f
25 changed files with 24 additions and 24 deletions
--- a/disas.c
+++ b/disas.c
@ -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"

--- a/disas/alpha.c
+++ b/disas/alpha.c
@ -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
--- a/disas/arm-a64.cc
+++ b/disas/arm-a64.cc
@ -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"
--- a/disas/arm.c
+++ b/disas/arm.c
@ -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
--- a/disas/cris.c
+++ b/disas/cris.c
@ -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)
--- a/disas/hppa.c
+++ b/disas/hppa.c
@ -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,
--- a/disas/i386.c
+++ b/disas/i386.c
@ -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 */
--- a/disas/lm32.c
+++ b/disas/lm32.c
@ -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,
--- a/disas/m68k.c
+++ b/disas/m68k.c
@ -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.
--- a/disas/microblaze.c
+++ b/disas/microblaze.c
@ -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)
--- a/disas/mips.c
+++ b/disas/mips.c
@ -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
--- a/disas/moxie.c
+++ b/disas/moxie.c
@ -18,7 +18,7 @@
 #define STATIC_TABLE
 #define DEFINE_TABLE

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

 static void *stream;

--- a/disas/nanomips.cpp
+++ b/disas/nanomips.cpp
@ -29,7 +29,7 @@

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

 #include <cstring>
--- a/disas/nios2.c
+++ b/disas/nios2.c
@ -36,7 +36,7 @@

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


 /****************************************************************************
--- a/disas/ppc.c
+++ b/disas/ppc.c
@ -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
--- a/disas/riscv.c
+++ b/disas/riscv.c
@ -18,7 +18,7 @@
 */

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


 /* types */
--- a/disas/s390.c
+++ b/disas/s390.c
@ -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
--- a/disas/sh4.c
+++ b/disas/sh4.c
@ -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

--- a/disas/sparc.c
+++ b/disas/sparc.c
@ -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
--- a/disas/tci.c
+++ b/disas/tci.c
@ -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. */
--- a/disas/xtensa.c
+++ b/disas/xtensa.c
@ -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)
--- a/include/disas/dis-asm.h
+++ b/include/disas/dis-asm.h
--- a/include/qom/cpu.h
+++ b/include/qom/cpu.h
@ -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"
--- a/target/openrisc/disas.c
+++ b/target/openrisc/disas.c
@ -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"

--- a/target/ppc/translate_init.inc.c
+++ b/target/ppc/translate_init.inc.c
@ -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"