Change proposal to avoid collision wirth gdb header.

radareorg · Aug 4, 2018 · f4005b8 · f4005b8
1 parent c076e12
commit f4005b8
Show file tree

Hide file tree

Showing 34 changed files with 34 additions and 34 deletions.
diff --git 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
@@ -25,7 +25,7 @@
 #include <ansidecl.h>
 #include <string.h>
 
-#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
@@ -19,7 +19,7 @@
    see <http://www.gnu.org/licenses/>.  */
 
 #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
@@ -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
@@ -23,7 +23,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#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
@@ -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
@@ -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 <string.h>

diff --git a/libr/asm/arch/include/dis-asm.h → libr/asm/arch/include/disas-asm.h b/libr/asm/arch/include/dis-asm.h → 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
@@ -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
@@ -26,7 +26,7 @@
 #include <stdlib.h>
 #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
@@ -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 <string.h>

diff --git a/libr/asm/arch/ppc/gnu/ppc-dis.c b/libr/asm/arch/ppc/gnu/ppc-dis.c
@@ -24,11 +24,11 @@
 #include <string.h>
 #include <stdlib.h>
 #include <sysdep.h>
-#include <dis-asm.h>
+#include <disas-asm.h>
 #include <opcode/ppc.h>
 
 /* 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -26,7 +26,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #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
@@ -19,7 +19,7 @@
    02110-1301, USA.  */
 
 #include "sysdep.h"
-#include "dis-asm.h"
+#include "disas-asm.h"
 #include <stdio.h>
 #include <stdarg.h>
 #include <string.h>

diff --git 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 <setjmp.h>
-#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
@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#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
@@ -7,7 +7,7 @@
 #include <r_lib.h>
 #include <r_util.h>
 #include <r_asm.h>
-#include "dis-asm.h"
+#include "disas-asm.h"
 #include <mybfd.h>
 
 /* extern */

diff --git a/libr/asm/p/asm_arm_gnu.c b/libr/asm/p/asm_arm_gnu.c
@@ -7,7 +7,7 @@
 #include <r_util.h>
 #include <r_lib.h>
 #include <r_asm.h>
-#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
@@ -18,7 +18,7 @@ Documentation
 #include <r_util.h>
 #include <r_asm.h>
 
-#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
@@ -7,7 +7,7 @@
 #include <r_lib.h>
 #include <r_util.h>
 #include <r_asm.h>
-#include "dis-asm.h"
+#include "disas-asm.h"
 #include <mybfd.h>
 
 disassembler_ftype

diff --git a/libr/asm/p/asm_hppa_gnu.c b/libr/asm/p/asm_hppa_gnu.c
@@ -9,7 +9,7 @@
 #include <r_util.h>
 #include <r_asm.h>
 
-#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
@@ -9,7 +9,7 @@
 #include <r_util.h>
 #include <r_asm.h>
 
-#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
@@ -9,7 +9,7 @@
 #include <r_util.h>
 #include <r_asm.h>
 
-#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
@@ -9,7 +9,7 @@
 #include <r_util.h>
 #include <r_asm.h>
 
-#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
@@ -9,7 +9,7 @@
 #include <r_util.h>
 #include <r_asm.h>
 
-#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
@@ -7,7 +7,7 @@
 #include <r_lib.h>
 #include <r_util.h>
 #include <r_asm.h>
-#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
@@ -7,7 +7,7 @@
 #include <r_lib.h>
 #include <r_util.h>
 #include <r_asm.h>
-#include "dis-asm.h"
+#include "disas-asm.h"
 #include <mybfd.h>
 
 static unsigned long Offset = 0;

diff --git a/libr/asm/p/asm_tricore.c b/libr/asm/p/asm_tricore.c
@@ -9,7 +9,7 @@
 #include <r_util.h>
 #include <r_asm.h>
 
-#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
@@ -11,7 +11,7 @@
 #include <r_lib.h>
 #include <r_asm.h>
 
-#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
@@ -9,7 +9,7 @@
 #include <r_util.h>
 #include <r_asm.h>
 
-#include "dis-asm.h"
+#include "disas-asm.h"
 
 #define INSN_BUFFER_SIZE 4