diff options
author | Tom de Vries <tdevries@suse.de> | 2022-06-03 15:34:50 +0200 |
---|---|---|
committer | Tom de Vries <tdevries@suse.de> | 2022-06-03 15:34:50 +0200 |
commit | 450afa9497ab57588a79f5a3d828b9773643a852 (patch) | |
tree | 5fbf64c4e3f792291a7571ba1a01238c42fbdb85 /gdb/osabi.c | |
parent | 0e02119e65b566cad575cc57fe423dadab855a56 (diff) | |
download | gdb-450afa9497ab57588a79f5a3d828b9773643a852.zip gdb-450afa9497ab57588a79f5a3d828b9773643a852.tar.gz gdb-450afa9497ab57588a79f5a3d828b9773643a852.tar.bz2 |
[gdb] Fix warning in foreach_arch selftests
When running the selftests, I run into:
...
$ gdb -q -batch -ex "maint selftest"
...
Running selftest execute_cfa_program::aarch64:ilp32.
warning: A handler for the OS ABI "GNU/Linux" is not built into this
configuration of GDB. Attempting to continue with the default aarch64:ilp32
settings.
...
and likewise for execute_cfa_program::i8086 and
execute_cfa_program::ia64-elf32.
The warning can easily be reproduced outside the selftests by doing:
...
$ gdb -q -batch -ex "set arch aarch64:ilp32"
...
and can be prevented by first doing "set osabi none".
Fix the warning by setting osabi to none while doing selftests that iterate
over all architectures.
This causes a regression in the print_one_insn selftests for the ARC
architecture.
The problem is pre-existing, and can be demonstrated (already without this
patch) using:
...
$ gdb -q -batch -ex "set osabi none" -ex "maint selftest print_one_insn::A6"
Running selftest print_one_insn::A6.
Self test failed: Cannot access memory at address 0x0
Ran 1 unit tests, 1 failed
$
...
For ARC, we use the generic case in print_one_insn_test, containing this code:
...
int kind = gdbarch_breakpoint_kind_from_pc (gdbarch, &pc);
...
insn = gdbarch_sw_breakpoint_from_kind (gdbarch, kind, &bplen);
...
The problem is that with osabi linux we trigger:
...
static int
arc_linux_breakpoint_kind_from_pc (struct gdbarch *gdbarch, CORE_ADDR *pcptr)
{
return trap_size;
}
...
but with osabi none:
...
arc_breakpoint_kind_from_pc (struct gdbarch *gdbarch, CORE_ADDR *pcptr)
{
size_t length_with_limm = gdb_insn_length (gdbarch, *pcptr);
...
which needs access to memory, and will consequently fail.
Fix this in print_one_insn_test, in the default case, by iterating over
supported osabi's to makes sure we trigger arc_linux_breakpoint_kind_from_pc
which will give us a usable instruction to disassemble.
Tested on x86_64-linux.
Diffstat (limited to 'gdb/osabi.c')
-rw-r--r-- | gdb/osabi.c | 35 |
1 files changed, 29 insertions, 6 deletions
diff --git a/gdb/osabi.c b/gdb/osabi.c index bbd7635..f1b7f22 100644 --- a/gdb/osabi.c +++ b/gdb/osabi.c @@ -332,9 +332,10 @@ can_run_code_for (const struct bfd_arch_info *a, const struct bfd_arch_info *b) return (a == b || a->compatible (a, b) == a); } +/* Return OS ABI handler for INFO. */ -void -gdbarch_init_osabi (struct gdbarch_info info, struct gdbarch *gdbarch) +static struct gdb_osabi_handler * +gdbarch_osabi_handler (struct gdbarch_info info) { struct gdb_osabi_handler *handler; @@ -367,10 +368,32 @@ gdbarch_init_osabi (struct gdbarch_info info, struct gdbarch *gdbarch) ISA"). BFD doesn't normally consider 32-bit and 64-bit "compatible" so it doesn't succeed. */ if (can_run_code_for (info.bfd_arch_info, handler->arch_info)) - { - (*handler->init_osabi) (info, gdbarch); - return; - } + return handler; + } + + return nullptr; +} + +/* See osabi.h. */ + +bool +has_gdb_osabi_handler (struct gdbarch_info info) +{ + return gdbarch_osabi_handler (info) != nullptr; +} + +void +gdbarch_init_osabi (struct gdbarch_info info, struct gdbarch *gdbarch) +{ + struct gdb_osabi_handler *handler; + + gdb_assert (info.osabi != GDB_OSABI_UNKNOWN); + handler = gdbarch_osabi_handler (info); + + if (handler != nullptr) + { + (*handler->init_osabi) (info, gdbarch); + return; } if (info.osabi == GDB_OSABI_NONE) |