From 88c1242dc0a1e1ab582a65ea8bd05eb5f244c59b Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Wed, 24 May 2017 17:23:52 +0100 Subject: [PATCH] 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 * dis-asm.h: Move some function declarations to opcodes/disassemble.h. opcodes: 2017-05-24 Yao Qi * 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. --- include/ChangeLog | 5 ++ include/dis-asm.h | 80 +----------------------------- opcodes/ChangeLog | 28 +++++++++++ opcodes/alpha-dis.c | 2 +- opcodes/avr-dis.c | 2 +- opcodes/bfin-dis.c | 2 +- opcodes/cr16-dis.c | 2 +- opcodes/crx-dis.c | 2 +- opcodes/d10v-dis.c | 2 +- opcodes/d30v-dis.c | 2 +- opcodes/disassemble.c | 2 +- opcodes/disassemble.h | 102 +++++++++++++++++++++++++++++++++++++++ opcodes/dlx-dis.c | 2 +- opcodes/epiphany-dis.c | 2 +- opcodes/fr30-dis.c | 2 +- opcodes/frv-dis.c | 2 +- opcodes/ft32-dis.c | 2 +- opcodes/h8300-dis.c | 2 +- opcodes/h8500-dis.c | 2 +- opcodes/hppa-dis.c | 2 +- opcodes/i370-dis.c | 2 +- opcodes/i386-dis.c | 2 +- opcodes/i860-dis.c | 2 +- opcodes/i960-dis.c | 2 +- opcodes/ip2k-dis.c | 2 +- opcodes/iq2000-dis.c | 2 +- opcodes/lm32-dis.c | 2 +- opcodes/m10200-dis.c | 2 +- opcodes/m10300-dis.c | 2 +- opcodes/m32r-dis.c | 2 +- opcodes/m68hc11-dis.c | 2 +- opcodes/m68k-dis.c | 2 +- opcodes/m88k-dis.c | 2 +- opcodes/mcore-dis.c | 2 +- opcodes/metag-dis.c | 2 +- opcodes/microblaze-dis.c | 2 +- opcodes/mmix-dis.c | 2 +- opcodes/moxie-dis.c | 2 +- opcodes/msp430-dis.c | 2 +- opcodes/mt-dis.c | 2 +- opcodes/nds32-dis.c | 2 +- opcodes/nios2-dis.c | 2 +- opcodes/ns32k-dis.c | 2 +- opcodes/or1k-dis.c | 2 +- opcodes/pdp11-dis.c | 2 +- opcodes/pj-dis.c | 2 +- opcodes/ppc-dis.c | 2 +- opcodes/pru-dis.c | 2 +- opcodes/riscv-dis.c | 2 +- opcodes/rl78-dis.c | 2 +- opcodes/s390-dis.c | 2 +- opcodes/score-dis.c | 2 +- opcodes/sh-dis.c | 2 +- opcodes/sh64-dis.c | 2 +- opcodes/tic30-dis.c | 2 +- opcodes/tic4x-dis.c | 2 +- opcodes/tic54x-dis.c | 2 +- opcodes/tic6x-dis.c | 2 +- opcodes/tic80-dis.c | 2 +- opcodes/tilegx-dis.c | 2 +- opcodes/tilepro-dis.c | 2 +- opcodes/v850-dis.c | 2 +- opcodes/vax-dis.c | 2 +- opcodes/visium-dis.c | 2 +- opcodes/w65-dis.c | 2 +- opcodes/wasm32-dis.c | 2 +- opcodes/xc16x-dis.c | 2 +- opcodes/xgate-dis.c | 2 +- opcodes/xstormy16-dis.c | 2 +- opcodes/xtensa-dis.c | 2 +- opcodes/z80-dis.c | 2 +- opcodes/z8k-dis.c | 2 +- 72 files changed, 205 insertions(+), 146 deletions(-) create mode 100644 opcodes/disassemble.h diff --git a/include/ChangeLog b/include/ChangeLog index 3eccaae03f..20cae3196e 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,8 @@ +2017-05-24 Yao Qi + + * dis-asm.h: Move some function declarations to + opcodes/disassemble.h. + 2017-05-24 Yao Qi * dis-asm.h (disassembler): Update declaration. diff --git a/include/dis-asm.h b/include/dis-asm.h index dd935049e8..911bfb043f 100644 --- 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 912567b6c9..8e7d4dbde5 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,31 @@ +2017-05-24 Yao Qi + + * 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 * rl78-dis.c (rl78_get_disassembler): If parameter abfd diff --git a/opcodes/alpha-dis.c b/opcodes/alpha-dis.c index 6fb7614c7c..656e92543a 100644 --- a/opcodes/alpha-dis.c +++ b/opcodes/alpha-dis.c @@ -22,7 +22,7 @@ #include "sysdep.h" #include -#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 a16650a499..97f1df5d35 100644 --- a/opcodes/avr-dis.c +++ b/opcodes/avr-dis.c @@ -22,7 +22,7 @@ #include "sysdep.h" #include -#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 a1eaeb49cf..bca68b4fca 100644 --- 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 06ccfef399..16385c35c9 100644 --- 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 9c14537f0d..4e48668f68 100644 --- 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 657038f236..7fa490e0f1 100644 --- a/opcodes/d10v-dis.c +++ b/opcodes/d10v-dis.c @@ -21,7 +21,7 @@ #include "sysdep.h" #include #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 b0c643ece9..aff3eb0d0f 100644 --- a/opcodes/d30v-dis.c +++ b/opcodes/d30v-dis.c @@ -21,7 +21,7 @@ #include "sysdep.h" #include #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 e79b5c7d38..cd134e8718 100644 --- 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 diff --git a/opcodes/disassemble.h b/opcodes/disassemble.h new file mode 100644 index 0000000000..dec09fe140 --- /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 cd9be30e82..f106d320d1 100644 --- 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 adbc97fda8..90458dd418 100644 --- a/opcodes/epiphany-dis.c +++ b/opcodes/epiphany-dis.c @@ -28,7 +28,7 @@ #include "sysdep.h" #include #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 071eeba21d..70ad4797f3 100644 --- a/opcodes/fr30-dis.c +++ b/opcodes/fr30-dis.c @@ -28,7 +28,7 @@ #include "sysdep.h" #include #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 41dd506af0..60b8f3f200 100644 --- a/opcodes/frv-dis.c +++ b/opcodes/frv-dis.c @@ -28,7 +28,7 @@ #include "sysdep.h" #include #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 a8a6bb6622..0384073259 100644 --- 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 0e7c65a2d2..5b20b84f9e 100644 --- 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 dc2f45efff..0737999892 100644 --- 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 c174b9c634..9c2e8429f3 100644 --- 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 529ba13ce1..e66a01c5c2 100644 --- a/opcodes/i370-dis.c +++ b/opcodes/i370-dis.c @@ -22,7 +22,7 @@ #include "sysdep.h" #include -#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 039768b804..b35dbc046e 100644 --- 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 5d3125c5dc..54cb835b27 100644 --- 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 a34e261f0f..c7d353ac1e 100644 --- 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 345d5f3c07..e6008bdd38 100644 --- a/opcodes/ip2k-dis.c +++ b/opcodes/ip2k-dis.c @@ -28,7 +28,7 @@ #include "sysdep.h" #include #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 1a39d025f9..1d55187357 100644 --- a/opcodes/iq2000-dis.c +++ b/opcodes/iq2000-dis.c @@ -28,7 +28,7 @@ #include "sysdep.h" #include #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 7fd6195118..8238993317 100644 --- a/opcodes/lm32-dis.c +++ b/opcodes/lm32-dis.c @@ -28,7 +28,7 @@ #include "sysdep.h" #include #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 9e0def34ff..96e13a8462 100644 --- a/opcodes/m10200-dis.c +++ b/opcodes/m10200-dis.c @@ -21,7 +21,7 @@ #include "sysdep.h" #include #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 ec71a1ae70..26e245f21f 100644 --- a/opcodes/m10300-dis.c +++ b/opcodes/m10300-dis.c @@ -21,7 +21,7 @@ #include "sysdep.h" #include #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 a1dafce2d0..bee98bd744 100644 --- a/opcodes/m32r-dis.c +++ b/opcodes/m32r-dis.c @@ -28,7 +28,7 @@ #include "sysdep.h" #include #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 0a597395e2..9d1b2ccce7 100644 --- a/opcodes/m68hc11-dis.c +++ b/opcodes/m68hc11-dis.c @@ -24,7 +24,7 @@ #include #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 345c66bdd6..d98e5afcf5 100644 --- 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 928090f1c6..d37d4213df 100644 --- 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 ed52e99b0d..741819ce55 100644 --- 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 3c472e60f1..97bae4c1d3 100644 --- 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 diff --git a/opcodes/microblaze-dis.c b/opcodes/microblaze-dis.c index 7f57380f23..6a174b0eb9 100644 --- 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 #include "microblaze-opc.h" #include "microblaze-dis.h" diff --git a/opcodes/mmix-dis.c b/opcodes/mmix-dis.c index 6ec50bf27d..bfd0d02d5e 100644 --- a/opcodes/mmix-dis.c +++ b/opcodes/mmix-dis.c @@ -22,7 +22,7 @@ #include "sysdep.h" #include #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 070edc2b97..390fc78422 100644 --- 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 58d31df7c9..1a08ea94e0 100644 --- a/opcodes/msp430-dis.c +++ b/opcodes/msp430-dis.c @@ -26,7 +26,7 @@ #include #include -#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 1c74f8836e..fddbc812b0 100644 --- a/opcodes/mt-dis.c +++ b/opcodes/mt-dis.c @@ -28,7 +28,7 @@ #include "sysdep.h" #include #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 0f2b0f4121..4ee3bb5cb4 100644 --- a/opcodes/nds32-dis.c +++ b/opcodes/nds32-dis.c @@ -22,7 +22,7 @@ #include "sysdep.h" #include #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 d95bbc5e90..cc6fff226b 100644 --- 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 diff --git a/opcodes/ns32k-dis.c b/opcodes/ns32k-dis.c index 440a382313..0794163f0f 100644 --- 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 739269c3e3..c9a7620f4a 100644 --- a/opcodes/or1k-dis.c +++ b/opcodes/or1k-dis.c @@ -28,7 +28,7 @@ #include "sysdep.h" #include #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 e4afcd6e7a..d49217505f 100644 --- 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 7821528565..f34f05f1d8 100644 --- a/opcodes/pj-dis.c +++ b/opcodes/pj-dis.c @@ -22,7 +22,7 @@ #include "sysdep.h" #include #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 3c9cbaf8c0..5e89c50faa 100644 --- a/opcodes/ppc-dis.c +++ b/opcodes/ppc-dis.c @@ -21,7 +21,7 @@ #include "sysdep.h" #include -#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 ed642e88a3..80b34adef0 100644 --- 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 diff --git a/opcodes/riscv-dis.c b/opcodes/riscv-dis.c index bb53463310..2dc76dead8 100644 --- a/opcodes/riscv-dis.c +++ b/opcodes/riscv-dis.c @@ -21,7 +21,7 @@ see . */ #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 799cd3823e..15a86e81c9 100644 --- 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 2d97a2aa70..8d450b4664 100644 --- a/opcodes/s390-dis.c +++ b/opcodes/s390-dis.c @@ -22,7 +22,7 @@ #include "sysdep.h" #include #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 9c1c06cc02..fdfc4a082c 100644 --- 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 5b82bad6bd..ea69ff6fce 100644 --- 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 386fb15973..7329aff2bc 100644 --- a/opcodes/sh64-dis.c +++ b/opcodes/sh64-dis.c @@ -20,7 +20,7 @@ #include "sysdep.h" #include -#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 5956f2b8e6..a103865fda 100644 --- a/opcodes/tic30-dis.c +++ b/opcodes/tic30-dis.c @@ -22,7 +22,7 @@ #include "sysdep.h" #include #include -#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 c4d1d87043..bd314ea2e3 100644 --- a/opcodes/tic4x-dis.c +++ b/opcodes/tic4x-dis.c @@ -24,7 +24,7 @@ #include "sysdep.h" #include #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 c5cd418971..c3cd88cdea 100644 --- a/opcodes/tic54x-dis.c +++ b/opcodes/tic54x-dis.c @@ -23,7 +23,7 @@ #include #include #include -#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 48046b2df5..b8284fd8ce 100644 --- 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 37932d7b60..b477638f34 100644 --- a/opcodes/tic80-dis.c +++ b/opcodes/tic80-dis.c @@ -21,7 +21,7 @@ #include "sysdep.h" #include #include "opcode/tic80.h" -#include "dis-asm.h" +#include "disassemble.h" static int length; diff --git a/opcodes/tilegx-dis.c b/opcodes/tilegx-dis.c index 2a1ff41bf8..c0c82af326 100644 --- 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 066d1d68d7..2a6b7aabab 100644 --- 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 5e63f358cb..4e39a49d23 100644 --- a/opcodes/v850-dis.c +++ b/opcodes/v850-dis.c @@ -23,7 +23,7 @@ #include #include #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 4642702787..7adde97c4b 100644 --- a/opcodes/vax-dis.c +++ b/opcodes/vax-dis.c @@ -23,7 +23,7 @@ #include #include #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 f5b5c418da..eb2930b74a 100644 --- 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 diff --git a/opcodes/w65-dis.c b/opcodes/w65-dis.c index 015b39b30f..fe43c202e9 100644 --- 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 179a4402ce..1832654057 100644 --- 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 6a6758dc3f..1cbf119dbb 100644 --- a/opcodes/xc16x-dis.c +++ b/opcodes/xc16x-dis.c @@ -28,7 +28,7 @@ #include "sysdep.h" #include #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 da9ab6c9f1..f200a8b506 100644 --- a/opcodes/xgate-dis.c +++ b/opcodes/xgate-dis.c @@ -21,7 +21,7 @@ #include "sysdep.h" #include -#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 b54a6989b6..0b7fdf3c1f 100644 --- a/opcodes/xstormy16-dis.c +++ b/opcodes/xstormy16-dis.c @@ -28,7 +28,7 @@ #include "sysdep.h" #include #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 93e5d83af0..09dbca6ad2 100644 --- 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 diff --git a/opcodes/z80-dis.c b/opcodes/z80-dis.c index fbaa4d1f44..4445f08cd7 100644 --- 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 struct buffer diff --git a/opcodes/z8k-dis.c b/opcodes/z8k-dis.c index 0288a51ded..19ebb6e0f2 100644 --- 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" -- 2.34.1