From 103ebbc35cc1975442e1e6233207d8d7b2016556 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Mon, 9 Dec 2019 22:46:26 +1030 Subject: [PATCH] Use disassemble_info.private_data in place of insn_sets No cgen target uses private_data. This patch removes a disassemble_info field that is only used by cgen, and instead uses private_data. It also removes a macro that is no longer used. include/ * dis-asm.h (struct disassemble_info): Delete insn_sets. (INIT_DISASSEMBLE_INFO_NO_ARCH): Don't define. opcodes/ * cgen-dis.in (print_insn_@arch@): Replace insn_sets with private_data. * disassemble.c (disassemble_init_for_target): Likewise. * bpf-dis.c: Regenerate. * epiphany-dis.c: Regenerate. * fr30-dis.c: Regenerate. * frv-dis.c: Regenerate. * ip2k-dis.c: Regenerate. * iq2000-dis.c: Regenerate. * lm32-dis.c: Regenerate. * m32c-dis.c: Regenerate. * m32r-dis.c: Regenerate. * mep-dis.c: Regenerate. * mt-dis.c: Regenerate. * or1k-dis.c: Regenerate. * xc16x-dis.c: Regenerate. * xstormy16-dis.c: Regenerate. --- include/ChangeLog | 5 +++++ include/dis-asm.h | 8 -------- opcodes/ChangeLog | 19 +++++++++++++++++++ opcodes/bpf-dis.c | 2 +- opcodes/cgen-dis.in | 2 +- opcodes/disassemble.c | 24 ++++++++++++------------ opcodes/epiphany-dis.c | 2 +- opcodes/fr30-dis.c | 2 +- opcodes/frv-dis.c | 2 +- opcodes/ip2k-dis.c | 2 +- opcodes/iq2000-dis.c | 2 +- opcodes/lm32-dis.c | 2 +- opcodes/m32c-dis.c | 2 +- opcodes/m32r-dis.c | 2 +- opcodes/mep-dis.c | 2 +- opcodes/mt-dis.c | 2 +- opcodes/or1k-dis.c | 2 +- opcodes/xc16x-dis.c | 2 +- opcodes/xstormy16-dis.c | 2 +- 19 files changed, 51 insertions(+), 35 deletions(-) diff --git a/include/ChangeLog b/include/ChangeLog index 42aa17d1dba..7c4fcb82e2d 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,8 @@ +2019-12-10 Alan Modra + + * dis-asm.h (struct disassemble_info): Delete insn_sets. + (INIT_DISASSEMBLE_INFO_NO_ARCH): Don't define. + 2019-12-05 Jan Beulich * opcode/aarch64.h (AARCH64_FEATURE_CRYPTO): Expand to the diff --git a/include/dis-asm.h b/include/dis-asm.h index b4d5025811f..c1746502ca2 100644 --- a/include/dis-asm.h +++ b/include/dis-asm.h @@ -78,11 +78,6 @@ typedef struct disassemble_info enum bfd_endian endian; /* Endianness of code, for mixed-endian situations such as ARM BE8. */ enum bfd_endian endian_code; - /* An arch/mach-specific bitmask of selected instruction subsets, mainly - for processors with run-time-switchable instruction sets. The default, - zero, means that there is no constraint. CGEN-based opcodes ports - may use ISA_foo masks. */ - void *insn_sets; /* Some targets need information about the current section to accurately display insns. If this is NULL, the target disassembler function @@ -394,9 +389,6 @@ extern void init_disassemble_info (struct disassemble_info *dinfo, void *stream, /* For compatibility with existing code. */ #define INIT_DISASSEMBLE_INFO(INFO, STREAM, FPRINTF_FUNC) \ init_disassemble_info (&(INFO), (STREAM), (fprintf_ftype) (FPRINTF_FUNC)) -#define INIT_DISASSEMBLE_INFO_NO_ARCH(INFO, STREAM, FPRINTF_FUNC) \ - init_disassemble_info (&(INFO), (STREAM), (fprintf_ftype) (FPRINTF_FUNC)) - #ifdef __cplusplus } diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 4d8dfe1bf5d..579bad868b5 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,22 @@ +2019-12-10 Alan Modra + + * cgen-dis.in (print_insn_@arch@): Replace insn_sets with private_data. + * disassemble.c (disassemble_init_for_target): Likewise. + * bpf-dis.c: Regenerate. + * epiphany-dis.c: Regenerate. + * fr30-dis.c: Regenerate. + * frv-dis.c: Regenerate. + * ip2k-dis.c: Regenerate. + * iq2000-dis.c: Regenerate. + * lm32-dis.c: Regenerate. + * m32c-dis.c: Regenerate. + * m32r-dis.c: Regenerate. + * mep-dis.c: Regenerate. + * mt-dis.c: Regenerate. + * or1k-dis.c: Regenerate. + * xc16x-dis.c: Regenerate. + * xstormy16-dis.c: Regenerate. + 2019-12-10 Alan Modra * ppc-dis.c (private): Delete variable. diff --git a/opcodes/bpf-dis.c b/opcodes/bpf-dis.c index c48bce85e64..99a292a3727 100644 --- a/opcodes/bpf-dis.c +++ b/opcodes/bpf-dis.c @@ -553,7 +553,7 @@ print_insn_bpf (bfd_vma pc, disassemble_info *info) cgen_bitset_add (isa, CGEN_COMPUTE_ISA (info)); } #else - isa = info->insn_sets; + isa = info->private_data; #endif /* If we've switched cpu's, try to find a handle we've used before */ diff --git a/opcodes/cgen-dis.in b/opcodes/cgen-dis.in index d1e06bf7b86..cf3e872de84 100644 --- a/opcodes/cgen-dis.in +++ b/opcodes/cgen-dis.in @@ -388,7 +388,7 @@ print_insn_@arch@ (bfd_vma pc, disassemble_info *info) cgen_bitset_add (isa, CGEN_COMPUTE_ISA (info)); } #else - isa = info->insn_sets; + isa = info->private_data; #endif /* If we've switched cpu's, try to find a handle we've used before */ diff --git a/opcodes/disassemble.c b/opcodes/disassemble.c index aef2fd8644b..f131ee85209 100644 --- a/opcodes/disassemble.c +++ b/opcodes/disassemble.c @@ -654,26 +654,26 @@ 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->insn_sets) - { - info->insn_sets = cgen_bitset_create (ISA_EBPFMAX); - if (info->endian == BFD_ENDIAN_BIG) - cgen_bitset_set (info->insn_sets, ISA_EBPFBE); - else - cgen_bitset_set (info->insn_sets, ISA_EBPFLE); - } + 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 diff --git a/opcodes/epiphany-dis.c b/opcodes/epiphany-dis.c index 376d678afcc..3c79031c999 100644 --- a/opcodes/epiphany-dis.c +++ b/opcodes/epiphany-dis.c @@ -629,7 +629,7 @@ print_insn_epiphany (bfd_vma pc, disassemble_info *info) cgen_bitset_add (isa, CGEN_COMPUTE_ISA (info)); } #else - isa = info->insn_sets; + isa = info->private_data; #endif /* If we've switched cpu's, try to find a handle we've used before */ diff --git a/opcodes/fr30-dis.c b/opcodes/fr30-dis.c index b83051b1fb7..2d1de96fa00 100644 --- a/opcodes/fr30-dis.c +++ b/opcodes/fr30-dis.c @@ -650,7 +650,7 @@ print_insn_fr30 (bfd_vma pc, disassemble_info *info) cgen_bitset_add (isa, CGEN_COMPUTE_ISA (info)); } #else - isa = info->insn_sets; + isa = info->private_data; #endif /* If we've switched cpu's, try to find a handle we've used before */ diff --git a/opcodes/frv-dis.c b/opcodes/frv-dis.c index 9df0dd59c00..bf9d4f789f1 100644 --- a/opcodes/frv-dis.c +++ b/opcodes/frv-dis.c @@ -747,7 +747,7 @@ print_insn_frv (bfd_vma pc, disassemble_info *info) cgen_bitset_add (isa, CGEN_COMPUTE_ISA (info)); } #else - isa = info->insn_sets; + isa = info->private_data; #endif /* If we've switched cpu's, try to find a handle we've used before */ diff --git a/opcodes/ip2k-dis.c b/opcodes/ip2k-dis.c index 3d3e8be412f..bc758a6618d 100644 --- a/opcodes/ip2k-dis.c +++ b/opcodes/ip2k-dis.c @@ -639,7 +639,7 @@ print_insn_ip2k (bfd_vma pc, disassemble_info *info) cgen_bitset_add (isa, CGEN_COMPUTE_ISA (info)); } #else - isa = info->insn_sets; + isa = info->private_data; #endif /* If we've switched cpu's, try to find a handle we've used before */ diff --git a/opcodes/iq2000-dis.c b/opcodes/iq2000-dis.c index 422665e869c..2762b642688 100644 --- a/opcodes/iq2000-dis.c +++ b/opcodes/iq2000-dis.c @@ -540,7 +540,7 @@ print_insn_iq2000 (bfd_vma pc, disassemble_info *info) cgen_bitset_add (isa, CGEN_COMPUTE_ISA (info)); } #else - isa = info->insn_sets; + isa = info->private_data; #endif /* If we've switched cpu's, try to find a handle we've used before */ diff --git a/opcodes/lm32-dis.c b/opcodes/lm32-dis.c index b18fb3dbfd4..274b63f58eb 100644 --- a/opcodes/lm32-dis.c +++ b/opcodes/lm32-dis.c @@ -498,7 +498,7 @@ print_insn_lm32 (bfd_vma pc, disassemble_info *info) cgen_bitset_add (isa, CGEN_COMPUTE_ISA (info)); } #else - isa = info->insn_sets; + isa = info->private_data; #endif /* If we've switched cpu's, try to find a handle we've used before */ diff --git a/opcodes/m32c-dis.c b/opcodes/m32c-dis.c index 92b87f283bf..b36868524c1 100644 --- a/opcodes/m32c-dis.c +++ b/opcodes/m32c-dis.c @@ -1242,7 +1242,7 @@ print_insn_m32c (bfd_vma pc, disassemble_info *info) cgen_bitset_add (isa, CGEN_COMPUTE_ISA (info)); } #else - isa = info->insn_sets; + isa = info->private_data; #endif /* If we've switched cpu's, try to find a handle we've used before */ diff --git a/opcodes/m32r-dis.c b/opcodes/m32r-dis.c index 8722d6b5b0f..c778b88326e 100644 --- a/opcodes/m32r-dis.c +++ b/opcodes/m32r-dis.c @@ -630,7 +630,7 @@ print_insn_m32r (bfd_vma pc, disassemble_info *info) cgen_bitset_add (isa, CGEN_COMPUTE_ISA (info)); } #else - isa = info->insn_sets; + isa = info->private_data; #endif /* If we've switched cpu's, try to find a handle we've used before */ diff --git a/opcodes/mep-dis.c b/opcodes/mep-dis.c index 13bcb472763..79bd7761c5b 100644 --- a/opcodes/mep-dis.c +++ b/opcodes/mep-dis.c @@ -1538,7 +1538,7 @@ print_insn_mep (bfd_vma pc, disassemble_info *info) cgen_bitset_add (isa, CGEN_COMPUTE_ISA (info)); } #else - isa = info->insn_sets; + isa = info->private_data; #endif /* If we've switched cpu's, try to find a handle we've used before */ diff --git a/opcodes/mt-dis.c b/opcodes/mt-dis.c index 44e6720fc16..00b3d06ed39 100644 --- a/opcodes/mt-dis.c +++ b/opcodes/mt-dis.c @@ -641,7 +641,7 @@ print_insn_mt (bfd_vma pc, disassemble_info *info) cgen_bitset_add (isa, CGEN_COMPUTE_ISA (info)); } #else - isa = info->insn_sets; + isa = info->private_data; #endif /* If we've switched cpu's, try to find a handle we've used before */ diff --git a/opcodes/or1k-dis.c b/opcodes/or1k-dis.c index 74bf38f26b7..dce00b3f281 100644 --- a/opcodes/or1k-dis.c +++ b/opcodes/or1k-dis.c @@ -534,7 +534,7 @@ print_insn_or1k (bfd_vma pc, disassemble_info *info) cgen_bitset_add (isa, CGEN_COMPUTE_ISA (info)); } #else - isa = info->insn_sets; + isa = info->private_data; #endif /* If we've switched cpu's, try to find a handle we've used before */ diff --git a/opcodes/xc16x-dis.c b/opcodes/xc16x-dis.c index 2c61e81287c..3081083821d 100644 --- a/opcodes/xc16x-dis.c +++ b/opcodes/xc16x-dis.c @@ -771,7 +771,7 @@ print_insn_xc16x (bfd_vma pc, disassemble_info *info) cgen_bitset_add (isa, CGEN_COMPUTE_ISA (info)); } #else - isa = info->insn_sets; + isa = info->private_data; #endif /* If we've switched cpu's, try to find a handle we've used before */ diff --git a/opcodes/xstormy16-dis.c b/opcodes/xstormy16-dis.c index 2382d08297a..7da09f373e0 100644 --- a/opcodes/xstormy16-dis.c +++ b/opcodes/xstormy16-dis.c @@ -519,7 +519,7 @@ print_insn_xstormy16 (bfd_vma pc, disassemble_info *info) cgen_bitset_add (isa, CGEN_COMPUTE_ISA (info)); } #else - isa = info->insn_sets; + isa = info->private_data; #endif /* If we've switched cpu's, try to find a handle we've used before */ -- 2.30.2