diff options
| author | Sam James <sam@gentoo.org> | 2023-08-02 12:06:23 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2023-08-02 12:06:23 +0100 |
| commit | b5c37946cce4b41af0436529b139fa3d23e61f73 (patch) | |
| tree | 02129ebadb74e7d3f2430cf8221799ce186600e3 /opcodes/disassemble.c | |
| parent | 675b9d612cc59446e84e2c6d89b45500cb603a8d (diff) | |
| download | binutils-b5c37946cce4b41af0436529b139fa3d23e61f73.zip binutils-b5c37946cce4b41af0436529b139fa3d23e61f73.tar.gz binutils-b5c37946cce4b41af0436529b139fa3d23e61f73.tar.bz2 | |
Revert "2.41 Release sources"
This reverts commit 675b9d612cc59446e84e2c6d89b45500cb603a8d.
See https://sourceware.org/pipermail/binutils/2023-August/128761.html.
Diffstat (limited to 'opcodes/disassemble.c')
| -rw-r--r-- | opcodes/disassemble.c | 44 |
1 files changed, 5 insertions, 39 deletions
diff --git a/opcodes/disassemble.c b/opcodes/disassemble.c index 7a4a641..8aac42e 100644 --- a/opcodes/disassemble.c +++ b/opcodes/disassemble.c @@ -108,23 +108,6 @@ #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_XBPFLE, ISA_XBPFBE, ISA_EBPFMAX -}; -# else -# include "bpf-desc.h" -# define ISA_EBPFMAX ISA_MAX -# endif -#endif /* ARCH_bpf */ - disassembler_ftype disassembler (enum bfd_architecture a, bool big ATTRIBUTE_UNUSED, @@ -594,7 +577,9 @@ disassembler_usage (FILE *stream ATTRIBUTE_UNUSED) #ifdef ARCH_loongarch print_loongarch_disassembler_options (stream); #endif - +#ifdef ARCH_bpf + print_bpf_disassembler_options (stream); +#endif return; } @@ -695,23 +680,7 @@ disassemble_init_for_target (struct disassemble_info * info) #endif #ifdef ARCH_bpf case bfd_arch_bpf: - info->endian_code = BFD_ENDIAN_LITTLE; - if (!info->private_data) - { - info->private_data = cgen_bitset_create (ISA_MAX); - if (info->endian == BFD_ENDIAN_BIG) - { - cgen_bitset_set (info->private_data, ISA_EBPFBE); - if (info->mach == bfd_mach_xbpf) - cgen_bitset_set (info->private_data, ISA_XBPFBE); - } - else - { - cgen_bitset_set (info->private_data, ISA_EBPFLE); - if (info->mach == bfd_mach_xbpf) - cgen_bitset_set (info->private_data, ISA_XBPFLE); - } - } + info->created_styled_output = true; break; #endif #ifdef ARCH_pru @@ -768,13 +737,10 @@ disassemble_free_target (struct disassemble_info *info) 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 defined ARCH_m32c if (info->private_data) { CGEN_BITSET *mask = info->private_data; |