Move print_insn_XXX to an opcodes internal header

With the changes done in previous patches, print_insn_XXX functions
don't have to be external visible out of opcodes, because both gdb
and objdump select disassemblers through a single interface.

This patch moves these print_insn_XXX declarations from
include/dis-asm.h to opcodes/disassemble.h, which is a new header
added by this patch.

include:

2017-05-24  Yao Qi  <yao.qi@linaro.org>

	* dis-asm.h: Move some function declarations to
	opcodes/disassemble.h.

opcodes:

2017-05-24  Yao Qi  <yao.qi@linaro.org>

	* alpha-dis.c: Include disassemble.h, don't include
	dis-asm.h.
	* avr-dis.c, bfin-dis.c, cr16-dis.c: Likewise.
	* crx-dis.c, d10v-dis.c, d30v-dis.c: Likewise.
	* disassemble.c, dlx-dis.c, epiphany-dis.c: Likewise.
	* fr30-dis.c, ft32-dis.c, h8300-dis.c, h8500-dis.c: Likewise.
	* hppa-dis.c, i370-dis.c, i386-dis.c: Likewise.
	* i860-dis.c, i960-dis.c, ip2k-dis.c: Likewise.
	* iq2000-dis.c, lm32-dis.c, m10200-dis.c: Likewise.
	* m10300-dis.c, m32r-dis.c, m68hc11-dis.c: Likewise.
	* m68k-dis.c, m88k-dis.c, mcore-dis.c: Likewise.
	* metag-dis.c, microblaze-dis.c, mmix-dis.c: Likewise.
	* moxie-dis.c, msp430-dis.c, mt-dis.c:
	* nds32-dis.c, nios2-dis.c, ns32k-dis.c: Likewise.
	* or1k-dis.c, pdp11-dis.c, pj-dis.c: Likewise.
	* ppc-dis.c, pru-dis.c, riscv-dis.c: Likewise.
	* rl78-dis.c, s390-dis.c, score-dis.c: Likewise.
	* sh-dis.c, sh64-dis.c, tic30-dis.c: Likewise.
	* tic4x-dis.c, tic54x-dis.c, tic6x-dis.c: Likewise.
	* tic80-dis.c, tilegx-dis.c, tilepro-dis.c: Likewise.
	* v850-dis.c, vax-dis.c, visium-dis.c: Likewise.
	* w65-dis.c, wasm32-dis.c, xc16x-dis.c: Likewise.
	* xgate-dis.c, xstormy16-dis.c, xtensa-dis.c: Likewise.
	* z80-dis.c, z8k-dis.c: Likewise.
	* disassemble.h: New file.

diff --git a/include/ChangeLog b/include/ChangeLog
index 3eccaae03f87e35f662073953cc96fcbd2922cae..20cae3196e761b0f36ed496faa2ec1d442376aed 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,8 @@
+2017-05-24  Yao Qi  <yao.qi@linaro.org>
+
+       * dis-asm.h: Move some function declarations to
+       opcodes/disassemble.h.
+
 2017-05-24  Yao Qi  <yao.qi@linaro.org>
 
        * dis-asm.h (disassembler): Update declaration.

diff --git a/include/dis-asm.h b/include/dis-asm.h
index dd935049e84d4fc9525b75cb113994730980326c..911bfb043fd3deb0d940efa9f850b7fe5d202e3f 100644 (file)
--- a/include/dis-asm.h
+++ b/include/dis-asm.h
@@ -237,95 +237,20 @@ typedef struct
    target address.  Return number of octets processed.  */
 typedef int (*disassembler_ftype) (bfd_vma, disassemble_info *);
 
+/* Disassemblers used out side of opcodes library.  */
 extern int print_insn_aarch64          (bfd_vma, disassemble_info *);
-extern int print_insn_alpha            (bfd_vma, disassemble_info *);
-extern int print_insn_avr              (bfd_vma, disassemble_info *);
-extern int print_insn_bfin             (bfd_vma, disassemble_info *);
 extern int print_insn_big_arm          (bfd_vma, disassemble_info *);
 extern int print_insn_big_mips         (bfd_vma, disassemble_info *);
-extern int print_insn_big_nios2                (bfd_vma, disassemble_info *);
-extern int print_insn_big_powerpc      (bfd_vma, disassemble_info *);
-extern int print_insn_big_score         (bfd_vma, disassemble_info *);
-extern int print_insn_cr16              (bfd_vma, disassemble_info *);
-extern int print_insn_crx               (bfd_vma, disassemble_info *);
-extern int print_insn_d10v             (bfd_vma, disassemble_info *);
-extern int print_insn_d30v             (bfd_vma, disassemble_info *);
-extern int print_insn_dlx              (bfd_vma, disassemble_info *);
-extern int print_insn_epiphany         (bfd_vma, disassemble_info *);
-extern int print_insn_fr30             (bfd_vma, disassemble_info *);
-extern int print_insn_frv              (bfd_vma, disassemble_info *);
-extern int print_insn_ft32             (bfd_vma, disassemble_info *);
-extern int print_insn_h8300            (bfd_vma, disassemble_info *);
-extern int print_insn_h8300h           (bfd_vma, disassemble_info *);
-extern int print_insn_h8300s           (bfd_vma, disassemble_info *);
-extern int print_insn_h8500            (bfd_vma, disassemble_info *);
-extern int print_insn_hppa             (bfd_vma, disassemble_info *);
-extern int print_insn_i370             (bfd_vma, disassemble_info *);
 extern int print_insn_i386             (bfd_vma, disassemble_info *);
-extern int print_insn_i386_att         (bfd_vma, disassemble_info *);
-extern int print_insn_i386_intel       (bfd_vma, disassemble_info *);
-extern int print_insn_i860             (bfd_vma, disassemble_info *);
-extern int print_insn_i960             (bfd_vma, disassemble_info *);
 extern int print_insn_ia64             (bfd_vma, disassemble_info *);
-extern int print_insn_ip2k             (bfd_vma, disassemble_info *);
-extern int print_insn_iq2000           (bfd_vma, disassemble_info *);
 extern int print_insn_little_arm       (bfd_vma, disassemble_info *);
 extern int print_insn_little_mips      (bfd_vma, disassemble_info *);
-extern int print_insn_little_nios2     (bfd_vma, disassemble_info *);
-extern int print_insn_little_powerpc   (bfd_vma, disassemble_info *);
-extern int print_insn_riscv            (bfd_vma, disassemble_info *);
-extern int print_insn_little_score      (bfd_vma, disassemble_info *); 
-extern int print_insn_lm32             (bfd_vma, disassemble_info *);
-extern int print_insn_m32c             (bfd_vma, disassemble_info *);
-extern int print_insn_m32r             (bfd_vma, disassemble_info *);
-extern int print_insn_m68hc11          (bfd_vma, disassemble_info *);
-extern int print_insn_m68hc12          (bfd_vma, disassemble_info *);
-extern int print_insn_m9s12x           (bfd_vma, disassemble_info *);
-extern int print_insn_m9s12xg          (bfd_vma, disassemble_info *);
-extern int print_insn_m68k             (bfd_vma, disassemble_info *);
-extern int print_insn_m88k             (bfd_vma, disassemble_info *);
-extern int print_insn_mcore            (bfd_vma, disassemble_info *);
+extern int print_insn_m32c             (bfd_vma, disassemble_info *);
 extern int print_insn_mep              (bfd_vma, disassemble_info *);
