From patchwork Thu Oct 10 17:22:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guinevere Larsen X-Patchwork-Id: 98679 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 754D53857C6C for ; Thu, 10 Oct 2024 17:23:46 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTP id A284E3858C48 for ; Thu, 10 Oct 2024 17:23:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A284E3858C48 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org A284E3858C48 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1728580989; cv=none; b=WJCw3kBfydYnbbdgHv3qShA1ll6Qf0y9UtSl+oJMvYz9/xkdQhY24PrXWbWym4aUd4r8wI/waC6N58j1GTFlsaFkVYMh845zPUB/qnC9qhfb/YmX9T97FqOY6X9rPWKnTRJRBEy6GXkVVm2EMIsOU2lqfcZ+NQoFiSxu+U3U1ik= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1728580989; c=relaxed/simple; bh=kLEisW/Xp/3VnMK+3UVooTyqeFzgfwsNn68+FcL67pM=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=Cgp2O1Y1wRpHpOZgAxesNKMLMSgXsFdMmIVYxol53dpN3QGSOkBQUfLhWLjcFu+0VrUuiBFapjYiBBlC7YTzXL58SffDml5uphScKvQf3OEkveq0EbXxm+rO/rruBDOwfVHUD8xVXzkE1hQldmY0suatCNoMwv3UnkpFL0pFBXo= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1728580986; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qCZWQxuizIHIIejHSCh9j9n2tS3cGL6E+Yd2deLbDbU=; b=fYMNiUkgiYyjMa5IHYrMvjk6/VBiUKQ8GOWu87RONTM61MaSYIh7HamrnMoycWQ2zyttU7 rovXdeux6poljfXFBx2oks+dVKWGsF+FGNywNjCGBBekZkANGZJMhxkqt+1OPCfMNuCpe7 iQMXgvePngHMRPUazH2XBLkBEX7OK/4= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-480-1_J3ftUmNi-XSx2Ogpwc-g-1; Thu, 10 Oct 2024 13:23:03 -0400 X-MC-Unique: 1_J3ftUmNi-XSx2Ogpwc-g-1 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E9C7C1956048; Thu, 10 Oct 2024 17:23:01 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.22.34.10]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 7978019560AA; Thu, 10 Oct 2024 17:22:59 +0000 (UTC) From: Guinevere Larsen To: gdb-patches@sourceware.org Cc: Guinevere Larsen , Thiago Jung Bauermann , Simon Marchi Subject: [PATCH v6 1/5] gdb: make gdbarch store a vector of frame unwinders Date: Thu, 10 Oct 2024 14:22:16 -0300 Message-ID: <20241010172220.3700189-2-guinevere@redhat.com> In-Reply-To: <20241010172220.3700189-1-guinevere@redhat.com> References: <20241010172220.3700189-1-guinevere@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.2 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~patchwork=sourceware.org@sourceware.org From: Guinevere Larsen Before this commit, all frame unwinders would be stored in the obstack of a gdbarch and accessed by using the registry system. This made for unwieldy code, and unnecessarily complex logic in the frame_unwinder implementation, along with making frame_unwind structs be unable to have non-trivial destructors. Seeing as a future patch of this series wants to refactor the frame_unwind struct to use inheritance, and we'd like to not restrict the future derived classes on what destructors are allowed. In preparation for that change, this commit adds an std::vector to gdbarch to store the unwinders in. There should be no user-visible changes. Reviewed-by: Thiago Jung Bauermann Approved-By: Simon Marchi --- gdb/arch-utils.c | 8 ++++ gdb/frame-unwind.c | 114 +++++++++++++++++---------------------------- gdb/gdbarch-gen.c | 6 +++ gdb/gdbarch.h | 5 ++ gdb/gdbarch.py | 6 +++ 5 files changed, 67 insertions(+), 72 deletions(-) diff --git a/gdb/arch-utils.c b/gdb/arch-utils.c index 6ffa4109765..5a4ed097321 100644 --- a/gdb/arch-utils.c +++ b/gdb/arch-utils.c @@ -1225,6 +1225,14 @@ obstack *gdbarch_obstack (gdbarch *arch) /* See gdbarch.h. */ +std::vector & +gdbarch_unwinder_list (struct gdbarch *arch) +{ + return arch->unwinders; +} + +/* See gdbarch.h. */ + char * gdbarch_obstack_strdup (struct gdbarch *arch, const char *string) { diff --git a/gdb/frame-unwind.c b/gdb/frame-unwind.c index e5f108d3257..3df28985e2e 100644 --- a/gdb/frame-unwind.c +++ b/gdb/frame-unwind.c @@ -31,49 +31,11 @@ #include "cli/cli-cmds.h" #include "inferior.h" -struct frame_unwind_table_entry +/* Default sniffers, that must always be the first in the unwinder list, + no matter the architecture. */ +static constexpr auto standard_unwinders = { - const struct frame_unwind *unwinder; - struct frame_unwind_table_entry *next; -}; - -struct frame_unwind_table -{ - struct frame_unwind_table_entry *list = nullptr; - /* The head of the OSABI part of the search list. */ - struct frame_unwind_table_entry **osabi_head = nullptr; -}; - -static const registry::key - frame_unwind_data; - -/* A helper function to add an unwinder to a list. LINK says where to - install the new unwinder. The new link is returned. */ - -static struct frame_unwind_table_entry ** -add_unwinder (struct obstack *obstack, const struct frame_unwind *unwinder, - struct frame_unwind_table_entry **link) -{ - *link = OBSTACK_ZALLOC (obstack, struct frame_unwind_table_entry); - (*link)->unwinder = unwinder; - return &(*link)->next; -} - -static struct frame_unwind_table * -get_frame_unwind_table (struct gdbarch *gdbarch) -{ - struct frame_unwind_table *table = frame_unwind_data.get (gdbarch); - if (table != nullptr) - return table; - - table = new frame_unwind_table; - - /* Start the table out with a few default sniffers. OSABI code - can't override this. */ - struct frame_unwind_table_entry **link = &table->list; - - struct obstack *obstack = gdbarch_obstack (gdbarch); - link = add_unwinder (obstack, &dummy_frame_unwind, link); + &dummy_frame_unwind, /* The DWARF tailcall sniffer must come before the inline sniffer. Otherwise, we can end up in a situation where a DWARF frame finds tailcall information, but then the inline sniffer claims a frame @@ -81,12 +43,33 @@ get_frame_unwind_table (struct gdbarch *gdbarch) safe to do always because the tailcall sniffer can only ever be activated if the newer frame was created using the DWARF unwinder, and it also found tailcall information. */ - link = add_unwinder (obstack, &dwarf2_tailcall_frame_unwind, link); - link = add_unwinder (obstack, &inline_frame_unwind, link); + &dwarf2_tailcall_frame_unwind, + &inline_frame_unwind, +}; + +/* If an unwinder should be prepended to the list, this is the + index in which it should be inserted. */ +static constexpr int prepend_unwinder_index = standard_unwinders.size (); + +/* Start the table out with a few default sniffers. OSABI code + can't override this. */ +static void +initialize_frame_unwind_table (std::vector& table) +{ + gdb_assert (table.empty ()); + + table.insert (table.begin (), standard_unwinders.begin (), + standard_unwinders.end ()); +} - /* The insertion point for OSABI sniffers. */ - table->osabi_head = link; - frame_unwind_data.set (gdbarch, table); +/* Retrieve the list of frame unwinders available in GDBARCH. + If this list is empty, it is initialized before being returned. */ +static std::vector & +get_frame_unwind_table (struct gdbarch *gdbarch) +{ + std::vector &table = gdbarch_unwinder_list (gdbarch); + if (table.empty ()) + initialize_frame_unwind_table (table); return table; } @@ -95,27 +78,16 @@ void frame_unwind_prepend_unwinder (struct gdbarch *gdbarch, const struct frame_unwind *unwinder) { - struct frame_unwind_table *table = get_frame_unwind_table (gdbarch); - struct frame_unwind_table_entry *entry; - - /* Insert the new entry at the start of the list. */ - entry = GDBARCH_OBSTACK_ZALLOC (gdbarch, struct frame_unwind_table_entry); - entry->unwinder = unwinder; - entry->next = (*table->osabi_head); - (*table->osabi_head) = entry; + std::vector &table = get_frame_unwind_table (gdbarch); + + table.insert (table.begin () + prepend_unwinder_index, unwinder); } void frame_unwind_append_unwinder (struct gdbarch *gdbarch, const struct frame_unwind *unwinder) { - struct frame_unwind_table *table = get_frame_unwind_table (gdbarch); - struct frame_unwind_table_entry **ip; - - /* Find the end of the list and insert the new entry there. */ - for (ip = table->osabi_head; (*ip) != NULL; ip = &(*ip)->next); - (*ip) = GDBARCH_OBSTACK_ZALLOC (gdbarch, struct frame_unwind_table_entry); - (*ip)->unwinder = unwinder; + get_frame_unwind_table (gdbarch).push_back (unwinder); } /* Call SNIFFER from UNWINDER. If it succeeded set UNWINDER for @@ -188,9 +160,6 @@ frame_unwind_find_by_frame (const frame_info_ptr &this_frame, void **this_cache) FRAME_SCOPED_DEBUG_ENTER_EXIT; frame_debug_printf ("this_frame=%d", frame_relative_level (this_frame)); - struct gdbarch *gdbarch = get_frame_arch (this_frame); - struct frame_unwind_table *table = get_frame_unwind_table (gdbarch); - struct frame_unwind_table_entry *entry; const struct frame_unwind *unwinder_from_target; unwinder_from_target = target_get_unwinder (); @@ -205,8 +174,10 @@ frame_unwind_find_by_frame (const frame_info_ptr &this_frame, void **this_cache) unwinder_from_target)) return; - for (entry = table->list; entry != NULL; entry = entry->next) - if (frame_unwind_try_unwinder (this_frame, this_cache, entry->unwinder)) + struct gdbarch *gdbarch = get_frame_arch (this_frame); + std::vector &table = get_frame_unwind_table (gdbarch); + for (auto unwinder : table) + if (frame_unwind_try_unwinder (this_frame, this_cache, unwinder)) return; internal_error (_("frame_unwind_find_by_frame failed")); @@ -347,7 +318,7 @@ static void maintenance_info_frame_unwinders (const char *args, int from_tty) { gdbarch *gdbarch = current_inferior ()->arch (); - struct frame_unwind_table *table = get_frame_unwind_table (gdbarch); + std::vector &table = get_frame_unwind_table (gdbarch); ui_out *uiout = current_uiout; ui_out_emit_table table_emitter (uiout, 2, -1, "FrameUnwinders"); @@ -355,11 +326,10 @@ maintenance_info_frame_unwinders (const char *args, int from_tty) uiout->table_header (25, ui_left, "type", "Type"); uiout->table_body (); - for (struct frame_unwind_table_entry *entry = table->list; entry != NULL; - entry = entry->next) + for (auto unwinder : table) { - const char *name = entry->unwinder->name; - const char *type = frame_type_str (entry->unwinder->type); + const char *name = unwinder->name; + const char *type = frame_type_str (unwinder->type); ui_out_emit_list tuple_emitter (uiout, nullptr); uiout->field_string ("name", name); diff --git a/gdb/gdbarch-gen.c b/gdb/gdbarch-gen.c index 0d00cd7c993..03894b19bd6 100644 --- a/gdb/gdbarch-gen.c +++ b/gdb/gdbarch-gen.c @@ -27,6 +27,8 @@ /* Maintain the struct gdbarch object. */ +#include + struct gdbarch { /* Has this architecture been fully initialized? */ @@ -34,9 +36,13 @@ struct gdbarch /* An obstack bound to the lifetime of the architecture. */ auto_obstack obstack; + /* Registry. */ registry registry_fields; + /* List of frame unwinders. */ + std::vector unwinders; + /* basic architectural information. */ const struct bfd_arch_info * bfd_arch_info; enum bfd_endian byte_order; diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h index 60a0f60df39..d729b16f7cb 100644 --- a/gdb/gdbarch.h +++ b/gdb/gdbarch.h @@ -30,6 +30,7 @@ #include "displaced-stepping.h" #include "gdbsupport/gdb-checked-static-cast.h" #include "registry.h" +#include "frame-unwind.h" struct floatformat; struct ui_file; @@ -310,6 +311,10 @@ extern obstack *gdbarch_obstack (gdbarch *arch); #define GDBARCH_OBSTACK_ZALLOC(GDBARCH, TYPE) obstack_zalloc (gdbarch_obstack ((GDBARCH))) +/* Return the vector of unwinders stored in a gdbarch object. */ + +std::vector &gdbarch_unwinder_list (struct gdbarch *arch); + /* Duplicate STRING, returning an equivalent string that's allocated on the obstack associated with GDBARCH. The string is freed when the corresponding architecture is also freed. */ diff --git a/gdb/gdbarch.py b/gdb/gdbarch.py index dd1658d5274..274be3ab0d7 100755 --- a/gdb/gdbarch.py +++ b/gdb/gdbarch.py @@ -125,6 +125,8 @@ with open("gdbarch-gen.c", "w") as f: print(file=f) print("/* Maintain the struct gdbarch object. */", file=f) print(file=f) + print("#include ", file=f) + print(file=f) # # The struct definition body. # @@ -135,9 +137,13 @@ with open("gdbarch-gen.c", "w") as f: print(file=f) print(" /* An obstack bound to the lifetime of the architecture. */", file=f) print(" auto_obstack obstack;", file=f) + print(file=f) print(" /* Registry. */", file=f) print(" registry registry_fields;", file=f) print(file=f) + print(" /* List of frame unwinders. */", file=f) + print(" std::vector unwinders;", file=f) + print(file=f) print(" /* basic architectural information. */", file=f) for c in filter(info, components): print(f" {c.type} {c.name};", file=f)