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>

diff --git a/disas.c b/disas.c
index d15cceb863251d09feb5b462f8bf6f10fefcf50c..41ad0102e2b61d5892a3158d2cf0c35d7c8d758d 100644 (file)
--- 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"
 

diff --git a/disas/alpha.c b/disas/alpha.c
index a0c9ecd49de3a897a9dbd845c3487e7aad517974..3db90fa665cdffd730993cb4e3d05be7b6a35ed0 100644 (file)
--- 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

diff --git a/disas/arm-a64.cc b/disas/arm-a64.cc
index 9280950ce38c93f7e53e193bfa686b6a7d58ff9b..9fa779e175e763d561546d65a9c7d0c4b1b09605 100644 (file)
--- 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"

diff --git a/disas/arm.c b/disas/arm.c
index 17ea120b444833ac94cb43b560819cb24056fb77..7d940f23967c898da7141b4f3874f9fe2f475b54 100644 (file)
--- 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

diff --git a/disas/cris.c b/disas/cris.c
index 2dd56deea4a860fe5a824452ac7e2687f5c52ef7..bf9eafc4153b8f4207715f8fd822383af3005edc 100644 (file)
--- 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)

diff --git a/disas/hppa.c b/disas/hppa.c
index a2d371fdb1ea5225cec4e17e590bc07e6460f988..2dbd1fc4454ef79454fadc855ce3fe00c7cc47ff 100644 (file)
--- 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,

diff --git a/disas/i386.c b/disas/i386.c
index fc03b9f06a7a1dfa2ec42bed1ac291fdd2b3fc25..4c1f0f877bd7f30450a5e2ba68e4f4a87007fbae 100644 (file)
--- 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 */

diff --git a/disas/lm32.c b/disas/lm32.c
index fcc2cde23d28fc79e834066b774c61d646802c53..c0ef8160fe690aeb32c83f008f6d9dbdab041afe 100644 (file)
--- 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,

diff --git a/disas/m68k.c b/disas/m68k.c
index e544c7137ff0c5642ed8badd2a5802bafa0df555..863409c67ccb3132e83ed09c835ff2618972bc0d 100644 (file)
--- 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.

diff --git a/disas/microblaze.c b/disas/microblaze.c
index c23605043a7a2e4d04ddada63407cfdde1352c82..0b89b9c4fafbef4ba9b99107a37ed97766a9b559 100644 (file)
--- 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)

diff --git a/disas/mips.c b/disas/mips.c
index 97f661a37ee47c956dc45908dadf18e29a39d22f..dfefe5e589ddb2a60cd8cb50b208e237cd8184c7 100644 (file)
--- 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

diff --git a/disas/moxie.c b/disas/moxie.c
index 70b49ed74bc5c4a2fe9fb840662f78cc51a4a38e..e94ab4c33d8d23a2be71f1bec65a13f9322bc074 100644 (file)
--- 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;
 

diff --git a/disas/nanomips.cpp b/disas/nanomips.cpp
index c8495b1a196bfa1da9e9d37fcada79fcc97e3077..90e63b836746fa71f4ded9550e0aed65788701d1 100644 (file)
--- 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>

diff --git a/disas/nios2.c b/disas/nios2.c
index de11f04cc40fd27f792bc1dacc91ba6f4d3c25dd..c3e82140c7983426e733612c07c0e37cc0717d5f 100644 (file)
--- 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"
 
 
 /****************************************************************************

diff --git a/disas/ppc.c b/disas/ppc.c
index da1140ba2b3ea433897d6a0bcf2db0c6177b6489..a545437de9a2f06cc2a404f554ae98688e9ded3e 100644 (file)
--- 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

diff --git a/disas/riscv.c b/disas/riscv.c
index 27546dd7902c5e8c6ed958e53299de4770821202..59a9b0437a5f24a497744c30d2b645200b8a8637 100644 (file)
--- 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 */

diff --git a/disas/s390.c b/disas/s390.c
index 63938602391f5aa5708821a0aa2abe15487df8ea..b1f4e2a0c1013fc8f45d8a2d4f2644294e1f1086 100644 (file)
--- 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

diff --git a/disas/sh4.c b/disas/sh4.c
index 6b66176bedc7d99f10b6585095e14543d2a368d1..55ef865a36af0e3e44ad051983ac6781c610dcdb 100644 (file)
--- 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
 

diff --git a/disas/sparc.c b/disas/sparc.c
index f120f4e86d355f76da69d604bf8c6578f86dfa48..5689533ce1532eeb66bbd4faf4de6bd8be406229 100644 (file)
--- 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

diff --git a/disas/tci.c b/disas/tci.c
index 1cdf5eeafca98cd3864ac251d45140ae9dceb8bd..f1d6c6b46912eae3c5554c410fe4509e9a50308a 100644 (file)
--- 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. */

diff --git a/disas/xtensa.c b/disas/xtensa.c
index 5e3870b9ad23a2cdbd93fc3af0b50452ee424a8f..d7dda8c2d6a61333eed4b6a4e20fc2098f60225f 100644 (file)
--- 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)

diff --git a/include/disas/bfd.h b/include/disas/dis-asm.h
similarity index 100%
rename from include/disas/bfd.h
rename to include/disas/dis-asm.h

diff --git a/include/qom/cpu.h b/include/qom/cpu.h
index 9972e077865210c51e1ba2aab73e3ebfb1012176..e9bec3a5bc45a6a5282c253de193694019c59a6a 100644 (file)
--- 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"

diff --git a/target/openrisc/disas.c b/target/openrisc/disas.c
index bc63093ee91c5043c68877643d2029a878f408f7..5923b2429e6fa4881c77166e91e02c5438f76039 100644 (file)
--- 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"
 

diff --git a/target/ppc/translate_init.inc.c b/target/ppc/translate_init.inc.c
index 996356dd99dd57723b2ea822cdb8cbd38c7cfce6..20a64f3b778f8de2185b287253021a2891d744ad 100644 (file)
--- 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"