-extern int print_insn_metag            (bfd_vma, disassemble_info *);
-extern int print_insn_microblaze       (bfd_vma, disassemble_info *);
-extern int print_insn_mmix             (bfd_vma, disassemble_info *);
-extern int print_insn_mn10200          (bfd_vma, disassemble_info *);
-extern int print_insn_mn10300          (bfd_vma, disassemble_info *);
-extern int print_insn_moxie            (bfd_vma, disassemble_info *);
-extern int print_insn_msp430           (bfd_vma, disassemble_info *);
-extern int print_insn_mt                (bfd_vma, disassemble_info *);
-extern int print_insn_nds32            (bfd_vma, disassemble_info *);
-extern int print_insn_ns32k            (bfd_vma, disassemble_info *);
-extern int print_insn_or1k             (bfd_vma, disassemble_info *);
-extern int print_insn_pdp11            (bfd_vma, disassemble_info *);
-extern int print_insn_pj               (bfd_vma, disassemble_info *);
-extern int print_insn_pru              (bfd_vma, disassemble_info *);
-extern int print_insn_rs6000           (bfd_vma, disassemble_info *);
-extern int print_insn_s390             (bfd_vma, disassemble_info *);
 extern int print_insn_sh               (bfd_vma, disassemble_info *);
-extern int print_insn_sh64             (bfd_vma, disassemble_info *);
 extern int print_insn_sh64x_media      (bfd_vma, disassemble_info *);
 extern int print_insn_sparc            (bfd_vma, disassemble_info *);
 extern int print_insn_spu              (bfd_vma, disassemble_info *);
-extern int print_insn_tic30            (bfd_vma, disassemble_info *);
-extern int print_insn_tic4x            (bfd_vma, disassemble_info *);
-extern int print_insn_tic54x           (bfd_vma, disassemble_info *);
-extern int print_insn_tic6x            (bfd_vma, disassemble_info *);
-extern int print_insn_tic80            (bfd_vma, disassemble_info *);
-extern int print_insn_tilegx           (bfd_vma, disassemble_info *);
-extern int print_insn_tilepro          (bfd_vma, disassemble_info *);
-extern int print_insn_v850             (bfd_vma, disassemble_info *);
-extern int print_insn_vax              (bfd_vma, disassemble_info *);
-extern int print_insn_visium           (bfd_vma, disassemble_info *);
-extern int print_insn_w65              (bfd_vma, disassemble_info *);
-extern int print_insn_wasm32           (bfd_vma, disassemble_info *);
-extern int print_insn_xc16x            (bfd_vma, disassemble_info *);
-extern int print_insn_xgate             (bfd_vma, disassemble_info *);
-extern int print_insn_xstormy16                (bfd_vma, disassemble_info *);
-extern int print_insn_xtensa           (bfd_vma, disassemble_info *);
-extern int print_insn_z80              (bfd_vma, disassemble_info *);
-extern int print_insn_z8001            (bfd_vma, disassemble_info *);
-extern int print_insn_z8002            (bfd_vma, disassemble_info *);
 extern int print_insn_rx               (bfd_vma, disassemble_info *);
 extern int print_insn_rl78             (bfd_vma, disassemble_info *);
 extern int print_insn_rl78_g10         (bfd_vma, disassemble_info *);
@@ -334,7 +259,6 @@ extern int print_insn_rl78_g14              (bfd_vma, disassemble_info *);
 
 extern disassembler_ftype arc_get_disassembler (bfd *);
 extern disassembler_ftype cris_get_disassembler (bfd *);
-extern disassembler_ftype rl78_get_disassembler (bfd *);
 
 extern void print_aarch64_disassembler_options (FILE *);
 extern void print_i386_disassembler_options (FILE *);

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 912567b6c91aafbf79d4ff3893385b5cbb03c4aa..8e7d4dbde5fa0951eee78051d320a7579a9e3027 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,31 @@
+2017-05-24  Yao Qi  <yao.qi@linaro.org>
+
+       * alpha-dis.c: Include disassemble.h, don't include
+       dis-asm.h.
+       * avr-dis.c, bfin-dis.c, cr16-dis.c: Likewise.
+       * crx-dis.c, d10v-dis.c, d30v-dis.c: Likewise.
+       * disassemble.c, dlx-dis.c, epiphany-dis.c: Likewise.
+       * fr30-dis.c, ft32-dis.c, h8300-dis.c, h8500-dis.c: Likewise.
+       * hppa-dis.c, i370-dis.c, i386-dis.c: Likewise.
+       * i860-dis.c, i960-dis.c, ip2k-dis.c: Likewise.
+       * iq2000-dis.c, lm32-dis.c, m10200-dis.c: Likewise.
+       * m10300-dis.c, m32r-dis.c, m68hc11-dis.c: Likewise.
+       * m68k-dis.c, m88k-dis.c, mcore-dis.c: Likewise.
+       * metag-dis.c, microblaze-dis.c, mmix-dis.c: Likewise.
+       * moxie-dis.c, msp430-dis.c, mt-dis.c:
+       * nds32-dis.c, nios2-dis.c, ns32k-dis.c: Likewise.
+       * or1k-dis.c, pdp11-dis.c, pj-dis.c: Likewise.
+       * ppc-dis.c, pru-dis.c, riscv-dis.c: Likewise.
+       * rl78-dis.c, s390-dis.c, score-dis.c: Likewise.
+       * sh-dis.c, sh64-dis.c, tic30-dis.c: Likewise.
+       * tic4x-dis.c, tic54x-dis.c, tic6x-dis.c: Likewise.
+       * tic80-dis.c, tilegx-dis.c, tilepro-dis.c: Likewise.
+       * v850-dis.c, vax-dis.c, visium-dis.c: Likewise.
+       * w65-dis.c, wasm32-dis.c, xc16x-dis.c: Likewise.
+       * xgate-dis.c, xstormy16-dis.c, xtensa-dis.c: Likewise.
+       * z80-dis.c, z8k-dis.c: Likewise.
+       * disassemble.h: New file.
+
 2017-05-24  Yao Qi  <yao.qi@linaro.org>
 
        * rl78-dis.c (rl78_get_disassembler): If parameter abfd

diff --git a/opcodes/alpha-dis.c b/opcodes/alpha-dis.c
index 6fb7614c7c08b6651f2ee0271aa1220734594111..656e92543a6805f2823b1a206a4a6e7c3a40fc06 100644 (file)
--- a/opcodes/alpha-dis.c
+++ b/opcodes/alpha-dis.c
@@ -22,7 +22,7 @@
 
 #include "sysdep.h"
 #include <stdio.h>
-#include "dis-asm.h"
+#include "disassemble.h"
 #include "opcode/alpha.h"
 
 /* OSF register names.  */

diff --git a/opcodes/avr-dis.c b/opcodes/avr-dis.c
index a16650a499d3d2da6cc09ba71eea21d623cafbc3..97f1df5d35f624e2945672983c4fe65530a2ae40 100644 (file)
--- a/opcodes/avr-dis.c
+++ b/opcodes/avr-dis.c
@@ -22,7 +22,7 @@
 
 #include "sysdep.h"
 #include <assert.h>
-#include "dis-asm.h"
+#include "disassemble.h"
 #include "opintl.h"
 #include "libiberty.h"
 #include "bfd_stdint.h"

diff --git a/opcodes/bfin-dis.c b/opcodes/bfin-dis.c
index a1eaeb49cf570b95a837fdd2ae4c8a80567e9b75..bca68b4fca109a13d25a40b889464085347cf392 100644 (file)
--- a/opcodes/bfin-dis.c
+++ b/opcodes/bfin-dis.c
@@ -38,7 +38,7 @@ typedef long TIword;
 #define SIGNEXTEND(v, n)    ((v << (HOST_LONG_WORD_SIZE - (n))) >> (HOST_LONG_WORD_SIZE - (n)))
 #define MASKBITS(val, bits) (val & ((1 << bits) - 1))
 
