aboutsummaryrefslogtreecommitdiff
path: root/opcodes/disassemble.c
diff options
context:
space:
mode:
Diffstat (limited to 'opcodes/disassemble.c')
-rw-r--r--opcodes/disassemble.c30
1 files changed, 8 insertions, 22 deletions
diff --git a/opcodes/disassemble.c b/opcodes/disassemble.c
index 7a4a641..a5cb396 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,6 +680,9 @@ disassemble_init_for_target (struct disassemble_info * info)
#endif
#ifdef ARCH_bpf
case bfd_arch_bpf:
+ /* XXX option for dialect */
+ info->created_styled_output = true;
+#if 0
info->endian_code = BFD_ENDIAN_LITTLE;
if (!info->private_data)
{
@@ -712,6 +700,7 @@ disassemble_init_for_target (struct disassemble_info * info)
cgen_bitset_set (info->private_data, ISA_XBPFLE);
}
}
+#endif
break;
#endif
#ifdef ARCH_pru
@@ -768,13 +757,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;