X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=opcodes%2Fdisassemble.c;h=d49a2b857df063b1100f1989ae85ebc57b994afa;hb=b4a983cb93fa80d1653194e0a58231327c7d8cd3;hp=eef06584f43cb4cc78776a0282eaab9172317c83;hpb=65b48a81404cb058c75c562f7dfdeb74f07eba72;p=deliverable%2Fbinutils-gdb.git diff --git a/opcodes/disassemble.c b/opcodes/disassemble.c index eef06584f4..d49a2b857d 100644 --- a/opcodes/disassemble.c +++ b/opcodes/disassemble.c @@ -1,5 +1,5 @@ /* Select disassembly routine for specified architecture. - Copyright (C) 1994-2017 Free Software Foundation, Inc. + Copyright (C) 1994-2020 Free Software Foundation, Inc. This file is part of the GNU opcodes library. @@ -19,8 +19,9 @@ 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 @@ -32,20 +33,18 @@ #define ARCH_cr16 #define ARCH_cris #define ARCH_crx +#define ARCH_csky #define ARCH_d10v #define ARCH_d30v #define ARCH_dlx +#define ARCH_bpf #define ARCH_epiphany #define ARCH_fr30 #define ARCH_frv #define ARCH_ft32 #define ARCH_h8300 -#define ARCH_h8500 #define ARCH_hppa -#define ARCH_i370 #define ARCH_i386 -#define ARCH_i860 -#define ARCH_i960 #define ARCH_ia64 #define ARCH_ip2k #define ARCH_iq2000 @@ -55,7 +54,6 @@ #define ARCH_m68hc11 #define ARCH_m68hc12 #define ARCH_m68k -#define ARCH_m88k #define ARCH_mcore #define ARCH_mep #define ARCH_metag @@ -68,6 +66,7 @@ #define ARCH_mt #define ARCH_msp430 #define ARCH_nds32 +#define ARCH_nfp #define ARCH_nios2 #define ARCH_ns32k #define ARCH_or1k @@ -75,9 +74,11 @@ #define ARCH_pj #define ARCH_powerpc #define ARCH_pru +#define ARCH_riscv #define ARCH_rs6000 #define ARCH_rl78 #define ARCH_rx +#define ARCH_s12z #define ARCH_s390 #define ARCH_score #define ARCH_sh @@ -87,30 +88,47 @@ #define ARCH_tic4x #define ARCH_tic54x #define ARCH_tic6x -#define ARCH_tic80 #define ARCH_tilegx #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 #define ARCH_xtensa #define ARCH_z80 #define ARCH_z8k -#define INCLUDE_SHMEDIA #endif #ifdef ARCH_m32c #include "m32c-desc.h" #endif +#ifdef ARCH_bpf +/* XXX this should be including bpf-desc.h instead of this hackery, + but at the moment it is not possible to include several CGEN + generated *-desc.h files simultaneously. To be fixed in + CGEN... */ + +# ifdef ARCH_m32c +enum epbf_isa_attr +{ + ISA_EBPFLE, ISA_EBPFBE, ISA_EBPFMAX +}; +# else +# include "bpf-desc.h" +# define ISA_EBPFMAX ISA_MAX +# endif +#endif /* ARCH_bpf */ + disassembler_ftype -disassembler (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) @@ -134,7 +152,7 @@ disassembler (bfd *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; @@ -165,6 +183,12 @@ disassembler (bfd *abfd) disassemble = print_insn_crx; break; #endif +#ifdef ARCH_csky + case bfd_arch_csky: + disassemble = csky_get_disassembler (abfd); + break; +#endif + #ifdef ARCH_d10v case bfd_arch_d10v: disassemble = print_insn_d10v; @@ -183,33 +207,22 @@ disassembler (bfd *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; break; #endif -#ifdef ARCH_h8500 - case bfd_arch_h8500: - disassemble = print_insn_h8500; - break; -#endif #ifdef ARCH_hppa case bfd_arch_hppa: disassemble = print_insn_hppa; break; #endif -#ifdef ARCH_i370 - case bfd_arch_i370: - disassemble = print_insn_i370; - break; -#endif #ifdef ARCH_i386 case bfd_arch_i386: case bfd_arch_iamcu: @@ -218,16 +231,6 @@ disassembler (bfd *abfd) disassemble = print_insn_i386; break; #endif -#ifdef ARCH_i860 - case bfd_arch_i860: - disassemble = print_insn_i860; - break; -#endif -#ifdef ARCH_i960 - case bfd_arch_i960: - disassemble = print_insn_i960; - break; -#endif #ifdef ARCH_ia64 case bfd_arch_ia64: disassemble = print_insn_ia64; @@ -238,6 +241,11 @@ disassembler (bfd *abfd) disassemble = print_insn_ip2k; break; #endif +#ifdef ARCH_bpf + case bfd_arch_bpf: + disassemble = print_insn_bpf; + break; +#endif #ifdef ARCH_epiphany case bfd_arch_epiphany: disassemble = print_insn_epiphany; @@ -273,16 +281,16 @@ disassembler (bfd *abfd) disassemble = print_insn_m9s12xg; break; #endif +#if defined(ARCH_s12z) + case bfd_arch_s12z: + disassemble = print_insn_s12z; + break; +#endif #ifdef ARCH_m68k case bfd_arch_m68k: disassemble = print_insn_m68k; break; #endif -#ifdef ARCH_m88k - case bfd_arch_m88k: - disassemble = print_insn_m88k; - break; -#endif #ifdef ARCH_mt case bfd_arch_mt: disassemble = print_insn_mt; @@ -303,6 +311,11 @@ disassembler (bfd *abfd) disassemble = print_insn_nds32; break; #endif +#ifdef ARCH_nfp + case bfd_arch_nfp: + disassemble = print_insn_nfp; + break; +#endif #ifdef ARCH_ns32k case bfd_arch_ns32k: disassemble = print_insn_ns32k; @@ -325,7 +338,7 @@ disassembler (bfd *abfd) #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; @@ -348,7 +361,7 @@ disassembler (bfd *abfd) #endif #ifdef ARCH_nios2 case bfd_arch_nios2: - if (bfd_big_endian (abfd)) + if (big) disassemble = print_insn_big_nios2; else disassemble = print_insn_little_nios2; @@ -371,7 +384,12 @@ disassembler (bfd *abfd) #endif #ifdef ARCH_powerpc case bfd_arch_powerpc: - if (bfd_big_endian (abfd)) +#endif +#ifdef ARCH_rs6000 + case bfd_arch_rs6000: +#endif +#if defined ARCH_powerpc || defined ARCH_rs6000 + if (big) disassemble = print_insn_big_powerpc; else disassemble = print_insn_little_powerpc; @@ -387,14 +405,6 @@ disassembler (bfd *abfd) disassemble = print_insn_riscv; break; #endif -#ifdef ARCH_rs6000 - case bfd_arch_rs6000: - if (bfd_get_mach (abfd) == bfd_mach_ppc_620) - disassemble = print_insn_big_powerpc; - else - disassemble = print_insn_rs6000; - break; -#endif #ifdef ARCH_rl78 case bfd_arch_rl78: disassemble = rl78_get_disassembler (abfd); @@ -412,7 +422,7 @@ disassembler (bfd *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; @@ -453,11 +463,6 @@ disassembler (bfd *abfd) disassemble = print_insn_tic6x; break; #endif -#ifdef ARCH_tic80 - case bfd_arch_tic80: - disassemble = print_insn_tic80; - break; -#endif #ifdef ARCH_ft32 case bfd_arch_ft32: disassemble = print_insn_ft32; @@ -469,9 +474,9 @@ disassembler (bfd *abfd) disassemble = print_insn_v850; break; #endif -#ifdef ARCH_w65 - case bfd_arch_w65: - disassemble = print_insn_w65; +#ifdef ARCH_wasm32 + case bfd_arch_wasm32: + disassemble = print_insn_wasm32; break; #endif #ifdef ARCH_xgate @@ -501,7 +506,7 @@ disassembler (bfd *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; @@ -568,6 +573,9 @@ disassembler_usage (FILE *stream ATTRIBUTE_UNUSED) #ifdef ARCH_mips print_mips_disassembler_options (stream); #endif +#ifdef ARCH_nfp + print_nfp_disassembler_options (stream); +#endif #ifdef ARCH_powerpc print_ppc_disassembler_options (stream); #endif @@ -580,6 +588,9 @@ disassembler_usage (FILE *stream ATTRIBUTE_UNUSED) #ifdef ARCH_s390 print_s390_disassembler_options (stream); #endif +#ifdef ARCH_wasm32 + print_wasm32_disassembler_options (stream); +#endif return; } @@ -604,6 +615,13 @@ disassemble_init_for_target (struct disassemble_info * info) info->disassembler_needs_relocs = TRUE; break; #endif +#ifdef ARCH_csky + case bfd_arch_csky: + info->symbol_is_valid = csky_symbol_is_valid; + info->disassembler_needs_relocs = TRUE; + break; +#endif + #ifdef ARCH_ia64 case bfd_arch_ia64: info->skip_zeroes = 16; @@ -630,16 +648,33 @@ disassemble_init_for_target (struct disassemble_info * info) /* This processor in fact is little endian. The value set here reflects the way opcodes are written in the cgen description. */ info->endian = BFD_ENDIAN_BIG; - if (! info->insn_sets) + if (!info->private_data) { - info->insn_sets = cgen_bitset_create (ISA_MAX); + info->private_data = cgen_bitset_create (ISA_MAX); if (info->mach == bfd_mach_m16c) - cgen_bitset_set (info->insn_sets, ISA_M16C); + cgen_bitset_set (info->private_data, ISA_M16C); else - cgen_bitset_set (info->insn_sets, ISA_M32C); + cgen_bitset_set (info->private_data, ISA_M32C); } break; #endif +#ifdef ARCH_bpf + case bfd_arch_bpf: + if (!info->private_data) + { + info->private_data = cgen_bitset_create (ISA_EBPFMAX); + if (info->endian == BFD_ENDIAN_BIG) + cgen_bitset_set (info->private_data, ISA_EBPFBE); + else + cgen_bitset_set (info->private_data, ISA_EBPFLE); + } + break; +#endif +#ifdef ARCH_pru + case bfd_arch_pru: + info->disassembler_needs_relocs = TRUE; + break; +#endif #ifdef ARCH_powerpc case bfd_arch_powerpc: #endif @@ -650,16 +685,90 @@ disassemble_init_for_target (struct disassemble_info * info) disassemble_init_powerpc (info); break; #endif +#ifdef ARCH_riscv + case bfd_arch_riscv: + info->symbol_is_valid = riscv_symbol_is_valid; + 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 +#ifdef ARCH_nds32 + case bfd_arch_nds32: + disassemble_init_nds32 (info); + break; + #endif default: break; } } +void +disassemble_free_target (struct disassemble_info *info) +{ + if (info == NULL) + return; + + switch (info->arch) + { + default: + return; + +#ifdef ARCH_bpf + case bfd_arch_bpf: +#endif +#ifdef ARCH_m32c + case bfd_arch_m32c: +#endif +#if defined ARCH_bpf || defined ARCH_m32c + if (info->private_data) + { + CGEN_BITSET *mask = info->private_data; + free (mask->bits); + } + break; +#endif + +#ifdef ARCH_arc + case bfd_arch_arc: + break; +#endif +#ifdef ARCH_cris + case bfd_arch_cris: + break; +#endif +#ifdef ARCH_mmix + case bfd_arch_mmix: + break; +#endif +#ifdef ARCH_nfp + case bfd_arch_nfp: + break; +#endif +#ifdef ARCH_powerpc + case bfd_arch_powerpc: + break; +#endif +#ifdef ARCH_riscv + case bfd_arch_riscv: + break; +#endif +#ifdef ARCH_rs6000 + case bfd_arch_rs6000: + break; +#endif + } + + free (info->private_data); +} + /* Remove whitespace and consecutive commas from OPTIONS. */ char *