-#include "dis-asm.h"
+#include "disassemble.h"
 
 typedef unsigned int bu32;
 

diff --git a/opcodes/cr16-dis.c b/opcodes/cr16-dis.c
index 06ccfef399bf671b2e6d1dd5819fc553c372e217..16385c35c946066c448d7f79c96fdba6725e9eb1 100644 (file)
--- a/opcodes/cr16-dis.c
+++ b/opcodes/cr16-dis.c
@@ -19,7 +19,7 @@
    Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #include "sysdep.h"
-#include "dis-asm.h"
+#include "disassemble.h"
 #include "opcode/cr16.h"
 #include "libiberty.h"
 

diff --git a/opcodes/crx-dis.c b/opcodes/crx-dis.c
index 9c14537f0db17d0ebd6076e910b933ce06cbd0e5..4e48668f68c83fad61c3c3f589a87d466bcbf681 100644 (file)
--- a/opcodes/crx-dis.c
+++ b/opcodes/crx-dis.c
@@ -21,7 +21,7 @@
    MA 02110-1301, USA.  */
 
 #include "sysdep.h"
-#include "dis-asm.h"
+#include "disassemble.h"
 #include "opcode/crx.h"
 
 /* String to print when opcode was not matched.  */

diff --git a/opcodes/d10v-dis.c b/opcodes/d10v-dis.c
index 657038f23668348ad1f9794caf9d66c972944261..7fa490e0f1098d06c0e911c9130bebb696fa223d 100644 (file)
--- a/opcodes/d10v-dis.c
+++ b/opcodes/d10v-dis.c
@@ -21,7 +21,7 @@
 #include "sysdep.h"
 #include <stdio.h>
 #include "opcode/d10v.h"
-#include "dis-asm.h"
+#include "disassemble.h"
 
 /* The PC wraps at 18 bits, except for the segment number,
    so use this mask to keep the parts we want.  */

diff --git a/opcodes/d30v-dis.c b/opcodes/d30v-dis.c
index b0c643ece930745e9ba8c027dc6a7f7f976e207b..aff3eb0d0ff00b02497d4da336a9210e2bfa48a9 100644 (file)
--- a/opcodes/d30v-dis.c
+++ b/opcodes/d30v-dis.c
@@ -21,7 +21,7 @@
 #include "sysdep.h"
 #include <stdio.h>
 #include "opcode/d30v.h"
-#include "dis-asm.h"
+#include "disassemble.h"
 #include "opintl.h"
 
 #define PC_MASK 0xFFFFFFFF

diff --git a/opcodes/disassemble.c b/opcodes/disassemble.c
index e79b5c7d3836c994fcaaf05203bd1c43e848f573..cd134e87189a323ae0ef87e1452dbb0cd572c21e 100644 (file)
--- a/opcodes/disassemble.c
+++ b/opcodes/disassemble.c
@@ -19,7 +19,7 @@
    MA 02110-1301, USA.  */
 
 #include "sysdep.h"
-#include "dis-asm.h"
+#include "disassemble.h"
 #include "safe-ctype.h"
 #include <assert.h>
 

diff --git a/opcodes/disassemble.h b/opcodes/disassemble.h
new file mode 100644 (file)
index 0000000..dec09fe
--- /dev/null
+++ b/opcodes/disassemble.h
@@ -0,0 +1,102 @@
+/* Header only used inside opcodes library for disassemble.
+
+   Copyright (C) 2017 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
+
+#ifndef DISASSEMBLE_H
+#define DISASSEMBLE_H
+#include "dis-asm.h"
+
+extern int print_insn_alpha            (bfd_vma, disassemble_info *);
+extern int print_insn_avr              (bfd_vma, disassemble_info *);
+extern int print_insn_bfin             (bfd_vma, disassemble_info *);
+extern int print_insn_big_nios2        (bfd_vma, disassemble_info *);
+extern int print_insn_big_powerpc      (bfd_vma, disassemble_info *);
+extern int print_insn_big_score         (bfd_vma, disassemble_info *);
+extern int print_insn_cr16              (bfd_vma, disassemble_info *);
+extern int print_insn_crx               (bfd_vma, disassemble_info *);
+extern int print_insn_d10v             (bfd_vma, disassemble_info *);
+extern int print_insn_d30v             (bfd_vma, disassemble_info *);
+extern int print_insn_dlx              (bfd_vma, disassemble_info *);
+extern int print_insn_epiphany         (bfd_vma, disassemble_info *);
+extern int print_insn_fr30             (bfd_vma, disassemble_info *);
+extern int print_insn_frv              (bfd_vma, disassemble_info *);
+extern int print_insn_ft32             (bfd_vma, disassemble_info *);
+extern int print_insn_h8300            (bfd_vma, disassemble_info *);
+extern int print_insn_h8300h           (bfd_vma, disassemble_info *);
+extern int print_insn_h8300s           (bfd_vma, disassemble_info *);
+extern int print_insn_h8500            (bfd_vma, disassemble_info *);
+extern int print_insn_hppa             (bfd_vma, disassemble_info *);
+extern int print_insn_i370             (bfd_vma, disassemble_info *);
+extern int print_insn_i386_att         (bfd_vma, disassemble_info *);
+extern int print_insn_i386_intel       (bfd_vma, disassemble_info *);
+extern int print_insn_i860             (bfd_vma, disassemble_info *);
+extern int print_insn_i960             (bfd_vma, disassemble_info *);
+extern int print_insn_ip2k             (bfd_vma, disassemble_info *);
+extern int print_insn_iq2000           (bfd_vma, disassemble_info *);
+extern int print_insn_little_nios2     (bfd_vma, disassemble_info *);
+extern int print_insn_riscv            (bfd_vma, disassemble_info *);
+extern int print_insn_little_powerpc   (bfd_vma, disassemble_info *);
+extern int print_insn_little_score      (bfd_vma, disassemble_info *);
+extern int print_insn_lm32             (bfd_vma, disassemble_info *);
+extern int print_insn_m32r             (bfd_vma, disassemble_info *);
+extern int print_insn_m68hc11          (bfd_vma, disassemble_info *);
+extern int print_insn_m68hc12          (bfd_vma, disassemble_info *);
+extern int print_insn_m9s12x           (bfd_vma, disassemble_info *);
+extern int print_insn_m9s12xg          (bfd_vma, disassemble_info *);
+extern int print_insn_m68k             (bfd_vma, disassemble_info *);
+extern int print_insn_m88k             (bfd_vma, disassemble_info *);
+extern int print_insn_mcore            (bfd_vma, disassemble_info *);
+extern int print_insn_metag            (bfd_vma, disassemble_info *);
+extern int print_insn_microblaze       (bfd_vma, disassemble_info *);
+extern int print_insn_mmix             (bfd_vma, disassemble_info *);
+extern int print_insn_mn10200          (bfd_vma, disassemble_info *);
+extern int print_insn_mn10300          (bfd_vma, disassemble_info *);
+extern int print_insn_moxie            (bfd_vma, disassemble_info *);
+extern int print_insn_msp430           (bfd_vma, disassemble_info *);
+extern int print_insn_mt                (bfd_vma, disassemble_info *);
+extern int print_insn_nds32            (bfd_vma, disassemble_info *);
+extern int print_insn_ns32k            (bfd_vma, disassemble_info *);
+extern int print_insn_or1k             (bfd_vma, disassemble_info *);
+extern int print_insn_pdp11            (bfd_vma, disassemble_info *);
+extern int print_insn_pj               (bfd_vma, disassemble_info *);
+extern int print_insn_pru              (bfd_vma, disassemble_info *);
+extern int print_insn_rs6000           (bfd_vma, disassemble_info *);
+extern int print_insn_s390             (bfd_vma, disassemble_info *);
+extern int print_insn_sh64             (bfd_vma, disassemble_info *);
+extern int print_insn_tic30            (bfd_vma, disassemble_info *);
+extern int print_insn_tic4x            (bfd_vma, disassemble_info *);
+extern int print_insn_tic54x           (bfd_vma, disassemble_info *);
+extern int print_insn_tic6x            (bfd_vma, disassemble_info *);
+extern int print_insn_tic80            (bfd_vma, disassemble_info *);
+extern int print_insn_tilegx           (bfd_vma, disassemble_info *);
+extern int print_insn_tilepro          (bfd_vma, disassemble_info *);
+extern int print_insn_v850             (bfd_vma, disassemble_info *);
+extern int print_insn_vax              (bfd_vma, disassemble_info *);
+extern int print_insn_visium           (bfd_vma, disassemble_info *);
+extern int print_insn_w65              (bfd_vma, disassemble_info *);
+extern int print_insn_wasm32           (bfd_vma, disassemble_info *);
+extern int print_insn_xc16x            (bfd_vma, disassemble_info *);
+extern int print_insn_xgate             (bfd_vma, disassemble_info *);
+extern int print_insn_xstormy16                (bfd_vma, disassemble_info *);
+extern int print_insn_xtensa           (bfd_vma, disassemble_info *);
+extern int print_insn_z80              (bfd_vma, disassemble_info *);
+extern int print_insn_z8001            (bfd_vma, disassemble_info *);
+extern int print_insn_z8002            (bfd_vma, disassemble_info *);
+
+extern disassembler_ftype rl78_get_disassembler (bfd *);
+#endif /* DISASSEMBLE_H */

