From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1879) id 175913858C53; Thu, 2 Feb 2023 15:08:32 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 175913858C53 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1675350512; bh=Mzzup/2fTf/I+WyBL7L1UHlB+EVI3VWtttag2hqkRrM=; h=From:To:Subject:Date:From; b=xFSwHCOpvUwOa9fDvDhZteQRvLxHJTEu9W4umpVqwhTlty105osfJohszyxZ2XDh8 6RiYlCRselz8TXyiZhNMcPE6tZY9Blm87tImD+hCE2Kr7w/yUwPzCwIVyUvWo1Ex9E SPUTA+x3RYapar/Xquo5Fk6CddYKOtlc8uOa+D3g= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Simon Marchi To: gdb-cvs@sourceware.org Subject: [binutils-gdb] gdb: add supports_arch_info callback to gdbarch_register X-Act-Checkin: binutils-gdb X-Git-Author: Lancelot SIX X-Git-Refname: refs/heads/master X-Git-Oldrev: 4a075b258e6f27f7323d57ec046549aad5e1a702 X-Git-Newrev: 1a8505cb53faa1c191d09ba221f9b0ec383ccfde Message-Id: <20230202150832.175913858C53@sourceware.org> Date: Thu, 2 Feb 2023 15:08:32 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D1a8505cb53fa= a1c191d09ba221f9b0ec383ccfde commit 1a8505cb53faa1c191d09ba221f9b0ec383ccfde Author: Lancelot SIX Date: Fri Sep 2 15:09:35 2022 -0400 gdb: add supports_arch_info callback to gdbarch_register =20 In the ROCm GDB port, there are some amdgcn architectures known by BFD that we don't actually support in GDB. We don't want gdbarch_printable_names to return these architectures. =20 gdbarch_printable_names is used for a few things: =20 - completion of the "set architecture" command - the gdb.architecture_names function in Python - foreach-arch selftests =20 Add an optional callback to gdbarch_register that is a predicate indicating whether the gdbarch supports the given bfd_arch_info. by default, it is nullptr, meaning that the gdbarch accepts all "mach"s for that architecture known by BFD. =20 Change-Id: I712f94351b0b34ed1f42e5cf7fc7ba051315d860 Co-Authored-By: Simon Marchi Approved-By: Andrew Burgess Diff: --- gdb/arch-utils.c | 9 +++++++-- gdb/gdbarch.h | 4 +++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/gdb/arch-utils.c b/gdb/arch-utils.c index 67968126488..617768225d3 100644 --- a/gdb/arch-utils.c +++ b/gdb/arch-utils.c @@ -1237,6 +1237,7 @@ struct gdbarch_registration enum bfd_architecture bfd_architecture; gdbarch_init_ftype *init; gdbarch_dump_tdep_ftype *dump_tdep; + gdbarch_supports_arch_info_ftype *supports_arch_info; struct gdbarch_list *arches; struct gdbarch_registration *next; }; @@ -1260,7 +1261,9 @@ gdbarch_printable_names () internal_error (_("gdbarch_architecture_names: multi-arch unknown")); do { - arches.push_back (ap->printable_name); + if (rego->supports_arch_info =3D=3D nullptr + || rego->supports_arch_info (ap)) + arches.push_back (ap->printable_name); ap =3D ap->next; } while (ap !=3D NULL); @@ -1273,7 +1276,8 @@ gdbarch_printable_names () void gdbarch_register (enum bfd_architecture bfd_architecture, gdbarch_init_ftype *init, - gdbarch_dump_tdep_ftype *dump_tdep) + gdbarch_dump_tdep_ftype *dump_tdep, + gdbarch_supports_arch_info_ftype *supports_arch_info) { struct gdbarch_registration **curr; const struct bfd_arch_info *bfd_arch_info; @@ -1306,6 +1310,7 @@ gdbarch_register (enum bfd_architecture bfd_architect= ure, (*curr)->bfd_architecture =3D bfd_architecture; (*curr)->init =3D init; (*curr)->dump_tdep =3D dump_tdep; + (*curr)->supports_arch_info =3D supports_arch_info; (*curr)->arches =3D NULL; (*curr)->next =3D NULL; } diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h index a1167f21eca..f4efd8c0bc7 100644 --- a/gdb/gdbarch.h +++ b/gdb/gdbarch.h @@ -270,10 +270,12 @@ struct gdbarch_info =20 typedef struct gdbarch *(gdbarch_init_ftype) (struct gdbarch_info info, st= ruct gdbarch_list *arches); typedef void (gdbarch_dump_tdep_ftype) (struct gdbarch *gdbarch, struct ui= _file *file); +typedef bool (gdbarch_supports_arch_info_ftype) (const struct bfd_arch_inf= o *); =20 extern void gdbarch_register (enum bfd_architecture architecture, gdbarch_init_ftype *init, - gdbarch_dump_tdep_ftype *dump_tdep =3D nullptr); + gdbarch_dump_tdep_ftype *dump_tdep =3D nullptr, + gdbarch_supports_arch_info_ftype *supports_arch_info =3D nullptr); =20 =20 /* Return a vector of the valid architecture names. Since architectures a= re