From f4005b888ddaf874a7057b5b312e748045ce368a Mon Sep 17 00:00:00 2001 From: David Carlier Date: Sat, 4 Aug 2018 20:43:57 +0100 Subject: [PATCH] Change proposal to avoid collision wirth gdb header. --- libr/asm/arch/arc/gnu/arc-dis.c | 2 +- libr/asm/arch/arc/gnu/arcompact-dis.c | 2 +- libr/asm/arch/arm/aarch64/aarch64-dis.c | 2 +- libr/asm/arch/arm/gnu/arm-dis.c | 2 +- libr/asm/arch/cris/gnu/cris-dis.c | 2 +- libr/asm/arch/hexagon/gnu/hexagon-dis.c | 2 +- libr/asm/arch/hppa/gnu/hppa-dis.c | 2 +- libr/asm/arch/include/{dis-asm.h => disas-asm.h} | 0 libr/asm/arch/lanai/gnu/lanai-dis.c | 2 +- libr/asm/arch/mips/gnu/mips-dis.c | 2 +- libr/asm/arch/nios/gnu/nios2-dis.c | 2 +- libr/asm/arch/ppc/gnu/ppc-dis.c | 4 ++-- libr/asm/arch/sh/gnu/sh-dis.c | 2 +- libr/asm/arch/sparc/gnu/sparc-dis.c | 2 +- libr/asm/arch/tricore/gnu/cpu-tricore.c | 2 +- libr/asm/arch/tricore/gnu/tricore-dis.c | 2 +- libr/asm/arch/vax/vax-dis.c | 2 +- libr/asm/arch/xtensa/gnu/elf32-xtensa.c | 2 +- libr/asm/arch/xtensa/gnu/xtensa-dis.c | 2 +- libr/asm/arch/xtensa/gnu/xtensa-isa.c | 2 +- libr/asm/p/asm_arc.c | 2 +- libr/asm/p/asm_arm_gnu.c | 2 +- libr/asm/p/asm_cris_gnu.c | 2 +- libr/asm/p/asm_hexagon_gnu.c | 2 +- libr/asm/p/asm_hppa_gnu.c | 2 +- libr/asm/p/asm_lanai_gnu.c | 2 +- libr/asm/p/asm_mips_gnu.c | 2 +- libr/asm/p/asm_nios2.c | 2 +- libr/asm/p/asm_ppc_gnu.c | 2 +- libr/asm/p/asm_sh.c | 2 +- libr/asm/p/asm_sparc_gnu.c | 2 +- libr/asm/p/asm_tricore.c | 2 +- libr/asm/p/asm_vax.c | 2 +- libr/asm/p/asm_xtensa.c | 2 +- 34 files changed, 34 insertions(+), 34 deletions(-) rename libr/asm/arch/include/{dis-asm.h => disas-asm.h} (100%) diff --git a/libr/asm/arch/arc/gnu/arc-dis.c b/libr/asm/arch/arc/gnu/arc-dis.c index 75b7408f451d4..ea4d7e57c108a 100644 --- a/libr/asm/arch/arc/gnu/arc-dis.c +++ b/libr/asm/arch/arc/gnu/arc-dis.c @@ -24,7 +24,7 @@ #include "ansidecl.h" #include "libiberty.h" -#include "dis-asm.h" +#include "disas-asm.h" //#include "opcode/arc.h" #include "elf-bfd.h" #include "arc.h" diff --git a/libr/asm/arch/arc/gnu/arcompact-dis.c b/libr/asm/arch/arc/gnu/arcompact-dis.c index ebdedae5ea442..45f14a8e3ef73 100644 --- a/libr/asm/arch/arc/gnu/arcompact-dis.c +++ b/libr/asm/arch/arc/gnu/arcompact-dis.c @@ -25,7 +25,7 @@ #include #include -#include "dis-asm.h" +#include "disas-asm.h" #include "arc.h" #include "arc-ext.h" #include "arc-dis.h" diff --git a/libr/asm/arch/arm/aarch64/aarch64-dis.c b/libr/asm/arch/arm/aarch64/aarch64-dis.c index 13f01574f8d0d..b7ab2447113ad 100644 --- a/libr/asm/arch/arm/aarch64/aarch64-dis.c +++ b/libr/asm/arch/arm/aarch64/aarch64-dis.c @@ -19,7 +19,7 @@ see . */ #include "sysdep.h" -#include "dis-asm.h" +#include "disas-asm.h" #include "libiberty.h" #include "opintl.h" #include "aarch64-dis.h" diff --git a/libr/asm/arch/arm/gnu/arm-dis.c b/libr/asm/arch/arm/gnu/arm-dis.c index 425e23756e8fb..1cc0cad9c2e45 100644 --- a/libr/asm/arch/arm/gnu/arm-dis.c +++ b/libr/asm/arch/arm/gnu/arm-dis.c @@ -22,7 +22,7 @@ #include "sysdep.h" -#include "dis-asm.h" +#include "disas-asm.h" #include "opcode-arm.h" // #include "opcode/arm.h" #include "opintl.h" diff --git a/libr/asm/arch/cris/gnu/cris-dis.c b/libr/asm/arch/cris/gnu/cris-dis.c index f24811380f414..930872f9711a1 100644 --- a/libr/asm/arch/cris/gnu/cris-dis.c +++ b/libr/asm/arch/cris/gnu/cris-dis.c @@ -23,7 +23,7 @@ #include #include -#include "dis-asm.h" +#include "disas-asm.h" #include "sysdep.h" #include "opcode/cris.h" #include "libiberty.h" diff --git a/libr/asm/arch/hexagon/gnu/hexagon-dis.c b/libr/asm/arch/hexagon/gnu/hexagon-dis.c index a7ed76efc60ce..614b21b527a69 100644 --- a/libr/asm/arch/hexagon/gnu/hexagon-dis.c +++ b/libr/asm/arch/hexagon/gnu/hexagon-dis.c @@ -19,7 +19,7 @@ #include "ansidecl.h" #include "libiberty.h" -#include "dis-asm.h" +#include "disas-asm.h" #include "opcode/hexagon.h" #include "mybfd.h" //#include "elf/hexagon.h" diff --git a/libr/asm/arch/hppa/gnu/hppa-dis.c b/libr/asm/arch/hppa/gnu/hppa-dis.c index 90c5850f03463..e7974e1a27976 100644 --- a/libr/asm/arch/hppa/gnu/hppa-dis.c +++ b/libr/asm/arch/hppa/gnu/hppa-dis.c @@ -22,7 +22,7 @@ MA 02110-1301, USA. */ #include "sysdep.h" -#include "dis-asm.h" +#include "disas-asm.h" #include "libhppa.h" #include "opcode/hppa.h" #include diff --git a/libr/asm/arch/include/dis-asm.h b/libr/asm/arch/include/disas-asm.h similarity index 100% rename from libr/asm/arch/include/dis-asm.h rename to libr/asm/arch/include/disas-asm.h diff --git a/libr/asm/arch/lanai/gnu/lanai-dis.c b/libr/asm/arch/lanai/gnu/lanai-dis.c index 471d6562c1922..f2e8d5e4a4ab9 100644 --- a/libr/asm/arch/lanai/gnu/lanai-dis.c +++ b/libr/asm/arch/lanai/gnu/lanai-dis.c @@ -60,7 +60,7 @@ #include "ansidecl.h" #include "opcode/lanai.h" -#include "dis-asm.h" +#include "disas-asm.h" static char *reg_names[] = { "r0", "r1", "pc", "ps", "sp", "fp", "r6", "r7", diff --git a/libr/asm/arch/mips/gnu/mips-dis.c b/libr/asm/arch/mips/gnu/mips-dis.c index d0e3c7b97b838..e20732bef080e 100644 --- a/libr/asm/arch/mips/gnu/mips-dis.c +++ b/libr/asm/arch/mips/gnu/mips-dis.c @@ -26,7 +26,7 @@ #include #include "ansidecl.h" #include "sysdep.h" -#include "dis-asm.h" +#include "disas-asm.h" #include "libiberty.h" #include "elf/mips.h" #include "opintl.h" diff --git a/libr/asm/arch/nios/gnu/nios2-dis.c b/libr/asm/arch/nios/gnu/nios2-dis.c index 07c6aed588a09..e22f862844d23 100644 --- a/libr/asm/arch/nios/gnu/nios2-dis.c +++ b/libr/asm/arch/nios/gnu/nios2-dis.c @@ -21,7 +21,7 @@ MA 02110-1301, USA. */ #include "sysdep.h" -#include "dis-asm.h" +#include "disas-asm.h" #include "opcode/nios2.h" #include "libiberty.h" #include diff --git a/libr/asm/arch/ppc/gnu/ppc-dis.c b/libr/asm/arch/ppc/gnu/ppc-dis.c index e682f13fe667d..3836405a14c59 100644 --- a/libr/asm/arch/ppc/gnu/ppc-dis.c +++ b/libr/asm/arch/ppc/gnu/ppc-dis.c @@ -24,11 +24,11 @@ #include #include #include -#include +#include #include /* This file provides several disassembler functions, all of which use - the disassembler interface defined in dis-asm.h. Several functions + the disassembler interface defined in disas-asm.h. Several functions are provided because this file handles disassembly for the PowerPC in both big and little endian mode and also for the POWER (RS/6000) chip. */ diff --git a/libr/asm/arch/sh/gnu/sh-dis.c b/libr/asm/arch/sh/gnu/sh-dis.c index a318200457bc7..6a281ed32f498 100644 --- a/libr/asm/arch/sh/gnu/sh-dis.c +++ b/libr/asm/arch/sh/gnu/sh-dis.c @@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */ #define DEFINE_TABLE #include "sh-opc.h" -#include "dis-asm.h" +#include "disas-asm.h" #include "mybfd.h" #define LITTLE_BIT 2 diff --git a/libr/asm/arch/sparc/gnu/sparc-dis.c b/libr/asm/arch/sparc/gnu/sparc-dis.c index af5cd9b1d39fc..7127688ea7f07 100644 --- a/libr/asm/arch/sparc/gnu/sparc-dis.c +++ b/libr/asm/arch/sparc/gnu/sparc-dis.c @@ -28,7 +28,7 @@ #include "sysdep.h" #include "opcode/sparc.h" -#include "dis-asm.h" +#include "disas-asm.h" #ifndef _MSC_VER #include "libiberty.h" #else diff --git a/libr/asm/arch/tricore/gnu/cpu-tricore.c b/libr/asm/arch/tricore/gnu/cpu-tricore.c index 6369a5d3945c4..f9b5dfdb03366 100644 --- a/libr/asm/arch/tricore/gnu/cpu-tricore.c +++ b/libr/asm/arch/tricore/gnu/cpu-tricore.c @@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */ //#include "bfd.h" #include "sysdep.h" -#include "dis-asm.h" +#include "disas-asm.h" //#include "libbfd.h" #include "opcode/tricore.h" diff --git a/libr/asm/arch/tricore/gnu/tricore-dis.c b/libr/asm/arch/tricore/gnu/tricore-dis.c index ad9dfe91991d0..9a3b93818602a 100644 --- a/libr/asm/arch/tricore/gnu/tricore-dis.c +++ b/libr/asm/arch/tricore/gnu/tricore-dis.c @@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */ #include "ansidecl.h" #include "sysdep.h" #include "opcode/tricore.h" -#include "dis-asm.h" +#include "disas-asm.h" #ifndef _MSC_VER #include "libiberty.h" #else diff --git a/libr/asm/arch/vax/vax-dis.c b/libr/asm/arch/vax/vax-dis.c index cc2aec6dd9b09..d29298f10dfe5 100644 --- a/libr/asm/arch/vax/vax-dis.c +++ b/libr/asm/arch/vax/vax-dis.c @@ -26,7 +26,7 @@ #include #include #include "vax.h" -#include "dis-asm.h" +#include "disas-asm.h" static char *reg_names[] = { diff --git a/libr/asm/arch/xtensa/gnu/elf32-xtensa.c b/libr/asm/arch/xtensa/gnu/elf32-xtensa.c index b4e4ca2daee3a..6d253fb56fb90 100644 --- a/libr/asm/arch/xtensa/gnu/elf32-xtensa.c +++ b/libr/asm/arch/xtensa/gnu/elf32-xtensa.c @@ -19,7 +19,7 @@ 02110-1301, USA. */ #include "sysdep.h" -#include "dis-asm.h" +#include "disas-asm.h" #include #include #include diff --git a/libr/asm/arch/xtensa/gnu/xtensa-dis.c b/libr/asm/arch/xtensa/gnu/xtensa-dis.c index 5f9239a4c8be9..98ae6b2eb207b 100644 --- a/libr/asm/arch/xtensa/gnu/xtensa-dis.c +++ b/libr/asm/arch/xtensa/gnu/xtensa-dis.c @@ -27,7 +27,7 @@ #include "xtensa-isa.h" #include "ansidecl.h" #include -#include "dis-asm.h" +#include "disas-asm.h" #include "libiberty.h" diff --git a/libr/asm/arch/xtensa/gnu/xtensa-isa.c b/libr/asm/arch/xtensa/gnu/xtensa-isa.c index 24a0ee006076b..df04becec8a98 100644 --- a/libr/asm/arch/xtensa/gnu/xtensa-isa.c +++ b/libr/asm/arch/xtensa/gnu/xtensa-isa.c @@ -22,7 +22,7 @@ #include #include #include -#include "../../include/dis-asm.h" +#include "../../include/disas-asm.h" #include "../../include/sysdep.h" //#include "bfd.h" //#include "libbfd.h" diff --git a/libr/asm/p/asm_arc.c b/libr/asm/p/asm_arc.c index 7db31ed026220..7422c0f5fb5d2 100644 --- a/libr/asm/p/asm_arc.c +++ b/libr/asm/p/asm_arc.c @@ -7,7 +7,7 @@ #include #include #include -#include "dis-asm.h" +#include "disas-asm.h" #include /* extern */ diff --git a/libr/asm/p/asm_arm_gnu.c b/libr/asm/p/asm_arm_gnu.c index 4fdba38a25a8a..eecbd06dfd1f4 100644 --- a/libr/asm/p/asm_arm_gnu.c +++ b/libr/asm/p/asm_arm_gnu.c @@ -7,7 +7,7 @@ #include #include #include -#include "dis-asm.h" +#include "disas-asm.h" #include "../arch/arm/gnu/opcode-arm.h" #if 0 diff --git a/libr/asm/p/asm_cris_gnu.c b/libr/asm/p/asm_cris_gnu.c index 436a81d11f81a..46e3686c9a3ee 100644 --- a/libr/asm/p/asm_cris_gnu.c +++ b/libr/asm/p/asm_cris_gnu.c @@ -18,7 +18,7 @@ Documentation #include #include -#include "dis-asm.h" +#include "disas-asm.h" static unsigned long Offset = 0; diff --git a/libr/asm/p/asm_hexagon_gnu.c b/libr/asm/p/asm_hexagon_gnu.c index db04879ce32fa..2df34fad54eda 100644 --- a/libr/asm/p/asm_hexagon_gnu.c +++ b/libr/asm/p/asm_hexagon_gnu.c @@ -7,7 +7,7 @@ #include #include #include -#include "dis-asm.h" +#include "disas-asm.h" #include disassembler_ftype diff --git a/libr/asm/p/asm_hppa_gnu.c b/libr/asm/p/asm_hppa_gnu.c index 08fc847de0da9..bbdfafd7529aa 100644 --- a/libr/asm/p/asm_hppa_gnu.c +++ b/libr/asm/p/asm_hppa_gnu.c @@ -9,7 +9,7 @@ #include #include -#include "dis-asm.h" +#include "disas-asm.h" static unsigned long Offset = 0; diff --git a/libr/asm/p/asm_lanai_gnu.c b/libr/asm/p/asm_lanai_gnu.c index 88d980e0e9928..db2784da88ade 100644 --- a/libr/asm/p/asm_lanai_gnu.c +++ b/libr/asm/p/asm_lanai_gnu.c @@ -9,7 +9,7 @@ #include #include -#include "dis-asm.h" +#include "disas-asm.h" static unsigned long Offset = 0; diff --git a/libr/asm/p/asm_mips_gnu.c b/libr/asm/p/asm_mips_gnu.c index 20f5e5c69bd1d..52e1f5e2d1e52 100644 --- a/libr/asm/p/asm_mips_gnu.c +++ b/libr/asm/p/asm_mips_gnu.c @@ -9,7 +9,7 @@ #include #include -#include "dis-asm.h" +#include "disas-asm.h" #include "opcode/mips.h" int mips_assemble(const char *str, ut64 pc, ut8 *out); diff --git a/libr/asm/p/asm_nios2.c b/libr/asm/p/asm_nios2.c index 2617e598d432b..4b747be776459 100644 --- a/libr/asm/p/asm_nios2.c +++ b/libr/asm/p/asm_nios2.c @@ -9,7 +9,7 @@ #include #include -#include "dis-asm.h" +#include "disas-asm.h" int print_insn_big_nios2 (bfd_vma address, disassemble_info *info); diff --git a/libr/asm/p/asm_ppc_gnu.c b/libr/asm/p/asm_ppc_gnu.c index 6c8ebb2371af7..935a3b069677e 100644 --- a/libr/asm/p/asm_ppc_gnu.c +++ b/libr/asm/p/asm_ppc_gnu.c @@ -9,7 +9,7 @@ #include #include -#include "dis-asm.h" +#include "disas-asm.h" static unsigned long Offset = 0; diff --git a/libr/asm/p/asm_sh.c b/libr/asm/p/asm_sh.c index 5a5c731e172f1..7996050e7347d 100644 --- a/libr/asm/p/asm_sh.c +++ b/libr/asm/p/asm_sh.c @@ -7,7 +7,7 @@ #include #include #include -#include "dis-asm.h" +#include "disas-asm.h" static unsigned long Offset = 0; static char *buf_global = NULL; diff --git a/libr/asm/p/asm_sparc_gnu.c b/libr/asm/p/asm_sparc_gnu.c index 3d761c6440c48..6d701af60c3ff 100644 --- a/libr/asm/p/asm_sparc_gnu.c +++ b/libr/asm/p/asm_sparc_gnu.c @@ -7,7 +7,7 @@ #include #include #include -#include "dis-asm.h" +#include "disas-asm.h" #include static unsigned long Offset = 0; diff --git a/libr/asm/p/asm_tricore.c b/libr/asm/p/asm_tricore.c index e65f14a3f87b9..0a5b15cd75e52 100644 --- a/libr/asm/p/asm_tricore.c +++ b/libr/asm/p/asm_tricore.c @@ -9,7 +9,7 @@ #include #include -#include "dis-asm.h" +#include "disas-asm.h" static unsigned long Offset = 0; diff --git a/libr/asm/p/asm_vax.c b/libr/asm/p/asm_vax.c index aacac3ab3e8e7..549db8bb32c1b 100644 --- a/libr/asm/p/asm_vax.c +++ b/libr/asm/p/asm_vax.c @@ -11,7 +11,7 @@ #include #include -#include "dis-asm.h" +#include "disas-asm.h" #include "../arch/vax/vax.h" static unsigned long Offset = 0; diff --git a/libr/asm/p/asm_xtensa.c b/libr/asm/p/asm_xtensa.c index 46587669074f3..fb2eb424462a6 100644 --- a/libr/asm/p/asm_xtensa.c +++ b/libr/asm/p/asm_xtensa.c @@ -9,7 +9,7 @@ #include #include -#include "dis-asm.h" +#include "disas-asm.h" #define INSN_BUFFER_SIZE 4