diff --git a/opcodes/dlx-dis.c b/opcodes/dlx-dis.c
index cd9be30e82d149cafd3ef1f4ca0f9512621f52a8..f106d320d142ca908ee79e6e6136542f8ce21334 100644 (file)
--- a/opcodes/dlx-dis.c
+++ b/opcodes/dlx-dis.c
@@ -20,7 +20,7 @@
    MA 02110-1301, USA.  */
 
 #include "sysdep.h"
-#include "dis-asm.h"
+#include "disassemble.h"
 #include "opcode/dlx.h"
 
 #define R_ERROR     0x1

diff --git a/opcodes/epiphany-dis.c b/opcodes/epiphany-dis.c
index adbc97fda86d328280f8349fa21bb535691144e7..90458dd418282c1a5fc569d5cda109fc04dfa2e0 100644 (file)
--- a/opcodes/epiphany-dis.c
+++ b/opcodes/epiphany-dis.c
@@ -28,7 +28,7 @@
 #include "sysdep.h"
 #include <stdio.h>
 #include "ansidecl.h"
-#include "dis-asm.h"
+#include "disassemble.h"
 #include "bfd.h"
 #include "symcat.h"
 #include "libiberty.h"

diff --git a/opcodes/fr30-dis.c b/opcodes/fr30-dis.c
index 071eeba21d16675c293f8faf94a34799de173dcf..70ad4797f33b8964cd1a5ad53970aca67c315cc2 100644 (file)
--- a/opcodes/fr30-dis.c
+++ b/opcodes/fr30-dis.c
@@ -28,7 +28,7 @@
 #include "sysdep.h"
 #include <stdio.h>
 #include "ansidecl.h"
-#include "dis-asm.h"
+#include "disassemble.h"
 #include "bfd.h"
 #include "symcat.h"
 #include "libiberty.h"

diff --git a/opcodes/frv-dis.c b/opcodes/frv-dis.c
index 41dd506af0637f88afc7608409ffaf695eb4864a..60b8f3f200d406e40be95abefa93bd1f2d2e6133 100644 (file)
--- a/opcodes/frv-dis.c
+++ b/opcodes/frv-dis.c
@@ -28,7 +28,7 @@
 #include "sysdep.h"
 #include <stdio.h>
 #include "ansidecl.h"
-#include "dis-asm.h"
+#include "disassemble.h"
 #include "bfd.h"
 #include "symcat.h"
 #include "libiberty.h"

diff --git a/opcodes/ft32-dis.c b/opcodes/ft32-dis.c
index a8a6bb662206136ec471e5684c820637e92bac16..0384073259476a8f458e89741a84d66e7b1eb9d6 100644 (file)
--- a/opcodes/ft32-dis.c
+++ b/opcodes/ft32-dis.c
@@ -25,7 +25,7 @@
 #define DEFINE_TABLE
 
 #include "opcode/ft32.h"
-#include "dis-asm.h"
+#include "disassemble.h"
 
 extern const ft32_opc_info_t ft32_opc_info[128];
 

diff --git a/opcodes/h8300-dis.c b/opcodes/h8300-dis.c
index 0e7c65a2d2607077c3d6c3330ff640c8313ca841..5b20b84f9e3e20a8975ac6ca68587ddca8623ee7 100644 (file)
--- a/opcodes/h8300-dis.c
+++ b/opcodes/h8300-dis.c
@@ -23,7 +23,7 @@
 #include "sysdep.h"
 #define h8_opcodes h8ops
 #include "opcode/h8300.h"
-#include "dis-asm.h"
+#include "disassemble.h"
 #include "opintl.h"
 #include "libiberty.h"
 

diff --git a/opcodes/h8500-dis.c b/opcodes/h8500-dis.c
index dc2f45efffdc85a681ad73622853a714320ba54c..07379998921cce21b8444c53ed1b2828a489ba24 100644 (file)
--- a/opcodes/h8500-dis.c
+++ b/opcodes/h8500-dis.c
@@ -25,7 +25,7 @@
 #define DEFINE_TABLE
 
 #include "h8500-opc.h"
-#include "dis-asm.h"
+#include "disassemble.h"
 #include "opintl.h"
 
 /* Maximum length of an instruction.  */

diff --git a/opcodes/hppa-dis.c b/opcodes/hppa-dis.c
index c174b9c63489026a23d6a244acffde2350ec822c..9c2e8429f3c5437ccc9bdd3ea852095f8dcae26e 100644 (file)
--- a/opcodes/hppa-dis.c
+++ b/opcodes/hppa-dis.c
@@ -22,7 +22,7 @@
    MA 02110-1301, USA.  */
 
 #include "sysdep.h"
-#include "dis-asm.h"
+#include "disassemble.h"
 #include "libhppa.h"
 #include "opcode/hppa.h"
 

diff --git a/opcodes/i370-dis.c b/opcodes/i370-dis.c
index 529ba13ce1fd74dae529b42f6098082e56a22cf3..e66a01c5c2e9a040bdeb17c54f6e81b971827311 100644 (file)
--- a/opcodes/i370-dis.c
+++ b/opcodes/i370-dis.c
@@ -22,7 +22,7 @@
 
 #include "sysdep.h"
 #include <stdio.h>
-#include "dis-asm.h"
+#include "disassemble.h"
 #include "opcode/i370.h"
 
 /* This file provides several disassembler functions, all of which use

diff --git a/opcodes/i386-dis.c b/opcodes/i386-dis.c
index 039768b804e5c68e1170717860e66be04f36ec94..b35dbc046ee0dda4db472230a07a186ecf786e70 100644 (file)
--- a/opcodes/i386-dis.c
+++ b/opcodes/i386-dis.c
@@ -33,7 +33,7 @@
    the Intel manual for details.  */
 
 #include "sysdep.h"
