Re: [PATCH] GDB/opcodes: Remove arch/mach/endian disassembler assertions

Yao Qi
2017-08-03T11:04:56Z

"Maciej W. Rozycki" <macro@imgtec.com> writes:

Hi Maciej,

> @@ -971,13 +971,6 @@ default_print_insn (bfd_vma memaddr, dis
> {
> disassembler_ftype disassemble_fn;
>
> - if (exec_bfd != NULL)
> - {
> - gdb_assert (info->arch == bfd_get_arch (exec_bfd));
> - gdb_assert (info->endian == (bfd_big_endian (exec_bfd)
> - ? BFD_ENDIAN_BIG : BFD_ENDIAN_LITTLE));
> - gdb_assert (info->mach == bfd_get_mach (exec_bfd));
> - }
> disassemble_fn = disassembler (info->arch, info->endian == BFD_ENDIAN_BIG,
> info->mach, exec_bfd);

I prefer to keep these asserts, as they could check the inconsistent
uses of disassemble_info between gdb and opcodes. There is another
assert for target armv5te, PR 21818, but the assert exposes an improper
or unexpected usage of disassemble_info.mach in opcodes/arm-dis.c. I am
fixing it.

If these asserts make few sense to mips, gdb_print_insn_mips doesn't
have to call default_print_insn. You can just do this at the end of
gdb_print_insn_mips,

--
Yao (齐尧)
diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c
index c1800e4..8ab7886 100644
--- a/gdb/mips-tdep.c
+++ b/gdb/mips-tdep.c
@@ -7025,7 +7025,13 @@ gdb_print_insn_mips (bfd_vma memaddr, struct disassemble_info *info)
register naming conventions specified by the user. */
info->disassembler_options = "gpr-names=32";

- return default_print_insn (memaddr, info);
+ disassembler_ftype disassemble_fn;
+
+ disassemble_fn = disassembler (info->arch, info->endian == BFD_ENDIAN_BIG,
+ info->mach, exec_bfd);
+
+ gdb_assert (disassemble_fn != NULL);
+ return (*disassemble_fn) (memaddr, info);
}

static int