X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=opcodes%2Fdisassemble.c;h=70ee65a1abb0f704898998e4c6792d2748144dd8;hb=fbc2255575afc0d332b28fd4991235e020cda667;hp=3dad64bc3c49c9fc454f2fe895e5b2401b85a413;hpb=6927f98292aaa6f7fcb3152d5d902758538e626c;p=deliverable%2Fbinutils-gdb.git diff --git a/opcodes/disassemble.c b/opcodes/disassemble.c index 3dad64bc3c..70ee65a1ab 100644 --- a/opcodes/disassemble.c +++ b/opcodes/disassemble.c @@ -1,7 +1,5 @@ /* Select disassembly routine for specified architecture. - Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, - 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 - Free Software Foundation, Inc. + Copyright (C) 1994-2017 Free Software Foundation, Inc. This file is part of the GNU opcodes library. @@ -21,9 +19,12 @@ MA 02110-1301, USA. */ #include "sysdep.h" -#include "dis-asm.h" +#include "disassemble.h" +#include "safe-ctype.h" +#include #ifdef ARCH_all +#define ARCH_aarch64 #define ARCH_alpha #define ARCH_arc #define ARCH_arm @@ -38,6 +39,7 @@ #define ARCH_epiphany #define ARCH_fr30 #define ARCH_frv +#define ARCH_ft32 #define ARCH_h8300 #define ARCH_h8500 #define ARCH_hppa @@ -57,6 +59,7 @@ #define ARCH_m88k #define ARCH_mcore #define ARCH_mep +#define ARCH_metag #define ARCH_microblaze #define ARCH_mips #define ARCH_mmix @@ -65,12 +68,14 @@ #define ARCH_moxie #define ARCH_mt #define ARCH_msp430 +#define ARCH_nds32 +#define ARCH_nios2 #define ARCH_ns32k -#define ARCH_openrisc -#define ARCH_or32 +#define ARCH_or1k #define ARCH_pdp11 #define ARCH_pj #define ARCH_powerpc +#define ARCH_pru #define ARCH_rs6000 #define ARCH_rl78 #define ARCH_rx @@ -88,7 +93,9 @@ #define ARCH_tilepro #define ARCH_v850 #define ARCH_vax +#define ARCH_visium #define ARCH_w65 +#define ARCH_wasm32 #define ARCH_xstormy16 #define ARCH_xc16x #define ARCH_xgate @@ -103,16 +110,22 @@ #endif disassembler_ftype -disassembler (abfd) - bfd *abfd; +disassembler (enum bfd_architecture a, + bfd_boolean big ATTRIBUTE_UNUSED, + unsigned long mach ATTRIBUTE_UNUSED, + bfd *abfd ATTRIBUTE_UNUSED) { - enum bfd_architecture a = bfd_get_arch (abfd); disassembler_ftype disassemble; switch (a) { /* If you add a case to this table, also add it to the ARCH_all definition right above this function. */ +#ifdef ARCH_aarch64 + case bfd_arch_aarch64: + disassemble = print_insn_aarch64; + break; +#endif #ifdef ARCH_alpha case bfd_arch_alpha: disassemble = print_insn_alpha; @@ -125,7 +138,7 @@ disassembler (abfd) #endif #ifdef ARCH_arm case bfd_arch_arm: - if (bfd_big_endian (abfd)) + if (big) disassemble = print_insn_big_arm; else disassemble = print_insn_little_arm; @@ -174,13 +187,12 @@ disassembler (abfd) #endif #ifdef ARCH_h8300 case bfd_arch_h8300: - if (bfd_get_mach (abfd) == bfd_mach_h8300h - || bfd_get_mach (abfd) == bfd_mach_h8300hn) + if (mach == bfd_mach_h8300h || mach == bfd_mach_h8300hn) disassemble = print_insn_h8300h; - else if (bfd_get_mach (abfd) == bfd_mach_h8300s - || bfd_get_mach (abfd) == bfd_mach_h8300sn - || bfd_get_mach (abfd) == bfd_mach_h8300sx - || bfd_get_mach (abfd) == bfd_mach_h8300sxn) + else if (mach == bfd_mach_h8300s + || mach == bfd_mach_h8300sn + || mach == bfd_mach_h8300sx + || mach == bfd_mach_h8300sxn) disassemble = print_insn_h8300s; else disassemble = print_insn_h8300; @@ -203,6 +215,7 @@ disassembler (abfd) #endif #ifdef ARCH_i386 case bfd_arch_i386: + case bfd_arch_iamcu: case bfd_arch_l1om: case bfd_arch_k1om: disassemble = print_insn_i386; @@ -288,6 +301,11 @@ disassembler (abfd) disassemble = print_insn_msp430; break; #endif +#ifdef ARCH_nds32 + case bfd_arch_nds32: + disassemble = print_insn_nds32; + break; +#endif #ifdef ARCH_ns32k case bfd_arch_ns32k: disassemble = print_insn_ns32k; @@ -303,9 +321,14 @@ disassembler (abfd) disassemble = print_insn_mep; break; #endif +#ifdef ARCH_metag + case bfd_arch_metag: + disassemble = print_insn_metag; + break; +#endif #ifdef ARCH_mips case bfd_arch_mips: - if (bfd_big_endian (abfd)) + if (big) disassemble = print_insn_big_mips; else disassemble = print_insn_little_mips; @@ -326,17 +349,17 @@ disassembler (abfd) disassemble = print_insn_mn10300; break; #endif -#ifdef ARCH_openrisc - case bfd_arch_openrisc: - disassemble = print_insn_openrisc; +#ifdef ARCH_nios2 + case bfd_arch_nios2: + if (big) + disassemble = print_insn_big_nios2; + else + disassemble = print_insn_little_nios2; break; #endif -#ifdef ARCH_or32 - case bfd_arch_or32: - if (bfd_big_endian (abfd)) - disassemble = print_insn_big_or32; - else - disassemble = print_insn_little_or32; +#ifdef ARCH_or1k + case bfd_arch_or1k: + disassemble = print_insn_or1k; break; #endif #ifdef ARCH_pdp11 @@ -351,15 +374,25 @@ disassembler (abfd) #endif #ifdef ARCH_powerpc case bfd_arch_powerpc: - if (bfd_big_endian (abfd)) + if (big) disassemble = print_insn_big_powerpc; else disassemble = print_insn_little_powerpc; break; #endif +#ifdef ARCH_pru + case bfd_arch_pru: + disassemble = print_insn_pru; + break; +#endif +#ifdef ARCH_riscv + case bfd_arch_riscv: + disassemble = print_insn_riscv; + break; +#endif #ifdef ARCH_rs6000 case bfd_arch_rs6000: - if (bfd_get_mach (abfd) == bfd_mach_ppc_620) + if (mach == bfd_mach_ppc_620) disassemble = print_insn_big_powerpc; else disassemble = print_insn_rs6000; @@ -367,7 +400,7 @@ disassembler (abfd) #endif #ifdef ARCH_rl78 case bfd_arch_rl78: - disassemble = print_insn_rl78; + disassemble = rl78_get_disassembler (abfd); break; #endif #ifdef ARCH_rx @@ -382,7 +415,7 @@ disassembler (abfd) #endif #ifdef ARCH_score case bfd_arch_score: - if (bfd_big_endian (abfd)) + if (big) disassemble = print_insn_big_score; else disassemble = print_insn_little_score; @@ -428,8 +461,14 @@ disassembler (abfd) disassemble = print_insn_tic80; break; #endif +#ifdef ARCH_ft32 + case bfd_arch_ft32: + disassemble = print_insn_ft32; + break; +#endif #ifdef ARCH_v850 case bfd_arch_v850: + case bfd_arch_v850_rh850: disassemble = print_insn_v850; break; #endif @@ -438,6 +477,11 @@ disassembler (abfd) disassemble = print_insn_w65; break; #endif +#ifdef ARCH_wasm32 + case bfd_arch_wasm32: + disassemble = print_insn_wasm32; + break; +#endif #ifdef ARCH_xgate case bfd_arch_xgate: disassemble = print_insn_xgate; @@ -465,7 +509,7 @@ disassembler (abfd) #endif #ifdef ARCH_z8k case bfd_arch_z8k: - if (bfd_get_mach(abfd) == bfd_mach_z8001) + if (mach == bfd_mach_z8001) disassemble = print_insn_z8001; else disassemble = print_insn_z8002; @@ -476,6 +520,11 @@ disassembler (abfd) disassemble = print_insn_vax; break; #endif +#ifdef ARCH_visium + case bfd_arch_visium: + disassemble = print_insn_visium; + break; +#endif #ifdef ARCH_frv case bfd_arch_frv: disassemble = print_insn_frv; @@ -513,9 +562,14 @@ disassembler (abfd) } void -disassembler_usage (stream) - FILE * stream ATTRIBUTE_UNUSED; +disassembler_usage (FILE *stream ATTRIBUTE_UNUSED) { +#ifdef ARCH_aarch64 + print_aarch64_disassembler_options (stream); +#endif +#ifdef ARCH_arc + print_arc_disassembler_options (stream); +#endif #ifdef ARCH_arm print_arm_disassembler_options (stream); #endif @@ -525,12 +579,18 @@ disassembler_usage (stream) #ifdef ARCH_powerpc print_ppc_disassembler_options (stream); #endif +#ifdef ARCH_riscv + print_riscv_disassembler_options (stream); +#endif #ifdef ARCH_i386 print_i386_disassembler_options (stream); #endif #ifdef ARCH_s390 print_s390_disassembler_options (stream); #endif +#ifdef ARCH_wasm32 + print_wasm32_disassembler_options (stream); +#endif return; } @@ -543,6 +603,12 @@ disassemble_init_for_target (struct disassemble_info * info) switch (info->arch) { +#ifdef ARCH_aarch64 + case bfd_arch_aarch64: + info->symbol_is_valid = aarch64_symbol_is_valid; + info->disassembler_needs_relocs = TRUE; + break; +#endif #ifdef ARCH_arm case bfd_arch_arm: info->symbol_is_valid = arm_symbol_is_valid; @@ -565,6 +631,11 @@ disassemble_init_for_target (struct disassemble_info * info) info->skip_zeroes_at_end = 0; break; #endif +#ifdef ARCH_metag + case bfd_arch_metag: + info->disassembler_needs_relocs = TRUE; + break; +#endif #ifdef ARCH_m32c case bfd_arch_m32c: /* This processor in fact is little endian. The value set here @@ -580,6 +651,11 @@ disassemble_init_for_target (struct disassemble_info * info) } break; #endif +#ifdef ARCH_pru + case bfd_arch_pru: + info->disassembler_needs_relocs = TRUE; + break; +#endif #ifdef ARCH_powerpc case bfd_arch_powerpc: #endif @@ -589,8 +665,82 @@ disassemble_init_for_target (struct disassemble_info * info) #if defined (ARCH_powerpc) || defined (ARCH_rs6000) disassemble_init_powerpc (info); break; +#endif +#ifdef ARCH_wasm32 + case bfd_arch_wasm32: + disassemble_init_wasm32 (info); + break; +#endif +#ifdef ARCH_s390 + case bfd_arch_s390: + disassemble_init_s390 (info); + break; #endif default: break; } } + +/* Remove whitespace and consecutive commas from OPTIONS. */ + +char * +remove_whitespace_and_extra_commas (char *options) +{ + char *str; + size_t i, len; + + if (options == NULL) + return NULL; + + /* Strip off all trailing whitespace and commas. */ + for (len = strlen (options); len > 0; len--) + { + if (!ISSPACE (options[len - 1]) && options[len - 1] != ',') + break; + options[len - 1] = '\0'; + } + + /* Convert all remaining whitespace to commas. */ + for (i = 0; options[i] != '\0'; i++) + if (ISSPACE (options[i])) + options[i] = ','; + + /* Remove consecutive commas. */ + for (str = options; *str != '\0'; str++) + if (*str == ',' && (*(str + 1) == ',' || str == options)) + { + char *next = str + 1; + while (*next == ',') + next++; + len = strlen (next); + if (str != options) + str++; + memmove (str, next, len); + next[len - (size_t)(next - str)] = '\0'; + } + return (strlen (options) != 0) ? options : NULL; +} + +/* Like STRCMP, but treat ',' the same as '\0' so that we match + strings like "foobar" against "foobar,xxyyzz,...". */ + +int +disassembler_options_cmp (const char *s1, const char *s2) +{ + unsigned char c1, c2; + + do + { + c1 = (unsigned char) *s1++; + if (c1 == ',') + c1 = '\0'; + c2 = (unsigned char) *s2++; + if (c2 == ',') + c2 = '\0'; + if (c1 == '\0') + return c1 - c2; + } + while (c1 == c2); + + return c1 - c2; +}