-#include "dis-asm.h"
+#include "disassemble.h"
 #include "opintl.h"
 #include "opcode/i386.h"
 #include "libiberty.h"

diff --git a/opcodes/i860-dis.c b/opcodes/i860-dis.c
index 5d3125c5dc748bc62c85cc57fb294c54380a5e37..54cb835b277c7ce60f5f7bbe011c5260d2bf01d9 100644 (file)
--- a/opcodes/i860-dis.c
+++ b/opcodes/i860-dis.c
@@ -21,7 +21,7 @@
    MA 02110-1301, USA.  */
 
 #include "sysdep.h"
-#include "dis-asm.h"
+#include "disassemble.h"
 #include "opcode/i860.h"
 
 /* Later we should probably choose the prefix based on which OS flavor.  */

diff --git a/opcodes/i960-dis.c b/opcodes/i960-dis.c
index a34e261f0f833cd0b69d6c96142a95d5a6a8eb7d..c7d353ac1eb6d5dc5e84873aa0da491cb6604f82 100644 (file)
--- a/opcodes/i960-dis.c
+++ b/opcodes/i960-dis.c
@@ -19,7 +19,7 @@
    02110-1301, USA.  */
 
 #include "sysdep.h"
-#include "dis-asm.h"
+#include "disassemble.h"
 
 static const char *const reg_names[] = {
 /*  0 */       "pfp", "sp",  "rip", "r3",  "r4",  "r5",  "r6",  "r7",

diff --git a/opcodes/ip2k-dis.c b/opcodes/ip2k-dis.c
index 345d5f3c078ccdac59c4d627b56050c0d0ebb9d2..e6008bdd388f7effeb7e0250b3a9e86305325d55 100644 (file)
--- a/opcodes/ip2k-dis.c
+++ b/opcodes/ip2k-dis.c
@@ -28,7 +28,7 @@
 #include "sysdep.h"
 #include <stdio.h>
 #include "ansidecl.h"
-#include "dis-asm.h"
+#include "disassemble.h"
 #include "bfd.h"
 #include "symcat.h"
 #include "libiberty.h"

diff --git a/opcodes/iq2000-dis.c b/opcodes/iq2000-dis.c
index 1a39d025f943b3e13930b090ee2b4d7c3e0ab379..1d5518735794c4f42c30a6365bd5617749e5e27f 100644 (file)
--- a/opcodes/iq2000-dis.c
+++ b/opcodes/iq2000-dis.c
@@ -28,7 +28,7 @@
 #include "sysdep.h"
 #include <stdio.h>
 #include "ansidecl.h"
-#include "dis-asm.h"
+#include "disassemble.h"
 #include "bfd.h"
 #include "symcat.h"
 #include "libiberty.h"

diff --git a/opcodes/lm32-dis.c b/opcodes/lm32-dis.c
index 7fd619511858bfc7bc64844b2451d776322f74a3..8238993317e9d8b0550ff4ec1305e8abe0b667f1 100644 (file)
--- a/opcodes/lm32-dis.c
+++ b/opcodes/lm32-dis.c
@@ -28,7 +28,7 @@
 #include "sysdep.h"
 #include <stdio.h>
 #include "ansidecl.h"
-#include "dis-asm.h"
+#include "disassemble.h"
 #include "bfd.h"
 #include "symcat.h"
 #include "libiberty.h"

diff --git a/opcodes/m10200-dis.c b/opcodes/m10200-dis.c
index 9e0def34ff83e5f3e00f44e96290b1db5feeffbb..96e13a8462814a3a532b41293a3725ca7312ea7d 100644 (file)
--- a/opcodes/m10200-dis.c
+++ b/opcodes/m10200-dis.c
@@ -21,7 +21,7 @@
 #include "sysdep.h"
 #include <stdio.h>
 #include "opcode/mn10200.h"
-#include "dis-asm.h"
+#include "disassemble.h"
 #include "opintl.h"
 
 static void

diff --git a/opcodes/m10300-dis.c b/opcodes/m10300-dis.c
index ec71a1ae702629266fc78c585f665ba4c1e6175b..26e245f21f08e9e263d7d3cc58df20d65dd80879 100644 (file)
--- a/opcodes/m10300-dis.c
+++ b/opcodes/m10300-dis.c
@@ -21,7 +21,7 @@
 #include "sysdep.h"
 #include <stdio.h>
 #include "opcode/mn10300.h"
-#include "dis-asm.h"
+#include "disassemble.h"
 #include "opintl.h"
 
 #define HAVE_AM33_2 (info->mach == AM33_2)

diff --git a/opcodes/m32r-dis.c b/opcodes/m32r-dis.c
index a1dafce2d0d27df9bf2f25c95f19db5a8c36b3b6..bee98bd744fe5226397ba902ddce1cf0c74a76c0 100644 (file)
--- a/opcodes/m32r-dis.c
+++ b/opcodes/m32r-dis.c
@@ -28,7 +28,7 @@
 #include "sysdep.h"
 #include <stdio.h>
 #include "ansidecl.h"
-#include "dis-asm.h"
+#include "disassemble.h"
 #include "bfd.h"
 #include "symcat.h"
 #include "libiberty.h"

diff --git a/opcodes/m68hc11-dis.c b/opcodes/m68hc11-dis.c
index 0a597395e21013e0f825c50ce3cf49146cdab132..9d1b2ccce733cb9e1be1ed5cbe51724b6d330ba6 100644 (file)
--- a/opcodes/m68hc11-dis.c
+++ b/opcodes/m68hc11-dis.c
@@ -24,7 +24,7 @@
 #include <stdio.h>
 
 #include "opcode/m68hc11.h"
-#include "dis-asm.h"
+#include "disassemble.h"
 
 #define PC_REGNUM 3
 

diff --git a/opcodes/m68k-dis.c b/opcodes/m68k-dis.c
index 345c66bdd6a62d625bef87a956f25cdf35e68617..d98e5afcf53fa4c6c9dc5358860219bc6e5482ef 100644 (file)
--- a/opcodes/m68k-dis.c
+++ b/opcodes/m68k-dis.c
@@ -19,7 +19,7 @@
    MA 02110-1301, USA.  */
 
 #include "sysdep.h"
-#include "dis-asm.h"
+#include "disassemble.h"
 #include "floatformat.h"
 #include "libiberty.h"
 #include "opintl.h"

diff --git a/opcodes/m88k-dis.c b/opcodes/m88k-dis.c
index 928090f1c6b457cf44757d10bc8f621910197f97..d37d4213df5d76dc889b1def67bb4ae7231f7dc3 100644 (file)
--- a/opcodes/m88k-dis.c
+++ b/opcodes/m88k-dis.c
@@ -21,7 +21,7 @@
    MA 02110-1301, USA.  */
 
 #include "sysdep.h"
-#include "dis-asm.h"
+#include "disassemble.h"
 #include "opcode/m88k.h"
 #include "opintl.h"
 #include "libiberty.h"

diff --git a/opcodes/mcore-dis.c b/opcodes/mcore-dis.c
index ed52e99b0d57273fdc77d731cd272038fc070e4f..741819ce5589afca9dcd79c3b560c07160cba23c 100644 (file)
--- a/opcodes/mcore-dis.c
+++ b/opcodes/mcore-dis.c
@@ -25,7 +25,7 @@
 #define DEFINE_TABLE
 
 #include "mcore-opc.h"
-#include "dis-asm.h"
+#include "disassemble.h"
 
 /* Mask for each mcore_opclass: */
 static const unsigned short imsk[] = {

diff --git a/opcodes/metag-dis.c b/opcodes/metag-dis.c
index 3c472e60f175c30eae445bb6a1509fc6692c6ffe..97bae4c1d36edcd5f7d94226323a3b9f8fa8fbc5 100644 (file)
--- a/opcodes/metag-dis.c
+++ b/opcodes/metag-dis.c
@@ -18,7 +18,7 @@
    MA 02110-1301, USA.  */
 
 #include "sysdep.h"
-#include "dis-asm.h"
+#include "disassemble.h"
 #include "opintl.h"
 
 #include <stdio.h>

diff --git a/opcodes/microblaze-dis.c b/opcodes/microblaze-dis.c
index 7f57380f23e99ddb8e854f1ce2871dcfcf4a3949..6a174b0eb903e3b9913ccac5cbb915f40fe0294d 100644 (file)
--- a/opcodes/microblaze-dis.c
+++ b/opcodes/microblaze-dis.c
@@ -24,7 +24,7 @@
 #define STATIC_TABLE
 #define DEFINE_TABLE
 
-#include "dis-asm.h"
+#include "disassemble.h"
 #include <strings.h>
 #include "microblaze-opc.h"
 #include "microblaze-dis.h"

diff --git a/opcodes/mmix-dis.c b/opcodes/mmix-dis.c
index 6ec50bf27d26d245af72210520453c9e32936ff4..bfd0d02d5ef98b235de8bbbb2548632828643cfd 100644 (file)
--- a/opcodes/mmix-dis.c
+++ b/opcodes/mmix-dis.c
@@ -22,7 +22,7 @@
 #include "sysdep.h"
 #include <stdio.h>
 #include "opcode/mmix.h"
-#include "dis-asm.h"
+#include "disassemble.h"
 #include "libiberty.h"
 #include "bfd.h"
 #include "opintl.h"

diff --git a/opcodes/moxie-dis.c b/opcodes/moxie-dis.c
index 070edc2b9708101a61ac78bb005784c38e9ebe6f..390fc7842219265754170f479432f8253669ad3a 100644 (file)
--- a/opcodes/moxie-dis.c
+++ b/opcodes/moxie-dis.c
@@ -25,7 +25,7 @@
 #define DEFINE_TABLE
 
 #include "opcode/moxie.h"
-#include "dis-asm.h"
+#include "disassemble.h"
 
 static fprintf_ftype fpr;
 static void *stream;

diff --git a/opcodes/msp430-dis.c b/opcodes/msp430-dis.c
index 58d31df7c957b6182dd17099b5ec23fb7cf4b65d..1a08ea94e0caaced74af951b7763c848c1821071 100644 (file)
--- a/opcodes/msp430-dis.c
+++ b/opcodes/msp430-dis.c
@@ -26,7 +26,7 @@
 #include <sys/types.h>
 #include <errno.h>
 
-#include "dis-asm.h"
+#include "disassemble.h"
 #include "opintl.h"
 #include "libiberty.h"
 

diff --git a/opcodes/mt-dis.c b/opcodes/mt-dis.c
index 1c74f8836ee12a70aec6e83e968c063172e1be0e..fddbc812b05f217bad74c1c62203f94bb1d67cda 100644 (file)
--- a/opcodes/mt-dis.c
+++ b/opcodes/mt-dis.c
@@ -28,7 +28,7 @@
 #include "sysdep.h"
 #include <stdio.h>
 #include "ansidecl.h"
-#include "dis-asm.h"
+#include "disassemble.h"
 #include "bfd.h"
 #include "symcat.h"
 #include "libiberty.h"

diff --git a/opcodes/nds32-dis.c b/opcodes/nds32-dis.c
index 0f2b0f41215454228de846423d8595162a8655cf..4ee3bb5cb403f0a0e775a383b98ec0f1671f5b94 100644 (file)
--- a/opcodes/nds32-dis.c
+++ b/opcodes/nds32-dis.c
@@ -22,7 +22,7 @@
 #include "sysdep.h"
 #include <stdio.h>
 #include "ansidecl.h"
-#include "dis-asm.h"
+#include "disassemble.h"
 #include "bfd.h"
 #include "symcat.h"
 #include "libiberty.h"

diff --git a/opcodes/nios2-dis.c b/opcodes/nios2-dis.c
index d95bbc5e907d7352f3201e9e3862e9fdc910a488..cc6fff226b409ac2e46c703d1b21427e578a6100 100644 (file)
--- a/opcodes/nios2-dis.c
+++ b/opcodes/nios2-dis.c
@@ -21,7 +21,7 @@
    MA 02110-1301, USA.  */
 
 #include "sysdep.h"
-#include "dis-asm.h"
+#include "disassemble.h"
 #include "opcode/nios2.h"
 #include "libiberty.h"
 #include <string.h>

diff --git a/opcodes/ns32k-dis.c b/opcodes/ns32k-dis.c
index 440a382313cefeee9ab3f3042322278a3cc130e7..0794163f0f3d335e997807d2a3233600601a9890 100644 (file)
--- a/opcodes/ns32k-dis.c
+++ b/opcodes/ns32k-dis.c
@@ -20,7 +20,7 @@
 
 #include "sysdep.h"
 #include "bfd.h"
-#include "dis-asm.h"
+#include "disassemble.h"
 #if !defined(const) && !defined(__STDC__)
 #define const
 #endif

diff --git a/opcodes/or1k-dis.c b/opcodes/or1k-dis.c
index 739269c3e33335bcc41a7d374a28c495f666df68..c9a7620f4a530e68fc274eb6368c9172570543a5 100644 (file)
--- a/opcodes/or1k-dis.c
+++ b/opcodes/or1k-dis.c
@@ -28,7 +28,7 @@
 #include "sysdep.h"
 #include <stdio.h>
 #include "ansidecl.h"
-#include "dis-asm.h"
+#include "disassemble.h"
 #include "bfd.h"
 #include "symcat.h"
 #include "libiberty.h"

diff --git a/opcodes/pdp11-dis.c b/opcodes/pdp11-dis.c
index e4afcd6e7a3c3594bb1c5b112dc815ea9592fc4f..d49217505f0e49d380b293da0e2b20726b4ee750 100644 (file)
--- a/opcodes/pdp11-dis.c
+++ b/opcodes/pdp11-dis.c
@@ -19,7 +19,7 @@
    MA 02110-1301, USA.  */
 
 #include "sysdep.h"
-#include "dis-asm.h"
+#include "disassemble.h"
 #include "opcode/pdp11.h"
 
 #define AFTER_INSTRUCTION      "\t"

diff --git a/opcodes/pj-dis.c b/opcodes/pj-dis.c
index 782152856587b3c11a305dcf8da8686767719436..f34f05f1d882642b4e6536218cfb3ad03d96e659 100644 (file)
--- a/opcodes/pj-dis.c
+++ b/opcodes/pj-dis.c
@@ -22,7 +22,7 @@
 #include "sysdep.h"
 #include <stdio.h>
 #include "opcode/pj.h"
-#include "dis-asm.h"
+#include "disassemble.h"
 
 extern const pj_opc_info_t pj_opc_info[512];
 

diff --git a/opcodes/ppc-dis.c b/opcodes/ppc-dis.c
index 3c9cbaf8c05005e87dfe005abf843d9a888711d9..5e89c50faa6d0cc5a586244e60573f490de8952e 100644 (file)
--- a/opcodes/ppc-dis.c
+++ b/opcodes/ppc-dis.c
@@ -21,7 +21,7 @@
 
 #include "sysdep.h"
 #include <stdio.h>
-#include "dis-asm.h"
+#include "disassemble.h"
 #include "elf-bfd.h"
 #include "elf/ppc.h"
 #include "opintl.h"

diff --git a/opcodes/pru-dis.c b/opcodes/pru-dis.c
index ed642e88a30e15b0a03c2be9ea80e0d7e2065534..80b34adef03827ddb40de7a91d1f770dfc08eefb 100644 (file)
--- a/opcodes/pru-dis.c
+++ b/opcodes/pru-dis.c
@@ -20,7 +20,7 @@
    MA 02110-1301, USA.  */
 
 #include "sysdep.h"
-#include "dis-asm.h"
+#include "disassemble.h"
 #include "opcode/pru.h"
 #include "libiberty.h"
 #include <string.h>

diff --git a/opcodes/riscv-dis.c b/opcodes/riscv-dis.c
index bb534633102c3274f1b3a2b0fdc14370497defea..2dc76dead89bcecc8f2c8c7ea3fdbbd78027b396 100644 (file)
--- a/opcodes/riscv-dis.c
+++ b/opcodes/riscv-dis.c
@@ -21,7 +21,7 @@
    see <http://www.gnu.org/licenses/>.  */
 
 #include "sysdep.h"
-#include "dis-asm.h"
+#include "disassemble.h"
 #include "libiberty.h"
 #include "opcode/riscv.h"
 #include "opintl.h"

diff --git a/opcodes/rl78-dis.c b/opcodes/rl78-dis.c
index 799cd3823e4042b29f732897633b294e9a162bc5..15a86e81c9366637c029a8eed2099972b1294005 100644 (file)
--- a/opcodes/rl78-dis.c
+++ b/opcodes/rl78-dis.c
@@ -25,7 +25,7 @@
 
 #include "bfd.h"
 #include "elf-bfd.h"
-#include "dis-asm.h"
+#include "disassemble.h"
 #include "opcode/rl78.h"
 #include "elf/rl78.h"
 

diff --git a/opcodes/s390-dis.c b/opcodes/s390-dis.c
index 2d97a2aa7055763e11aeb66aeb0c6c7b00a57f81..8d450b4664e8f49c3231d6239777b8de7a046c50 100644 (file)
--- a/opcodes/s390-dis.c
+++ b/opcodes/s390-dis.c
@@ -22,7 +22,7 @@
 #include "sysdep.h"
 #include <stdio.h>
 #include "ansidecl.h"
-#include "dis-asm.h"
+#include "disassemble.h"
 #include "opintl.h"
 #include "opcode/s390.h"
 #include "libiberty.h"

diff --git a/opcodes/score-dis.c b/opcodes/score-dis.c
index 9c1c06cc02d06721348aa66b1bed346f9efbad09..fdfc4a082cfb16d9044c4a9fb649be8c7a93919a 100644 (file)
--- a/opcodes/score-dis.c
+++ b/opcodes/score-dis.c
@@ -23,7 +23,7 @@
    MA 02110-1301, USA.  */
 
 #include "sysdep.h"
-#include "dis-asm.h"
+#include "disassemble.h"
 #define DEFINE_TABLE
 #include "opintl.h"
 #include "bfd.h"

diff --git a/opcodes/sh-dis.c b/opcodes/sh-dis.c
index 5b82bad6bd5b961cecba10a787fb6c50885b40b7..ea69ff6fce453824fd82f46f39a7dc4d665cc33c 100644 (file)
--- a/opcodes/sh-dis.c
+++ b/opcodes/sh-dis.c
@@ -25,7 +25,7 @@
 #define DEFINE_TABLE
 
 #include "sh-opc.h"
-#include "dis-asm.h"
+#include "disassemble.h"
 
 #ifdef ARCH_all
 #define INCLUDE_SHMEDIA

diff --git a/opcodes/sh64-dis.c b/opcodes/sh64-dis.c
index 386fb159739178e21846c8f373b33e92bee3083c..7329aff2bc94ce66e6ee1cb65cd0aaa25991bfec 100644 (file)
--- a/opcodes/sh64-dis.c
+++ b/opcodes/sh64-dis.c
@@ -20,7 +20,7 @@
 
 #include "sysdep.h"
 #include <stdio.h>
-#include "dis-asm.h"
+#include "disassemble.h"
 #include "sh64-opc.h"
 #include "libiberty.h"
 /* We need to refer to the ELF header structure.  */

diff --git a/opcodes/tic30-dis.c b/opcodes/tic30-dis.c
index 5956f2b8e6ec56c6db4802041bea9d663a8a861c..a103865fda4ca1c11eeecfaf5f434ace967f6287 100644 (file)
--- a/opcodes/tic30-dis.c
+++ b/opcodes/tic30-dis.c
@@ -22,7 +22,7 @@
 #include "sysdep.h"
 #include <errno.h>
 #include <math.h>
-#include "dis-asm.h"
+#include "disassemble.h"
 #include "opcode/tic30.h"
 
 #define NORMAL_INSN   1

diff --git a/opcodes/tic4x-dis.c b/opcodes/tic4x-dis.c
index c4d1d87043c6ba8f0babb837e88a538000eb56a9..bd314ea2e3d1a3c6a7261dce0898d86171caea5f 100644 (file)
--- a/opcodes/tic4x-dis.c
+++ b/opcodes/tic4x-dis.c
@@ -24,7 +24,7 @@
 #include "sysdep.h"
 #include <math.h>
 #include "libiberty.h"
-#include "dis-asm.h"
+#include "disassemble.h"
 #include "opcode/tic4x.h"
 
 #define TIC4X_DEBUG 0

diff --git a/opcodes/tic54x-dis.c b/opcodes/tic54x-dis.c
index c5cd41897193510713e9ea7618619ac6eb3de710..c3cd88cdeac8fb5270852363a3f862637ca7bf68 100644 (file)
--- a/opcodes/tic54x-dis.c
+++ b/opcodes/tic54x-dis.c
@@ -23,7 +23,7 @@
 #include <errno.h>
 #include <math.h>
 #include <stdlib.h>
-#include "dis-asm.h"
+#include "disassemble.h"
 #include "opcode/tic54x.h"
 #include "coff/tic54x.h"
 

diff --git a/opcodes/tic6x-dis.c b/opcodes/tic6x-dis.c
index 48046b2df5409351f6a69a4032f5468c1415fe46..b8284fd8cea5fde5d62d0931206c5f8c61760606 100644 (file)
--- a/opcodes/tic6x-dis.c
+++ b/opcodes/tic6x-dis.c
@@ -21,7 +21,7 @@
    MA 02110-1301, USA.  */
 
 #include "sysdep.h"
-#include "dis-asm.h"
+#include "disassemble.h"
 #include "opcode/tic6x.h"
 #include "libiberty.h"
 

diff --git a/opcodes/tic80-dis.c b/opcodes/tic80-dis.c
index 37932d7b60fad10c8af1a7d3c79aa61c752d9ec7..b477638f344c8d579755d09b6b8011c4d32f6d0f 100644 (file)
--- a/opcodes/tic80-dis.c
+++ b/opcodes/tic80-dis.c
@@ -21,7 +21,7 @@
 #include "sysdep.h"
 #include <stdio.h>
 #include "opcode/tic80.h"
-#include "dis-asm.h"
+#include "disassemble.h"
 
 static int length;
 \f

diff --git a/opcodes/tilegx-dis.c b/opcodes/tilegx-dis.c
index 2a1ff41bf877e6d83d1fa9a2b246860c935eadd0..c0c82af326b012611572ad074a628b3bd7c62fcc 100644 (file)
--- a/opcodes/tilegx-dis.c
+++ b/opcodes/tilegx-dis.c
@@ -24,7 +24,7 @@
 #include "bfd.h"
 #include "elf/tilegx.h"
 #include "elf-bfd.h"
-#include "dis-asm.h"
+#include "disassemble.h"
 #include "opcode/tilegx.h"
 
 

diff --git a/opcodes/tilepro-dis.c b/opcodes/tilepro-dis.c
index 066d1d68d7aed57cab4667a2ae3f848534b9dec8..2a6b7aababf9393a9c4efc320bbf4dc38188ec46 100644 (file)
--- a/opcodes/tilepro-dis.c
+++ b/opcodes/tilepro-dis.c
@@ -24,7 +24,7 @@
 #include "bfd.h"
 #include "elf/tilepro.h"
 #include "elf-bfd.h"
-#include "dis-asm.h"
+#include "disassemble.h"
 #include "opcode/tilepro.h"
 
 

diff --git a/opcodes/v850-dis.c b/opcodes/v850-dis.c
index 5e63f358cb764745bb70ecb30f6db529ef344d42..4e39a49d2356e3ca2b4e8ae2e8c712037454c38c 100644 (file)
--- a/opcodes/v850-dis.c
+++ b/opcodes/v850-dis.c
@@ -23,7 +23,7 @@
 #include <stdio.h>
 #include <string.h>
 #include "opcode/v850.h"
-#include "dis-asm.h"
+#include "disassemble.h"
 #include "opintl.h"
 
 static const char *const v850_reg_names[] =

diff --git a/opcodes/vax-dis.c b/opcodes/vax-dis.c
index 4642702787d38534a805a1f3bf2fbdad7b0e722c..7adde97c4b4d1b0f60344a519d2d68bd1469b261 100644 (file)
--- a/opcodes/vax-dis.c
+++ b/opcodes/vax-dis.c
@@ -23,7 +23,7 @@
 #include <setjmp.h>
 #include <string.h>
 #include "opcode/vax.h"
-#include "dis-asm.h"
+#include "disassemble.h"
 
 static char *reg_names[] =
 {

diff --git a/opcodes/visium-dis.c b/opcodes/visium-dis.c
index f5b5c418dab949f360fe8a2b69246fad996430fe..eb2930b74a6d07b0cedb5538764411241620634d 100644 (file)
--- a/opcodes/visium-dis.c
+++ b/opcodes/visium-dis.c
@@ -20,7 +20,7 @@
    MA 02110-1301, USA.  */
 
 #include "sysdep.h"
-#include "dis-asm.h"
+#include "disassemble.h"
 #include "opcode/visium.h"
 
 #include <string.h>

diff --git a/opcodes/w65-dis.c b/opcodes/w65-dis.c
index 015b39b30f779458345a77f1a7073ba2158dfc4a..fe43c202e999d2e3cd74a8f6e6523f321eb44b89 100644 (file)
--- a/opcodes/w65-dis.c
+++ b/opcodes/w65-dis.c
@@ -25,7 +25,7 @@
 #define DEFINE_TABLE
 
 #include "w65-opc.h"
-#include "dis-asm.h"
+#include "disassemble.h"
 
 static fprintf_ftype fpr;
 static void *stream;

diff --git a/opcodes/wasm32-dis.c b/opcodes/wasm32-dis.c
index 179a4402ceff66de75bb074a9b1da26c166b19b1..18326540578a08bed8eb0f6e23e0d5c08f15d297 100644 (file)
--- a/opcodes/wasm32-dis.c
+++ b/opcodes/wasm32-dis.c
@@ -19,7 +19,7 @@
    MA 02110-1301, USA.  */
 
 #include "sysdep.h"
-#include "dis-asm.h"
+#include "disassemble.h"
 #include "opintl.h"
 #include "safe-ctype.h"
 #include "floatformat.h"

diff --git a/opcodes/xc16x-dis.c b/opcodes/xc16x-dis.c
index 6a6758dc3fc84b8c033dabf355a5a8d27f26029b..1cbf119dbbae46a8d4427fd640628e2c71bdb5e3 100644 (file)
--- a/opcodes/xc16x-dis.c
+++ b/opcodes/xc16x-dis.c
@@ -28,7 +28,7 @@
 #include "sysdep.h"
 #include <stdio.h>
 #include "ansidecl.h"
-#include "dis-asm.h"
+#include "disassemble.h"
 #include "bfd.h"
 #include "symcat.h"
 #include "libiberty.h"

diff --git a/opcodes/xgate-dis.c b/opcodes/xgate-dis.c
index da9ab6c9f1e7181cc80b0a4b3c58dbe8689240b9..f200a8b506d35b1f8ff59d7a9338e6bfc439fd8d 100644 (file)
--- a/opcodes/xgate-dis.c
+++ b/opcodes/xgate-dis.c
@@ -21,7 +21,7 @@
 
 #include "sysdep.h"
 #include <assert.h>
-#include "dis-asm.h"
+#include "disassemble.h"
 #include "opintl.h"
 #include "libiberty.h"
 #include "ansidecl.h"

diff --git a/opcodes/xstormy16-dis.c b/opcodes/xstormy16-dis.c
index b54a6989b6aa6ace1d1a0e54f72387c30aee9e25..0b7fdf3c1f0a36ec8f0d5aa2dd3b5a85d30d7227 100644 (file)
--- a/opcodes/xstormy16-dis.c
+++ b/opcodes/xstormy16-dis.c
@@ -28,7 +28,7 @@
 #include "sysdep.h"
 #include <stdio.h>
 #include "ansidecl.h"
-#include "dis-asm.h"
+#include "disassemble.h"
 #include "bfd.h"
 #include "symcat.h"
 #include "libiberty.h"

diff --git a/opcodes/xtensa-dis.c b/opcodes/xtensa-dis.c
index 93e5d83af04a05d67f9cd82df80fe0667dff1c0b..09dbca6ad285e25f785bda9d8a04bbf6478e19e1 100644 (file)
--- a/opcodes/xtensa-dis.c
+++ b/opcodes/xtensa-dis.c
@@ -27,7 +27,7 @@
 #include "xtensa-isa.h"
 #include "ansidecl.h"
 #include "libiberty.h"
-#include "dis-asm.h"
+#include "disassemble.h"
 
 #include <setjmp.h>
 

diff --git a/opcodes/z80-dis.c b/opcodes/z80-dis.c
index fbaa4d1f444e99066d57fc5087a12fd7f003c8ac..4445f08cd7ef7586385a93602634fa99fff43f9a 100644 (file)
--- a/opcodes/z80-dis.c
+++ b/opcodes/z80-dis.c
@@ -20,7 +20,7 @@
    MA 02110-1301, USA.  */
 
 #include "sysdep.h"
-#include "dis-asm.h"
+#include "disassemble.h"
 #include <stdio.h>
 
 struct buffer

diff --git a/opcodes/z8k-dis.c b/opcodes/z8k-dis.c
index 0288a51dedc450d620dd5ea88934a8c8c3de308b..19ebb6e0f29b0dc5ba4716846d131664578cde36 100644 (file)
--- a/opcodes/z8k-dis.c
+++ b/opcodes/z8k-dis.c
@@ -19,7 +19,7 @@
    MA 02110-1301, USA.  */
 
 #include "sysdep.h"
-#include "dis-asm.h"
+#include "disassemble.h"
 
 #define DEFINE_TABLE
 #include "z8k-opc.h"