* [PATCH v2 0/5] Modernize frame unwinders and add disable feature
@ 2024-04-08 20:19 Guinevere Larsen
2024-04-08 20:19 ` [PATCH v2 1/5] gdb: make gdbarch store a vector of frame unwinders Guinevere Larsen
` (6 more replies)
0 siblings, 7 replies; 12+ messages in thread
From: Guinevere Larsen @ 2024-04-08 20:19 UTC (permalink / raw)
To: gdb-patches; +Cc: Guinevere Larsen
This patch series started with me trying to make it easier to test GDB's
ability to unwind using CFI data, to improve a previous patch I sent to
the list.
The first patch is just a minor change, storing frame unwinders in a
vector instead of through an unwinder table accessible using the
registry system. This isn't required (like I originally thought it was),
but it does make the whole system more readable in my opinion.
Patch 3 has the real meat of the modernization, making GDB use
polymorphism to handle frame unwinders. This is slightly slower than
using function pointers, but much more readable in my opinion.
As for the unwinder classes, they were chosen somewhat arbitrarily,
mostly based on where I found an unwinder and its name. I almost expect
some unwinders to be mis-categorized, but that should be easy to fix.
The changes up to patch 3 have been tested with a try-branch, no
regressions as far as I could see.
Changes for v2:
* Added back the test that checks if GDB can handle a mix of CUs with
and without debuginfo in a single backtrace.
* Fixed all the nitpicks for style.
* Removed FRAME_UNWIND_ prefix when talking about classes
* Thoroughly changed the documentation, to be more readable
Guinevere Larsen (5):
gdb: make gdbarch store a vector of frame unwinders
gdb: add "unwinder class" to frame unwinders
gdb: Migrate frame unwinders to use C++ classes
gdb: introduce ability to disable frame unwinders
gdb/testsuite: Test for a backtrace through object without debuginfo
gdb/NEWS | 7 +
gdb/aarch64-tdep.c | 12 +-
gdb/alpha-mdebug-tdep.c | 6 +-
gdb/alpha-tdep.c | 12 +-
gdb/amd64-obsd-tdep.c | 6 +-
gdb/amd64-tdep.c | 24 +-
gdb/amd64-windows-tdep.c | 6 +-
gdb/amdgpu-tdep.c | 7 +-
gdb/arc-tdep.c | 10 +-
gdb/arch-utils.c | 8 +
gdb/arm-tdep.c | 29 +-
gdb/avr-tdep.c | 5 +-
gdb/bfin-tdep.c | 6 +-
gdb/bpf-tdep.c | 6 +-
gdb/cris-tdep.c | 12 +-
gdb/csky-tdep.c | 10 +-
gdb/doc/gdb.texinfo | 24 ++
gdb/dummy-frame.c | 8 +-
gdb/dummy-frame.h | 2 +-
gdb/dwarf2/frame-tailcall.c | 6 +-
gdb/dwarf2/frame-tailcall.h | 2 +-
gdb/dwarf2/frame.c | 16 +-
gdb/frame-unwind.c | 335 ++++++++++++++----
gdb/frame-unwind.h | 178 +++++++++-
gdb/frame.c | 28 +-
gdb/frv-linux-tdep.c | 6 +-
gdb/frv-tdep.c | 5 +-
gdb/ft32-tdep.c | 6 +-
gdb/gdbarch.c | 3 +
gdb/gdbarch.h | 5 +
gdb/gdbarch.py | 3 +
gdb/h8300-tdep.c | 5 +-
gdb/hppa-linux-tdep.c | 5 +-
gdb/hppa-tdep.c | 17 +-
gdb/i386-obsd-tdep.c | 5 +-
gdb/i386-tdep.c | 30 +-
gdb/ia64-tdep.c | 24 +-
gdb/inline-frame.c | 5 +-
gdb/inline-frame.h | 2 +-
gdb/iq2000-tdep.c | 5 +-
gdb/jit.c | 6 +-
gdb/lm32-tdep.c | 5 +-
gdb/loongarch-tdep.c | 7 +-
gdb/m32c-tdep.c | 5 +-
gdb/m32r-linux-tdep.c | 5 +-
gdb/m32r-tdep.c | 5 +-
gdb/m68hc11-tdep.c | 5 +-
gdb/m68k-linux-tdep.c | 6 +-
gdb/m68k-tdep.c | 6 +-
gdb/mep-tdep.c | 5 +-
gdb/microblaze-tdep.c | 6 +-
gdb/mips-sde-tdep.c | 6 +-
gdb/mips-tdep.c | 24 +-
gdb/mn10300-tdep.c | 5 +-
gdb/moxie-tdep.c | 5 +-
gdb/msp430-tdep.c | 5 +-
gdb/nds32-tdep.c | 14 +-
gdb/nios2-tdep.c | 12 +-
gdb/or1k-tdep.c | 7 +-
gdb/ppc-fbsd-tdep.c | 5 +-
gdb/ppc-obsd-tdep.c | 5 +-
gdb/python/py-unwind.c | 50 ++-
gdb/record-btrace.c | 12 +-
gdb/record.h | 4 +-
gdb/riscv-tdep.c | 8 +-
gdb/rl78-tdep.c | 6 +-
gdb/rs6000-aix-tdep.c | 5 +-
gdb/rs6000-tdep.c | 12 +-
gdb/rx-tdep.c | 10 +-
gdb/s12z-tdep.c | 7 +-
gdb/s390-linux-tdep.c | 5 +-
gdb/s390-tdep.c | 10 +-
gdb/sentinel-frame.c | 8 +-
gdb/sentinel-frame.h | 2 +-
gdb/sh-tdep.c | 11 +-
gdb/sparc-netbsd-tdep.c | 6 +-
gdb/sparc-obsd-tdep.c | 6 +-
gdb/sparc-sol2-tdep.c | 6 +-
gdb/sparc-tdep.c | 6 +-
gdb/sparc64-fbsd-tdep.c | 6 +-
gdb/sparc64-netbsd-tdep.c | 6 +-
gdb/sparc64-obsd-tdep.c | 12 +-
gdb/sparc64-sol2-tdep.c | 6 +-
gdb/sparc64-tdep.c | 6 +-
.../backtrace-through-cu-nodebug-caller.c | 28 ++
.../backtrace-through-cu-nodebug-main.c | 32 ++
.../gdb.base/backtrace-through-cu-nodebug.exp | 87 +++++
gdb/testsuite/gdb.base/frame-unwind-disable.c | 21 ++
.../gdb.base/frame-unwind-disable.exp | 114 ++++++
gdb/tic6x-tdep.c | 12 +-
gdb/tilegx-tdep.c | 5 +-
gdb/tramp-frame.c | 56 ++-
gdb/v850-tdep.c | 5 +-
gdb/vax-tdep.c | 6 +-
gdb/windows-tdep.c | 33 +-
gdb/windows-tdep.h | 16 +-
gdb/xstormy16-tdep.c | 5 +-
gdb/xtensa-tdep.c | 7 +-
gdb/z80-tdep.c | 7 +-
99 files changed, 1240 insertions(+), 444 deletions(-)
create mode 100644 gdb/testsuite/gdb.base/backtrace-through-cu-nodebug-caller.c
create mode 100644 gdb/testsuite/gdb.base/backtrace-through-cu-nodebug-main.c
create mode 100644 gdb/testsuite/gdb.base/backtrace-through-cu-nodebug.exp
create mode 100644 gdb/testsuite/gdb.base/frame-unwind-disable.c
create mode 100644 gdb/testsuite/gdb.base/frame-unwind-disable.exp
--
2.44.0
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v2 1/5] gdb: make gdbarch store a vector of frame unwinders
2024-04-08 20:19 [PATCH v2 0/5] Modernize frame unwinders and add disable feature Guinevere Larsen
@ 2024-04-08 20:19 ` Guinevere Larsen
2024-04-08 20:19 ` [PATCH v2 2/5] gdb: add "unwinder class" to " Guinevere Larsen
` (5 subsequent siblings)
6 siblings, 0 replies; 12+ messages in thread
From: Guinevere Larsen @ 2024-04-08 20:19 UTC (permalink / raw)
To: gdb-patches; +Cc: 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.
---
gdb/arch-utils.c | 8 ++++
gdb/frame-unwind.c | 111 +++++++++++++++++----------------------------
gdb/gdbarch.c | 3 ++
gdb/gdbarch.h | 5 ++
gdb/gdbarch.py | 3 ++
5 files changed, 61 insertions(+), 69 deletions(-)
diff --git a/gdb/arch-utils.c b/gdb/arch-utils.c
index 456bfe971ff..a63a6115116 100644
--- a/gdb/arch-utils.c
+++ b/gdb/arch-utils.c
@@ -1218,6 +1218,14 @@ obstack *gdbarch_obstack (gdbarch *arch)
/* See gdbarch.h. */
+std::vector<const frame_unwind *>&
+gdbarch_get_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 a80421a9c5a..36c3d81435d 100644
--- a/gdb/frame-unwind.c
+++ b/gdb/frame-unwind.c
@@ -30,49 +30,16 @@
#include "cli/cli-cmds.h"
#include "inferior.h"
-struct frame_unwind_table_entry
-{
- 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;
-};
+/* If an unwinder should be prepended to the list, this is the
+ index in which it should be inserted. */
+static int osabi_start = -1;
-static const registry<gdbarch>::key<struct frame_unwind_table>
- 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)
+/* Start the table out with a few default sniffers. OSABI code
+ can't override this. */
+static void
+initialize_frame_unwind_table (std::vector<const frame_unwind*>& table)
{
- 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);
+ table.push_back (&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
@@ -80,12 +47,22 @@ 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);
+ table.push_back (&dwarf2_tailcall_frame_unwind);
+ table.push_back (&inline_frame_unwind);
/* The insertion point for OSABI sniffers. */
- table->osabi_head = link;
- frame_unwind_data.set (gdbarch, table);
+ osabi_start = table.size ();
+}
+
+/* This function call retrieves the list of frame unwinders available in
+ GDBARCH. If this list is empty, it is initialized before being
+ returned. */
+static std::vector<const frame_unwind*>&
+get_frame_unwind_table (struct gdbarch *gdbarch)
+{
+ std::vector<const frame_unwind*>& table = gdbarch_get_unwinder_list (gdbarch);
+ if (table.size () == 0)
+ initialize_frame_unwind_table (table);
return table;
}
@@ -94,27 +71,25 @@ 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<const frame_unwind*>& table = get_frame_unwind_table (gdbarch);
+
+ gdb_assert (osabi_start >= 0);
+
+ table.push_back (unwinder);
+
+ /* Bubble the new entry up to where new unwinders are allowed to be
+ inserterd. */
+ for (int i = table.size() - 1; i > osabi_start; i--)
+ std::swap(table[i], table[i-1]);
}
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;
+ std::vector<const frame_unwind*>& table = get_frame_unwind_table (gdbarch);
- /* 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;
+ table.push_back (unwinder);
}
/* Call SNIFFER from UNWINDER. If it succeeded set UNWINDER for
@@ -187,9 +162,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 ();
@@ -204,8 +176,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<const frame_unwind*> 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"));
@@ -346,7 +320,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<const frame_unwind*> table = get_frame_unwind_table (gdbarch);
ui_out *uiout = current_uiout;
ui_out_emit_table table_emitter (uiout, 2, -1, "FrameUnwinders");
@@ -354,11 +328,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 (const struct frame_unwind* 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.c b/gdb/gdbarch.c
index 9319571deba..a238d5749b7 100644
--- a/gdb/gdbarch.c
+++ b/gdb/gdbarch.c
@@ -27,6 +27,7 @@
/* Maintain the struct gdbarch object. */
+#include <vector>
struct gdbarch
{
/* Has this architecture been fully initialized? */
@@ -36,6 +37,8 @@ struct gdbarch
auto_obstack obstack;
/* Registry. */
registry<gdbarch> registry_fields;
+ /* list of frame unwinders. */
+ std::vector<const frame_unwind *> unwinders;
/* basic architectural information. */
const struct bfd_arch_info * bfd_arch_info;
diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h
index 77d3406779f..1434d61e600 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<TYPE> (gdbarch_obstack ((GDBARCH)))
+/* Return the vector of unwinders stored in a gdbarch object. */
+
+std::vector<const frame_unwind*>& gdbarch_get_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 4b4db667ca4..bff66cc39d3 100755
--- a/gdb/gdbarch.py
+++ b/gdb/gdbarch.py
@@ -125,6 +125,7 @@ with open("gdbarch.c", "w") as f:
print(file=f)
print("/* Maintain the struct gdbarch object. */", file=f)
print(file=f)
+ print("#include <vector>", file=f)
#
# The struct definition body.
#
@@ -137,6 +138,8 @@ with open("gdbarch.c", "w") as f:
print(" auto_obstack obstack;", file=f)
print(" /* Registry. */", file=f)
print(" registry<gdbarch> registry_fields;", file=f)
+ print(" /* list of frame unwinders. */", file=f)
+ print(" std::vector<const frame_unwind *> unwinders;", file=f)
print(file=f)
print(" /* basic architectural information. */", file=f)
for c in filter(info, components):
--
2.44.0
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v2 2/5] gdb: add "unwinder class" to frame unwinders
2024-04-08 20:19 [PATCH v2 0/5] Modernize frame unwinders and add disable feature Guinevere Larsen
2024-04-08 20:19 ` [PATCH v2 1/5] gdb: make gdbarch store a vector of frame unwinders Guinevere Larsen
@ 2024-04-08 20:19 ` Guinevere Larsen
2024-04-08 20:19 ` [PATCH v2 3/5] gdb: Migrate frame unwinders to use C++ classes Guinevere Larsen
` (4 subsequent siblings)
6 siblings, 0 replies; 12+ messages in thread
From: Guinevere Larsen @ 2024-04-08 20:19 UTC (permalink / raw)
To: gdb-patches; +Cc: Guinevere Larsen
A future patch will add a way to disable certain unwinders based on
different characteristics. This patch aims to make it more convenient
to disable related unwinders in bulk, such as architecture specific
ones, by indentifying all unwinders by which part of the code adds it.
The classes, and explanations, are as follows:
* GDB: An internal unwinder, added by GDB core, such as the unwinder
for dummy frames;
* EXTENSION: Unwinders added by extension languages;
* DEBUGINFO: Unwinders installed by the debug info reader;
* ARCH: Unwinders installed by the architecture specific code.
---
gdb/aarch64-tdep.c | 2 ++
gdb/alpha-mdebug-tdep.c | 1 +
gdb/alpha-tdep.c | 2 ++
gdb/amd64-obsd-tdep.c | 1 +
gdb/amd64-tdep.c | 4 ++++
gdb/amd64-windows-tdep.c | 1 +
gdb/amdgpu-tdep.c | 1 +
gdb/arc-tdep.c | 2 ++
gdb/arm-tdep.c | 5 +++++
gdb/avr-tdep.c | 1 +
gdb/bfin-tdep.c | 1 +
gdb/bpf-tdep.c | 1 +
gdb/cris-tdep.c | 2 ++
gdb/csky-tdep.c | 2 ++
gdb/dummy-frame.c | 1 +
gdb/dwarf2/frame-tailcall.c | 1 +
gdb/dwarf2/frame.c | 2 ++
gdb/frame-unwind.c | 27 +++++++++++++++++++++++++--
gdb/frame-unwind.h | 17 +++++++++++++++++
gdb/frv-linux-tdep.c | 1 +
gdb/frv-tdep.c | 1 +
gdb/ft32-tdep.c | 1 +
gdb/h8300-tdep.c | 1 +
gdb/hppa-linux-tdep.c | 1 +
gdb/hppa-tdep.c | 3 +++
gdb/i386-obsd-tdep.c | 1 +
gdb/i386-tdep.c | 5 +++++
gdb/ia64-tdep.c | 4 ++++
gdb/inline-frame.c | 1 +
gdb/iq2000-tdep.c | 1 +
gdb/jit.c | 1 +
gdb/lm32-tdep.c | 1 +
gdb/loongarch-tdep.c | 1 +
gdb/m32c-tdep.c | 1 +
gdb/m32r-linux-tdep.c | 1 +
gdb/m32r-tdep.c | 1 +
gdb/m68hc11-tdep.c | 1 +
gdb/m68k-linux-tdep.c | 1 +
gdb/m68k-tdep.c | 1 +
gdb/mep-tdep.c | 1 +
gdb/microblaze-tdep.c | 1 +
gdb/mips-sde-tdep.c | 1 +
gdb/mips-tdep.c | 4 ++++
gdb/mn10300-tdep.c | 1 +
gdb/moxie-tdep.c | 1 +
gdb/msp430-tdep.c | 1 +
gdb/nds32-tdep.c | 2 ++
gdb/nios2-tdep.c | 2 ++
gdb/or1k-tdep.c | 1 +
gdb/ppc-fbsd-tdep.c | 1 +
gdb/ppc-obsd-tdep.c | 1 +
gdb/python/py-unwind.c | 1 +
gdb/record-btrace.c | 2 ++
gdb/riscv-tdep.c | 1 +
gdb/rl78-tdep.c | 1 +
gdb/rs6000-aix-tdep.c | 1 +
gdb/rs6000-tdep.c | 2 ++
gdb/rx-tdep.c | 2 ++
gdb/s12z-tdep.c | 1 +
gdb/s390-linux-tdep.c | 1 +
gdb/s390-tdep.c | 2 ++
gdb/sentinel-frame.c | 1 +
gdb/sh-tdep.c | 2 ++
gdb/sparc-netbsd-tdep.c | 1 +
gdb/sparc-obsd-tdep.c | 1 +
gdb/sparc-sol2-tdep.c | 1 +
gdb/sparc-tdep.c | 1 +
gdb/sparc64-fbsd-tdep.c | 1 +
gdb/sparc64-netbsd-tdep.c | 1 +
gdb/sparc64-obsd-tdep.c | 2 ++
gdb/sparc64-sol2-tdep.c | 1 +
gdb/sparc64-tdep.c | 1 +
gdb/tic6x-tdep.c | 2 ++
gdb/tilegx-tdep.c | 1 +
gdb/tramp-frame.c | 1 +
gdb/v850-tdep.c | 1 +
gdb/vax-tdep.c | 1 +
gdb/xstormy16-tdep.c | 1 +
gdb/xtensa-tdep.c | 1 +
gdb/z80-tdep.c | 1 +
80 files changed, 154 insertions(+), 2 deletions(-)
diff --git a/gdb/aarch64-tdep.c b/gdb/aarch64-tdep.c
index 545ec872fd8..4c22d3705f5 100644
--- a/gdb/aarch64-tdep.c
+++ b/gdb/aarch64-tdep.c
@@ -1207,6 +1207,7 @@ static frame_unwind aarch64_prologue_unwind =
{
"aarch64 prologue",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
aarch64_prologue_frame_unwind_stop_reason,
aarch64_prologue_this_id,
aarch64_prologue_prev_register,
@@ -1302,6 +1303,7 @@ static frame_unwind aarch64_stub_unwind =
{
"aarch64 stub",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
aarch64_stub_frame_unwind_stop_reason,
aarch64_stub_this_id,
aarch64_prologue_prev_register,
diff --git a/gdb/alpha-mdebug-tdep.c b/gdb/alpha-mdebug-tdep.c
index abded2ac192..b087afabae7 100644
--- a/gdb/alpha-mdebug-tdep.c
+++ b/gdb/alpha-mdebug-tdep.c
@@ -334,6 +334,7 @@ static const struct frame_unwind alpha_mdebug_frame_unwind =
{
"alpha mdebug",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
alpha_mdebug_frame_this_id,
alpha_mdebug_frame_prev_register,
diff --git a/gdb/alpha-tdep.c b/gdb/alpha-tdep.c
index c93bd69657f..dd3556d6ae0 100644
--- a/gdb/alpha-tdep.c
+++ b/gdb/alpha-tdep.c
@@ -1010,6 +1010,7 @@ static const struct frame_unwind alpha_sigtramp_frame_unwind =
{
"alpha sigtramp",
SIGTRAMP_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
alpha_sigtramp_frame_this_id,
alpha_sigtramp_frame_prev_register,
@@ -1429,6 +1430,7 @@ static const struct frame_unwind alpha_heuristic_frame_unwind =
{
"alpha prologue",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
alpha_heuristic_frame_this_id,
alpha_heuristic_frame_prev_register,
diff --git a/gdb/amd64-obsd-tdep.c b/gdb/amd64-obsd-tdep.c
index f6f63bbf8ed..059628cd7f0 100644
--- a/gdb/amd64-obsd-tdep.c
+++ b/gdb/amd64-obsd-tdep.c
@@ -408,6 +408,7 @@ static const struct frame_unwind amd64obsd_trapframe_unwind =
which really is not what we want here. */
"amd64 openbsd trap",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
amd64obsd_trapframe_this_id,
amd64obsd_trapframe_prev_register,
diff --git a/gdb/amd64-tdep.c b/gdb/amd64-tdep.c
index 0bb7a24cbd0..b3be7dbed82 100644
--- a/gdb/amd64-tdep.c
+++ b/gdb/amd64-tdep.c
@@ -2681,6 +2681,7 @@ static const struct frame_unwind amd64_frame_unwind =
{
"amd64 prologue",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
amd64_frame_unwind_stop_reason,
amd64_frame_this_id,
amd64_frame_prev_register,
@@ -2827,6 +2828,7 @@ static const struct frame_unwind amd64_sigtramp_frame_unwind =
{
"amd64 sigtramp",
SIGTRAMP_FRAME,
+ FRAME_UNWIND_ARCH,
amd64_sigtramp_frame_unwind_stop_reason,
amd64_sigtramp_frame_this_id,
amd64_sigtramp_frame_prev_register,
@@ -3019,6 +3021,7 @@ static const struct frame_unwind amd64_epilogue_override_frame_unwind =
{
"amd64 epilogue override",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
amd64_epilogue_frame_unwind_stop_reason,
amd64_epilogue_frame_this_id,
amd64_frame_prev_register,
@@ -3030,6 +3033,7 @@ static const struct frame_unwind amd64_epilogue_frame_unwind =
{
"amd64 epilogue",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
amd64_epilogue_frame_unwind_stop_reason,
amd64_epilogue_frame_this_id,
amd64_frame_prev_register,
diff --git a/gdb/amd64-windows-tdep.c b/gdb/amd64-windows-tdep.c
index a559d967b3c..d395e3a73f2 100644
--- a/gdb/amd64-windows-tdep.c
+++ b/gdb/amd64-windows-tdep.c
@@ -1184,6 +1184,7 @@ static const struct frame_unwind amd64_windows_frame_unwind =
{
"amd64 windows",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
&amd64_windows_frame_this_id,
&amd64_windows_frame_prev_register,
diff --git a/gdb/amdgpu-tdep.c b/gdb/amdgpu-tdep.c
index 49996aeefc3..679098a778f 100644
--- a/gdb/amdgpu-tdep.c
+++ b/gdb/amdgpu-tdep.c
@@ -894,6 +894,7 @@ amdgpu_frame_prev_register (const frame_info_ptr &this_frame, void **this_cache,
static const frame_unwind amdgpu_frame_unwind = {
"amdgpu",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
amdgpu_frame_this_id,
amdgpu_frame_prev_register,
diff --git a/gdb/arc-tdep.c b/gdb/arc-tdep.c
index 5684f324233..373c392f700 100644
--- a/gdb/arc-tdep.c
+++ b/gdb/arc-tdep.c
@@ -1912,6 +1912,7 @@ arc_sigtramp_frame_sniffer (const struct frame_unwind *self,
static const struct frame_unwind arc_frame_unwind = {
"arc prologue",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
arc_frame_this_id,
arc_frame_prev_register,
@@ -1928,6 +1929,7 @@ static const struct frame_unwind arc_frame_unwind = {
static const struct frame_unwind arc_sigtramp_frame_unwind = {
"arc sigtramp",
SIGTRAMP_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
arc_sigtramp_frame_this_id,
arc_sigtramp_frame_prev_register,
diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index b4062a8f922..acee2d5b95f 100644
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -2471,6 +2471,7 @@ arm_prologue_prev_register (const frame_info_ptr &this_frame,
static frame_unwind arm_prologue_unwind = {
"arm prologue",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
arm_prologue_unwind_stop_reason,
arm_prologue_this_id,
arm_prologue_prev_register,
@@ -3190,6 +3191,7 @@ arm_exidx_unwind_sniffer (const struct frame_unwind *self,
struct frame_unwind arm_exidx_unwind = {
"arm exidx",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
arm_prologue_this_id,
arm_prologue_prev_register,
@@ -3300,6 +3302,7 @@ static const struct frame_unwind arm_epilogue_frame_unwind =
{
"arm epilogue",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
arm_epilogue_frame_this_id,
arm_epilogue_frame_prev_register,
@@ -3429,6 +3432,7 @@ arm_stub_unwind_sniffer (const struct frame_unwind *self,
struct frame_unwind arm_stub_unwind = {
"arm stub",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
arm_stub_this_id,
arm_prologue_prev_register,
@@ -3955,6 +3959,7 @@ struct frame_unwind arm_m_exception_unwind =
{
"arm m exception lockup sec_fnc",
SIGTRAMP_FRAME,
+ FRAME_UNWIND_ARCH,
arm_m_exception_frame_unwind_stop_reason,
arm_m_exception_this_id,
arm_m_exception_prev_register,
diff --git a/gdb/avr-tdep.c b/gdb/avr-tdep.c
index be95034abd5..d3b6f949843 100644
--- a/gdb/avr-tdep.c
+++ b/gdb/avr-tdep.c
@@ -1157,6 +1157,7 @@ avr_frame_prev_register (const frame_info_ptr &this_frame,
static const struct frame_unwind avr_frame_unwind = {
"avr prologue",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
avr_frame_this_id,
avr_frame_prev_register,
diff --git a/gdb/bfin-tdep.c b/gdb/bfin-tdep.c
index dbc339d9336..5400857a929 100644
--- a/gdb/bfin-tdep.c
+++ b/gdb/bfin-tdep.c
@@ -375,6 +375,7 @@ static const struct frame_unwind bfin_frame_unwind =
{
"bfin prologue",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
bfin_frame_this_id,
bfin_frame_prev_register,
diff --git a/gdb/bpf-tdep.c b/gdb/bpf-tdep.c
index 098a08aa7e7..83bee2bf676 100644
--- a/gdb/bpf-tdep.c
+++ b/gdb/bpf-tdep.c
@@ -185,6 +185,7 @@ static const struct frame_unwind bpf_frame_unwind =
{
"bpf prologue",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
bpf_frame_unwind_stop_reason,
bpf_frame_this_id,
bpf_frame_prev_register,
diff --git a/gdb/cris-tdep.c b/gdb/cris-tdep.c
index dd013d531ab..7345dd2d668 100644
--- a/gdb/cris-tdep.c
+++ b/gdb/cris-tdep.c
@@ -438,6 +438,7 @@ static const struct frame_unwind cris_sigtramp_frame_unwind =
{
"cris sigtramp",
SIGTRAMP_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
cris_sigtramp_frame_this_id,
cris_sigtramp_frame_prev_register,
@@ -903,6 +904,7 @@ static const struct frame_unwind cris_frame_unwind =
{
"cris prologue",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
cris_frame_this_id,
cris_frame_prev_register,
diff --git a/gdb/csky-tdep.c b/gdb/csky-tdep.c
index 5f0fd3d7170..fc13865e22f 100644
--- a/gdb/csky-tdep.c
+++ b/gdb/csky-tdep.c
@@ -2161,6 +2161,7 @@ csky_frame_prev_register (const frame_info_ptr &this_frame,
static const struct frame_unwind csky_unwind_cache = {
"cski prologue",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
csky_frame_this_id,
csky_frame_prev_register,
@@ -2295,6 +2296,7 @@ csky_stub_prev_register (const frame_info_ptr &this_frame,
static frame_unwind csky_stub_unwind = {
"csky stub",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
csky_stub_this_id,
csky_stub_prev_register,
diff --git a/gdb/dummy-frame.c b/gdb/dummy-frame.c
index 7d72fe032ee..09513ea4aad 100644
--- a/gdb/dummy-frame.c
+++ b/gdb/dummy-frame.c
@@ -379,6 +379,7 @@ const struct frame_unwind dummy_frame_unwind =
{
"dummy",
DUMMY_FRAME,
+ FRAME_UNWIND_GDB,
default_frame_unwind_stop_reason,
dummy_frame_this_id,
dummy_frame_prev_register,
diff --git a/gdb/dwarf2/frame-tailcall.c b/gdb/dwarf2/frame-tailcall.c
index bcbe41f7933..45ba3a70262 100644
--- a/gdb/dwarf2/frame-tailcall.c
+++ b/gdb/dwarf2/frame-tailcall.c
@@ -473,6 +473,7 @@ const struct frame_unwind dwarf2_tailcall_frame_unwind =
{
"dwarf2 tailcall",
TAILCALL_FRAME,
+ FRAME_UNWIND_DEBUGINFO,
default_frame_unwind_stop_reason,
tailcall_frame_this_id,
tailcall_frame_prev_register,
diff --git a/gdb/dwarf2/frame.c b/gdb/dwarf2/frame.c
index 9ebf3ac4ac4..7bbe6cab22d 100644
--- a/gdb/dwarf2/frame.c
+++ b/gdb/dwarf2/frame.c
@@ -1343,6 +1343,7 @@ static const struct frame_unwind dwarf2_frame_unwind =
{
"dwarf2",
NORMAL_FRAME,
+ FRAME_UNWIND_DEBUGINFO,
dwarf2_frame_unwind_stop_reason,
dwarf2_frame_this_id,
dwarf2_frame_prev_register,
@@ -1355,6 +1356,7 @@ static const struct frame_unwind dwarf2_signal_frame_unwind =
{
"dwarf2 signal",
SIGTRAMP_FRAME,
+ FRAME_UNWIND_DEBUGINFO,
dwarf2_frame_unwind_stop_reason,
dwarf2_frame_this_id,
dwarf2_frame_prev_register,
diff --git a/gdb/frame-unwind.c b/gdb/frame-unwind.c
index 36c3d81435d..fa0ea1cba4c 100644
--- a/gdb/frame-unwind.c
+++ b/gdb/frame-unwind.c
@@ -30,10 +30,22 @@
#include "cli/cli-cmds.h"
#include "inferior.h"
+#include <map>
+
/* If an unwinder should be prepended to the list, this is the
index in which it should be inserted. */
static int osabi_start = -1;
+/* Conversion list between the enum for frame_unwind_class and
+ string. */
+static std::map<enum frame_unwind_class, const char *> unwind_class_conversion =
+{
+ {FRAME_UNWIND_GDB, "GDB"},
+ {FRAME_UNWIND_ARCH, "ARCH"},
+ {FRAME_UNWIND_EXTENSION, "EXTENSION"},
+ {FRAME_UNWIND_DEBUGINFO, "DEBUGINFO"},
+};
+
/* Start the table out with a few default sniffers. OSABI code
can't override this. */
static void
@@ -67,11 +79,19 @@ get_frame_unwind_table (struct gdbarch *gdbarch)
return table;
}
+static const char *
+frame_unwinder_class_str (frame_unwind_class uclass)
+{
+ auto location = unwind_class_conversion.find (uclass);
+ gdb_assert (location != unwind_class_conversion.end ());
+ return location->second;
+}
+
void
frame_unwind_prepend_unwinder (struct gdbarch *gdbarch,
const struct frame_unwind *unwinder)
{
- std::vector<const frame_unwind*>& table = get_frame_unwind_table (gdbarch);
+ std::vector<const frame_unwind *>& table = get_frame_unwind_table (gdbarch);
gdb_assert (osabi_start >= 0);
@@ -323,19 +343,22 @@ maintenance_info_frame_unwinders (const char *args, int from_tty)
std::vector<const frame_unwind*> table = get_frame_unwind_table (gdbarch);
ui_out *uiout = current_uiout;
- ui_out_emit_table table_emitter (uiout, 2, -1, "FrameUnwinders");
+ ui_out_emit_table table_emitter (uiout, 3, -1, "FrameUnwinders");
uiout->table_header (27, ui_left, "name", "Name");
uiout->table_header (25, ui_left, "type", "Type");
+ uiout->table_header (9, ui_left, "class", "Class");
uiout->table_body ();
for (const struct frame_unwind* unwinder: table)
{
const char *name = unwinder->name;
const char *type = frame_type_str (unwinder->type);
+ const char *uclass = frame_unwinder_class_str (unwinder->unwinder_class);
ui_out_emit_list tuple_emitter (uiout, nullptr);
uiout->field_string ("name", name);
uiout->field_string ("type", type);
+ uiout->field_string ("class", uclass);
uiout->text ("\n");
}
}
diff --git a/gdb/frame-unwind.h b/gdb/frame-unwind.h
index 53fcd6869e9..deab4f7dbfb 100644
--- a/gdb/frame-unwind.h
+++ b/gdb/frame-unwind.h
@@ -156,12 +156,29 @@ typedef void (frame_dealloc_cache_ftype) (frame_info *self,
typedef gdbarch *(frame_prev_arch_ftype) (const frame_info_ptr &this_frame,
void **this_prologue_cache);
+/* Unwinders are classified by what part of GDB code created it. */
+enum frame_unwind_class
+{
+ /* This is mostly handled by core GDB code. */
+ FRAME_UNWIND_GDB,
+ /* This unwinder was added by one of GDB's extension languages. */
+ FRAME_UNWIND_EXTENSION,
+ /* The unwinder was created and mostly handles debug information. */
+ FRAME_UNWIND_DEBUGINFO,
+ /* The unwinder was created and handles target dependent things. */
+ FRAME_UNWIND_ARCH,
+};
+
struct frame_unwind
{
const char *name;
/* The frame's type. Should this instead be a collection of
predicates that test the frame for various attributes? */
enum frame_type type;
+ /* What kind of unwinder is this. It generally follows from where
+ the unwinder was added or where it looks for information to do the
+ unwinding. */
+ enum frame_unwind_class unwinder_class;
/* Should an attribute indicating the frame's address-in-block go
here? */
frame_unwind_stop_reason_ftype *stop_reason;
diff --git a/gdb/frv-linux-tdep.c b/gdb/frv-linux-tdep.c
index 0b13a81c064..874e2b02e8d 100644
--- a/gdb/frv-linux-tdep.c
+++ b/gdb/frv-linux-tdep.c
@@ -335,6 +335,7 @@ static const struct frame_unwind frv_linux_sigtramp_frame_unwind =
{
"frv linux sigtramp",
SIGTRAMP_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
frv_linux_sigtramp_frame_this_id,
frv_linux_sigtramp_frame_prev_register,
diff --git a/gdb/frv-tdep.c b/gdb/frv-tdep.c
index 5c026ebd53a..e443fe22b76 100644
--- a/gdb/frv-tdep.c
+++ b/gdb/frv-tdep.c
@@ -1407,6 +1407,7 @@ frv_frame_prev_register (const frame_info_ptr &this_frame,
static const struct frame_unwind frv_frame_unwind = {
"frv prologue",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
frv_frame_this_id,
frv_frame_prev_register,
diff --git a/gdb/ft32-tdep.c b/gdb/ft32-tdep.c
index c5a48bebe5f..42102bdbb66 100644
--- a/gdb/ft32-tdep.c
+++ b/gdb/ft32-tdep.c
@@ -527,6 +527,7 @@ static const struct frame_unwind ft32_frame_unwind =
{
"ft32 prologue",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
ft32_frame_this_id,
ft32_frame_prev_register,
diff --git a/gdb/h8300-tdep.c b/gdb/h8300-tdep.c
index 32907e29abf..017be737796 100644
--- a/gdb/h8300-tdep.c
+++ b/gdb/h8300-tdep.c
@@ -502,6 +502,7 @@ h8300_frame_prev_register (const frame_info_ptr &this_frame, void **this_cache,
static const struct frame_unwind h8300_frame_unwind = {
"h8300 prologue",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
h8300_frame_this_id,
h8300_frame_prev_register,
diff --git a/gdb/hppa-linux-tdep.c b/gdb/hppa-linux-tdep.c
index 659c265bfb8..6cd7de08308 100644
--- a/gdb/hppa-linux-tdep.c
+++ b/gdb/hppa-linux-tdep.c
@@ -310,6 +310,7 @@ hppa_linux_sigtramp_frame_sniffer (const struct frame_unwind *self,
static const struct frame_unwind hppa_linux_sigtramp_frame_unwind = {
"hppa linux sigtramp",
SIGTRAMP_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
hppa_linux_sigtramp_frame_this_id,
hppa_linux_sigtramp_frame_prev_register,
diff --git a/gdb/hppa-tdep.c b/gdb/hppa-tdep.c
index 8becfd5f9f9..838cc42ec77 100644
--- a/gdb/hppa-tdep.c
+++ b/gdb/hppa-tdep.c
@@ -2286,6 +2286,7 @@ static const struct frame_unwind hppa_frame_unwind =
{
"hppa unwind table",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
hppa_frame_this_id,
hppa_frame_prev_register,
@@ -2399,6 +2400,7 @@ static const struct frame_unwind hppa_fallback_frame_unwind =
{
"hppa prologue",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
hppa_fallback_frame_this_id,
hppa_fallback_frame_prev_register,
@@ -2480,6 +2482,7 @@ hppa_stub_unwind_sniffer (const struct frame_unwind *self,
static const struct frame_unwind hppa_stub_frame_unwind = {
"hppa stub",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
hppa_stub_frame_this_id,
hppa_stub_frame_prev_register,
diff --git a/gdb/i386-obsd-tdep.c b/gdb/i386-obsd-tdep.c
index 6e31567328e..e262528506c 100644
--- a/gdb/i386-obsd-tdep.c
+++ b/gdb/i386-obsd-tdep.c
@@ -395,6 +395,7 @@ static const struct frame_unwind i386obsd_trapframe_unwind = {
frame, but SIGTRAMP_FRAME would print <signal handler called>,
which really is not what we want here. */
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
i386obsd_trapframe_this_id,
i386obsd_trapframe_prev_register,
diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c
index 1b1efad6fa3..57c0253e1de 100644
--- a/gdb/i386-tdep.c
+++ b/gdb/i386-tdep.c
@@ -2199,6 +2199,7 @@ static const struct frame_unwind i386_frame_unwind =
{
"i386 prologue",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
i386_frame_unwind_stop_reason,
i386_frame_this_id,
i386_frame_prev_register,
@@ -2354,6 +2355,7 @@ static const struct frame_unwind i386_epilogue_override_frame_unwind =
{
"i386 epilogue override",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
i386_epilogue_frame_unwind_stop_reason,
i386_epilogue_frame_this_id,
i386_epilogue_frame_prev_register,
@@ -2365,6 +2367,7 @@ static const struct frame_unwind i386_epilogue_frame_unwind =
{
"i386 epilogue",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
i386_epilogue_frame_unwind_stop_reason,
i386_epilogue_frame_this_id,
i386_epilogue_frame_prev_register,
@@ -2447,6 +2450,7 @@ static const struct frame_unwind i386_stack_tramp_frame_unwind =
{
"i386 stack tramp",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
i386_epilogue_frame_unwind_stop_reason,
i386_epilogue_frame_this_id,
i386_epilogue_frame_prev_register,
@@ -2596,6 +2600,7 @@ static const struct frame_unwind i386_sigtramp_frame_unwind =
{
"i386 sigtramp",
SIGTRAMP_FRAME,
+ FRAME_UNWIND_ARCH,
i386_sigtramp_frame_unwind_stop_reason,
i386_sigtramp_frame_this_id,
i386_sigtramp_frame_prev_register,
diff --git a/gdb/ia64-tdep.c b/gdb/ia64-tdep.c
index f49a8d6b558..e214d963f5f 100644
--- a/gdb/ia64-tdep.c
+++ b/gdb/ia64-tdep.c
@@ -2165,6 +2165,7 @@ static const struct frame_unwind ia64_frame_unwind =
{
"ia64 prologue",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
&ia64_frame_this_id,
&ia64_frame_prev_register,
@@ -2354,6 +2355,7 @@ static const struct frame_unwind ia64_sigtramp_frame_unwind =
{
"ia64 sigtramp",
SIGTRAMP_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
ia64_sigtramp_frame_this_id,
ia64_sigtramp_frame_prev_register,
@@ -3014,6 +3016,7 @@ static const struct frame_unwind ia64_libunwind_frame_unwind =
{
"ia64 libunwind",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
ia64_libunwind_frame_this_id,
ia64_libunwind_frame_prev_register,
@@ -3103,6 +3106,7 @@ static const struct frame_unwind ia64_libunwind_sigtramp_frame_unwind =
{
"ia64 libunwind sigtramp",
SIGTRAMP_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
ia64_libunwind_sigtramp_frame_this_id,
ia64_libunwind_sigtramp_frame_prev_register,
diff --git a/gdb/inline-frame.c b/gdb/inline-frame.c
index f65f39be40d..2da4cad5f9d 100644
--- a/gdb/inline-frame.c
+++ b/gdb/inline-frame.c
@@ -267,6 +267,7 @@ inline_frame_sniffer (const struct frame_unwind *self,
const struct frame_unwind inline_frame_unwind = {
"inline",
INLINE_FRAME,
+ FRAME_UNWIND_GDB,
default_frame_unwind_stop_reason,
inline_frame_this_id,
inline_frame_prev_register,
diff --git a/gdb/iq2000-tdep.c b/gdb/iq2000-tdep.c
index b9d95bbc267..ea249060e6b 100644
--- a/gdb/iq2000-tdep.c
+++ b/gdb/iq2000-tdep.c
@@ -426,6 +426,7 @@ iq2000_frame_this_id (const frame_info_ptr &this_frame, void **this_cache,
static const struct frame_unwind iq2000_frame_unwind = {
"iq2000 prologue",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
iq2000_frame_this_id,
iq2000_frame_prev_register,
diff --git a/gdb/jit.c b/gdb/jit.c
index 3843b84b0e6..db1b64d0b0b 100644
--- a/gdb/jit.c
+++ b/gdb/jit.c
@@ -1107,6 +1107,7 @@ static const struct frame_unwind jit_frame_unwind =
{
"jit",
NORMAL_FRAME,
+ FRAME_UNWIND_EXTENSION,
default_frame_unwind_stop_reason,
jit_frame_this_id,
jit_frame_prev_register,
diff --git a/gdb/lm32-tdep.c b/gdb/lm32-tdep.c
index 478f1edf3e6..7fbf403dd28 100644
--- a/gdb/lm32-tdep.c
+++ b/gdb/lm32-tdep.c
@@ -449,6 +449,7 @@ lm32_frame_prev_register (const frame_info_ptr &this_frame,
static const struct frame_unwind lm32_frame_unwind = {
"lm32 prologue",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
lm32_frame_this_id,
lm32_frame_prev_register,
diff --git a/gdb/loongarch-tdep.c b/gdb/loongarch-tdep.c
index 149fbd55db9..c86a2f9ea9c 100644
--- a/gdb/loongarch-tdep.c
+++ b/gdb/loongarch-tdep.c
@@ -452,6 +452,7 @@ loongarch_frame_prev_register (const frame_info_ptr &this_frame,
static const struct frame_unwind loongarch_frame_unwind = {
"loongarch prologue",
/*.type =*/NORMAL_FRAME,
+ /*.unwinder_class=*/FRAME_UNWIND_ARCH,
/*.stop_reason =*/default_frame_unwind_stop_reason,
/*.this_id =*/loongarch_frame_this_id,
/*.prev_register =*/loongarch_frame_prev_register,
diff --git a/gdb/m32c-tdep.c b/gdb/m32c-tdep.c
index 33ec44349d7..0f74cf1458e 100644
--- a/gdb/m32c-tdep.c
+++ b/gdb/m32c-tdep.c
@@ -1957,6 +1957,7 @@ m32c_prev_register (const frame_info_ptr &this_frame,
static const struct frame_unwind m32c_unwind = {
"m32c prologue",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
m32c_this_id,
m32c_prev_register,
diff --git a/gdb/m32r-linux-tdep.c b/gdb/m32r-linux-tdep.c
index a28e1135840..ae8e364d794 100644
--- a/gdb/m32r-linux-tdep.c
+++ b/gdb/m32r-linux-tdep.c
@@ -303,6 +303,7 @@ m32r_linux_sigtramp_frame_sniffer (const struct frame_unwind *self,
static const struct frame_unwind m32r_linux_sigtramp_frame_unwind = {
"m32r linux sigtramp",
SIGTRAMP_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
m32r_linux_sigtramp_frame_this_id,
m32r_linux_sigtramp_frame_prev_register,
diff --git a/gdb/m32r-tdep.c b/gdb/m32r-tdep.c
index 215df88b21c..1743884ba3c 100644
--- a/gdb/m32r-tdep.c
+++ b/gdb/m32r-tdep.c
@@ -833,6 +833,7 @@ m32r_frame_prev_register (const frame_info_ptr &this_frame,
static const struct frame_unwind m32r_frame_unwind = {
"m32r prologue",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
m32r_frame_this_id,
m32r_frame_prev_register,
diff --git a/gdb/m68hc11-tdep.c b/gdb/m68hc11-tdep.c
index 70b3f129d5a..44a032157af 100644
--- a/gdb/m68hc11-tdep.c
+++ b/gdb/m68hc11-tdep.c
@@ -938,6 +938,7 @@ m68hc11_frame_prev_register (const frame_info_ptr &this_frame,
static const struct frame_unwind m68hc11_frame_unwind = {
"m68hc11 prologue",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
m68hc11_frame_this_id,
m68hc11_frame_prev_register,
diff --git a/gdb/m68k-linux-tdep.c b/gdb/m68k-linux-tdep.c
index 4874db720db..e1d2f51522a 100644
--- a/gdb/m68k-linux-tdep.c
+++ b/gdb/m68k-linux-tdep.c
@@ -317,6 +317,7 @@ static const struct frame_unwind m68k_linux_sigtramp_frame_unwind =
{
"m68k linux sigtramp",
SIGTRAMP_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
m68k_linux_sigtramp_frame_this_id,
m68k_linux_sigtramp_frame_prev_register,
diff --git a/gdb/m68k-tdep.c b/gdb/m68k-tdep.c
index f73f58de90a..0fcd340eee7 100644
--- a/gdb/m68k-tdep.c
+++ b/gdb/m68k-tdep.c
@@ -1010,6 +1010,7 @@ static const struct frame_unwind m68k_frame_unwind =
{
"m68k prologue",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
m68k_frame_this_id,
m68k_frame_prev_register,
diff --git a/gdb/mep-tdep.c b/gdb/mep-tdep.c
index fdb589134da..004a9f44dca 100644
--- a/gdb/mep-tdep.c
+++ b/gdb/mep-tdep.c
@@ -2063,6 +2063,7 @@ mep_frame_prev_register (const frame_info_ptr &this_frame,
static const struct frame_unwind mep_frame_unwind = {
"mep prologue",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
mep_frame_this_id,
mep_frame_prev_register,
diff --git a/gdb/microblaze-tdep.c b/gdb/microblaze-tdep.c
index 1886c973bdc..8d53d193dd4 100644
--- a/gdb/microblaze-tdep.c
+++ b/gdb/microblaze-tdep.c
@@ -481,6 +481,7 @@ static const struct frame_unwind microblaze_frame_unwind =
{
"microblaze prologue",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
microblaze_frame_this_id,
microblaze_frame_prev_register,
diff --git a/gdb/mips-sde-tdep.c b/gdb/mips-sde-tdep.c
index 90988cdfdac..18cb9485639 100644
--- a/gdb/mips-sde-tdep.c
+++ b/gdb/mips-sde-tdep.c
@@ -164,6 +164,7 @@ static const struct frame_unwind mips_sde_frame_unwind =
{
"mips sde sigtramp",
SIGTRAMP_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
mips_sde_frame_this_id,
mips_sde_frame_prev_register,
diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c
index c34971c60c1..92630f329d8 100644
--- a/gdb/mips-tdep.c
+++ b/gdb/mips-tdep.c
@@ -2932,6 +2932,7 @@ static const struct frame_unwind mips_insn16_frame_unwind =
{
"mips insn16 prologue",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
mips_insn16_frame_this_id,
mips_insn16_frame_prev_register,
@@ -3368,6 +3369,7 @@ static const struct frame_unwind mips_micro_frame_unwind =
{
"mips micro prologue",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
mips_micro_frame_this_id,
mips_micro_frame_prev_register,
@@ -3747,6 +3749,7 @@ static const struct frame_unwind mips_insn32_frame_unwind =
{
"mips insn32 prologue",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
mips_insn32_frame_this_id,
mips_insn32_frame_prev_register,
@@ -3864,6 +3867,7 @@ static const struct frame_unwind mips_stub_frame_unwind =
{
"mips stub",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
mips_stub_frame_this_id,
mips_stub_frame_prev_register,
diff --git a/gdb/mn10300-tdep.c b/gdb/mn10300-tdep.c
index cd70f8adb68..63fc62c734f 100644
--- a/gdb/mn10300-tdep.c
+++ b/gdb/mn10300-tdep.c
@@ -1129,6 +1129,7 @@ mn10300_frame_prev_register (const frame_info_ptr &this_frame,
static const struct frame_unwind mn10300_frame_unwind = {
"mn10300 prologue",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
mn10300_frame_this_id,
mn10300_frame_prev_register,
diff --git a/gdb/moxie-tdep.c b/gdb/moxie-tdep.c
index a6b783e5c84..d4684a0d3c3 100644
--- a/gdb/moxie-tdep.c
+++ b/gdb/moxie-tdep.c
@@ -587,6 +587,7 @@ moxie_frame_prev_register (const frame_info_ptr &this_frame,
static const struct frame_unwind moxie_frame_unwind = {
"moxie prologue",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
moxie_frame_this_id,
moxie_frame_prev_register,
diff --git a/gdb/msp430-tdep.c b/gdb/msp430-tdep.c
index 9d90a6e2784..765b15b87e7 100644
--- a/gdb/msp430-tdep.c
+++ b/gdb/msp430-tdep.c
@@ -544,6 +544,7 @@ msp430_prev_register (const frame_info_ptr &this_frame,
static const struct frame_unwind msp430_unwind = {
"msp430 prologue",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
msp430_this_id,
msp430_prev_register,
diff --git a/gdb/nds32-tdep.c b/gdb/nds32-tdep.c
index bbbc80b37cd..6fd5c3c7a28 100644
--- a/gdb/nds32-tdep.c
+++ b/gdb/nds32-tdep.c
@@ -991,6 +991,7 @@ static const struct frame_unwind nds32_frame_unwind =
{
"nds32 prologue",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
nds32_frame_this_id,
nds32_frame_prev_register,
@@ -1375,6 +1376,7 @@ static const struct frame_unwind nds32_epilogue_frame_unwind =
{
"nds32 epilogue",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
nds32_epilogue_frame_this_id,
nds32_epilogue_frame_prev_register,
diff --git a/gdb/nios2-tdep.c b/gdb/nios2-tdep.c
index da2616b436e..179c3d72a49 100644
--- a/gdb/nios2-tdep.c
+++ b/gdb/nios2-tdep.c
@@ -1980,6 +1980,7 @@ static const struct frame_unwind nios2_frame_unwind =
{
"nios2 prologue",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
nios2_frame_this_id,
nios2_frame_prev_register,
@@ -2081,6 +2082,7 @@ static const struct frame_unwind nios2_stub_frame_unwind =
{
"nios2 stub",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
nios2_stub_frame_this_id,
nios2_stub_frame_prev_register,
diff --git a/gdb/or1k-tdep.c b/gdb/or1k-tdep.c
index d4ac0ac1b9d..b1d7911de98 100644
--- a/gdb/or1k-tdep.c
+++ b/gdb/or1k-tdep.c
@@ -1127,6 +1127,7 @@ or1k_frame_prev_register (const frame_info_ptr &this_frame,
static const struct frame_unwind or1k_frame_unwind = {
"or1k prologue",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
or1k_frame_this_id,
or1k_frame_prev_register,
diff --git a/gdb/ppc-fbsd-tdep.c b/gdb/ppc-fbsd-tdep.c
index 8f86607d5d1..f7f99660e29 100644
--- a/gdb/ppc-fbsd-tdep.c
+++ b/gdb/ppc-fbsd-tdep.c
@@ -264,6 +264,7 @@ ppcfbsd_sigtramp_frame_prev_register (const frame_info_ptr &this_frame,
static const struct frame_unwind ppcfbsd_sigtramp_frame_unwind = {
"ppc freebsd sigtramp",
SIGTRAMP_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
ppcfbsd_sigtramp_frame_this_id,
ppcfbsd_sigtramp_frame_prev_register,
diff --git a/gdb/ppc-obsd-tdep.c b/gdb/ppc-obsd-tdep.c
index b50a24c6af7..f7e642ee05c 100644
--- a/gdb/ppc-obsd-tdep.c
+++ b/gdb/ppc-obsd-tdep.c
@@ -233,6 +233,7 @@ ppcobsd_sigtramp_frame_prev_register (const frame_info_ptr &this_frame,
static const struct frame_unwind ppcobsd_sigtramp_frame_unwind = {
"ppc openbsd sigtramp",
SIGTRAMP_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
ppcobsd_sigtramp_frame_this_id,
ppcobsd_sigtramp_frame_prev_register,
diff --git a/gdb/python/py-unwind.c b/gdb/python/py-unwind.c
index 58bcf40e1c9..668835e0444 100644
--- a/gdb/python/py-unwind.c
+++ b/gdb/python/py-unwind.c
@@ -964,6 +964,7 @@ pyuw_on_new_gdbarch (gdbarch *newarch)
unwinder->name = "python";
unwinder->type = NORMAL_FRAME;
+ unwinder->unwinder_class = FRAME_UNWIND_EXTENSION;
unwinder->stop_reason = default_frame_unwind_stop_reason;
unwinder->this_id = pyuw_this_id;
unwinder->prev_register = pyuw_prev_register;
diff --git a/gdb/record-btrace.c b/gdb/record-btrace.c
index 0ef1dfbe652..2bf3e214446 100644
--- a/gdb/record-btrace.c
+++ b/gdb/record-btrace.c
@@ -1897,6 +1897,7 @@ const struct frame_unwind record_btrace_frame_unwind =
{
"record-btrace",
NORMAL_FRAME,
+ FRAME_UNWIND_GDB,
record_btrace_frame_unwind_stop_reason,
record_btrace_frame_this_id,
record_btrace_frame_prev_register,
@@ -1909,6 +1910,7 @@ const struct frame_unwind record_btrace_tailcall_frame_unwind =
{
"record-btrace tailcall",
TAILCALL_FRAME,
+ FRAME_UNWIND_GDB,
record_btrace_frame_unwind_stop_reason,
record_btrace_frame_this_id,
record_btrace_frame_prev_register,
diff --git a/gdb/riscv-tdep.c b/gdb/riscv-tdep.c
index f86a37988cb..860a895bc06 100644
--- a/gdb/riscv-tdep.c
+++ b/gdb/riscv-tdep.c
@@ -3903,6 +3903,7 @@ static const struct frame_unwind riscv_frame_unwind =
{
/*.name =*/ "riscv prologue",
/*.type =*/ NORMAL_FRAME,
+ /*.unwinder_class=*/FRAME_UNWIND_ARCH,
/*.stop_reason =*/ default_frame_unwind_stop_reason,
/*.this_id =*/ riscv_frame_this_id,
/*.prev_register =*/ riscv_frame_prev_register,
diff --git a/gdb/rl78-tdep.c b/gdb/rl78-tdep.c
index acd0731dd9f..4af93c37df1 100644
--- a/gdb/rl78-tdep.c
+++ b/gdb/rl78-tdep.c
@@ -1186,6 +1186,7 @@ static const struct frame_unwind rl78_unwind =
{
"rl78 prologue",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
rl78_this_id,
rl78_prev_register,
diff --git a/gdb/rs6000-aix-tdep.c b/gdb/rs6000-aix-tdep.c
index 5111f4f55c0..ea44765c7fa 100644
--- a/gdb/rs6000-aix-tdep.c
+++ b/gdb/rs6000-aix-tdep.c
@@ -330,6 +330,7 @@ aix_sighandle_frame_sniffer (const struct frame_unwind *self,
static const struct frame_unwind aix_sighandle_frame_unwind = {
"rs6000 aix sighandle",
SIGTRAMP_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
aix_sighandle_frame_this_id,
aix_sighandle_frame_prev_register,
diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c
index b7ba0042bb7..5d1fde07145 100644
--- a/gdb/rs6000-tdep.c
+++ b/gdb/rs6000-tdep.c
@@ -3841,6 +3841,7 @@ static const struct frame_unwind rs6000_frame_unwind =
{
"rs6000 prologue",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
rs6000_frame_this_id,
rs6000_frame_prev_register,
@@ -3982,6 +3983,7 @@ static const struct frame_unwind rs6000_epilogue_frame_unwind =
{
"rs6000 epilogue",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
rs6000_epilogue_frame_this_id, rs6000_epilogue_frame_prev_register,
NULL,
diff --git a/gdb/rx-tdep.c b/gdb/rx-tdep.c
index 844e36023e0..b35d477204e 100644
--- a/gdb/rx-tdep.c
+++ b/gdb/rx-tdep.c
@@ -633,6 +633,7 @@ rx_exception_sniffer (const struct frame_unwind *self,
static const struct frame_unwind rx_frame_unwind = {
"rx prologue",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
rx_frame_this_id,
rx_frame_prev_register,
@@ -647,6 +648,7 @@ static const struct frame_unwind rx_exception_unwind = {
"rx exception",
/* SIGTRAMP_FRAME could be used here, but backtraces are less informative. */
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
rx_frame_this_id,
rx_frame_prev_register,
diff --git a/gdb/s12z-tdep.c b/gdb/s12z-tdep.c
index 29d4ef3b71c..bb0c8bef327 100644
--- a/gdb/s12z-tdep.c
+++ b/gdb/s12z-tdep.c
@@ -444,6 +444,7 @@ s12z_frame_prev_register (const frame_info_ptr &this_frame,
static const struct frame_unwind s12z_frame_unwind = {
"s12z prologue",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
s12z_frame_this_id,
s12z_frame_prev_register,
diff --git a/gdb/s390-linux-tdep.c b/gdb/s390-linux-tdep.c
index bc1db550d2e..556fad64926 100644
--- a/gdb/s390-linux-tdep.c
+++ b/gdb/s390-linux-tdep.c
@@ -544,6 +544,7 @@ s390_sigtramp_frame_sniffer (const struct frame_unwind *self,
static const struct frame_unwind s390_sigtramp_frame_unwind = {
"s390 linux sigtramp",
SIGTRAMP_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
s390_sigtramp_frame_this_id,
s390_sigtramp_frame_prev_register,
diff --git a/gdb/s390-tdep.c b/gdb/s390-tdep.c
index 519e3eb0a42..065c52e6442 100644
--- a/gdb/s390-tdep.c
+++ b/gdb/s390-tdep.c
@@ -2648,6 +2648,7 @@ s390_frame_prev_register (const frame_info_ptr &this_frame,
static const struct frame_unwind s390_frame_unwind = {
"s390 prologue",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
s390_frame_this_id,
s390_frame_prev_register,
@@ -2742,6 +2743,7 @@ s390_stub_frame_sniffer (const struct frame_unwind *self,
static const struct frame_unwind s390_stub_frame_unwind = {
"s390 stub",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
s390_stub_frame_this_id,
s390_stub_frame_prev_register,
diff --git a/gdb/sentinel-frame.c b/gdb/sentinel-frame.c
index 4eaeae0d254..9fe4036dbbe 100644
--- a/gdb/sentinel-frame.c
+++ b/gdb/sentinel-frame.c
@@ -82,6 +82,7 @@ const struct frame_unwind sentinel_frame_unwind =
{
"sentinel",
SENTINEL_FRAME,
+ FRAME_UNWIND_GDB,
default_frame_unwind_stop_reason,
sentinel_frame_this_id,
sentinel_frame_prev_register,
diff --git a/gdb/sh-tdep.c b/gdb/sh-tdep.c
index 1c67ea42b04..8491adbb5c1 100644
--- a/gdb/sh-tdep.c
+++ b/gdb/sh-tdep.c
@@ -1931,6 +1931,7 @@ sh_frame_this_id (const frame_info_ptr &this_frame, void **this_cache,
static const struct frame_unwind sh_frame_unwind = {
"sh prologue",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
sh_frame_this_id,
sh_frame_prev_register,
@@ -1998,6 +1999,7 @@ static const struct frame_unwind sh_stub_unwind =
{
"sh stub",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
sh_stub_this_id,
sh_frame_prev_register,
diff --git a/gdb/sparc-netbsd-tdep.c b/gdb/sparc-netbsd-tdep.c
index fc22e66826f..5b3dd067375 100644
--- a/gdb/sparc-netbsd-tdep.c
+++ b/gdb/sparc-netbsd-tdep.c
@@ -252,6 +252,7 @@ static const struct frame_unwind sparc32nbsd_sigcontext_frame_unwind =
{
"sparc32 netbsd sigcontext",
SIGTRAMP_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
sparc32nbsd_sigcontext_frame_this_id,
sparc32nbsd_sigcontext_frame_prev_register,
diff --git a/gdb/sparc-obsd-tdep.c b/gdb/sparc-obsd-tdep.c
index d6166710709..5d42e4e6515 100644
--- a/gdb/sparc-obsd-tdep.c
+++ b/gdb/sparc-obsd-tdep.c
@@ -137,6 +137,7 @@ static const struct frame_unwind sparc32obsd_sigtramp_frame_unwind =
{
"sparc32 openbsd sigtramp",
SIGTRAMP_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
sparc32obsd_sigtramp_frame_this_id,
sparc32obsd_sigtramp_frame_prev_register,
diff --git a/gdb/sparc-sol2-tdep.c b/gdb/sparc-sol2-tdep.c
index aea3766d9b5..bb9c8a549b1 100644
--- a/gdb/sparc-sol2-tdep.c
+++ b/gdb/sparc-sol2-tdep.c
@@ -183,6 +183,7 @@ static const struct frame_unwind sparc32_sol2_sigtramp_frame_unwind =
{
"sparc32 solaris sigtramp",
SIGTRAMP_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
sparc32_sol2_sigtramp_frame_this_id,
sparc32_sol2_sigtramp_frame_prev_register,
diff --git a/gdb/sparc-tdep.c b/gdb/sparc-tdep.c
index fbc27ffcb5e..a40570d6894 100644
--- a/gdb/sparc-tdep.c
+++ b/gdb/sparc-tdep.c
@@ -1349,6 +1349,7 @@ static const struct frame_unwind sparc32_frame_unwind =
{
"sparc32 prologue",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
sparc32_frame_this_id,
sparc32_frame_prev_register,
diff --git a/gdb/sparc64-fbsd-tdep.c b/gdb/sparc64-fbsd-tdep.c
index a30c7c448e5..1d4c075a961 100644
--- a/gdb/sparc64-fbsd-tdep.c
+++ b/gdb/sparc64-fbsd-tdep.c
@@ -200,6 +200,7 @@ static const struct frame_unwind sparc64fbsd_sigtramp_frame_unwind =
{
"sparc64 freebsd sigtramp",
SIGTRAMP_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
sparc64fbsd_sigtramp_frame_this_id,
sparc64fbsd_sigtramp_frame_prev_register,
diff --git a/gdb/sparc64-netbsd-tdep.c b/gdb/sparc64-netbsd-tdep.c
index b101f4970d9..82eb99f57c1 100644
--- a/gdb/sparc64-netbsd-tdep.c
+++ b/gdb/sparc64-netbsd-tdep.c
@@ -226,6 +226,7 @@ static const struct frame_unwind sparc64nbsd_sigcontext_frame_unwind =
{
"sparc64 netbsd sigcontext",
SIGTRAMP_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
sparc64nbsd_sigcontext_frame_this_id,
sparc64nbsd_sigcontext_frame_prev_register,
diff --git a/gdb/sparc64-obsd-tdep.c b/gdb/sparc64-obsd-tdep.c
index 6caeb107b9f..ad69476dac4 100644
--- a/gdb/sparc64-obsd-tdep.c
+++ b/gdb/sparc64-obsd-tdep.c
@@ -223,6 +223,7 @@ static const struct frame_unwind sparc64obsd_frame_unwind =
{
"sparc64 openbsd sigtramp",
SIGTRAMP_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
sparc64obsd_frame_this_id,
sparc64obsd_frame_prev_register,
@@ -307,6 +308,7 @@ static const struct frame_unwind sparc64obsd_trapframe_unwind =
{
"sparc64 openbsd trap",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
sparc64obsd_trapframe_this_id,
sparc64obsd_trapframe_prev_register,
diff --git a/gdb/sparc64-sol2-tdep.c b/gdb/sparc64-sol2-tdep.c
index b7ca4ca1f5b..e8d09e2516e 100644
--- a/gdb/sparc64-sol2-tdep.c
+++ b/gdb/sparc64-sol2-tdep.c
@@ -186,6 +186,7 @@ static const struct frame_unwind sparc64_sol2_sigtramp_frame_unwind =
{
"sparc64 solaris sigtramp",
SIGTRAMP_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
sparc64_sol2_sigtramp_frame_this_id,
sparc64_sol2_sigtramp_frame_prev_register,
diff --git a/gdb/sparc64-tdep.c b/gdb/sparc64-tdep.c
index a55107fa32d..30ee241c5b6 100644
--- a/gdb/sparc64-tdep.c
+++ b/gdb/sparc64-tdep.c
@@ -1137,6 +1137,7 @@ static const struct frame_unwind sparc64_frame_unwind =
{
"sparc64 prologue",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
sparc64_frame_this_id,
sparc64_frame_prev_register,
diff --git a/gdb/tic6x-tdep.c b/gdb/tic6x-tdep.c
index 3a63b0cc25d..bc0465b4635 100644
--- a/gdb/tic6x-tdep.c
+++ b/gdb/tic6x-tdep.c
@@ -455,6 +455,7 @@ static const struct frame_unwind tic6x_frame_unwind =
{
"tic6x prologue",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
tic6x_frame_this_id,
tic6x_frame_prev_register,
@@ -518,6 +519,7 @@ static const struct frame_unwind tic6x_stub_unwind =
{
"tic6x stub",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
tic6x_stub_this_id,
tic6x_frame_prev_register,
diff --git a/gdb/tilegx-tdep.c b/gdb/tilegx-tdep.c
index d5ea93cf503..fc1c01c7ea4 100644
--- a/gdb/tilegx-tdep.c
+++ b/gdb/tilegx-tdep.c
@@ -902,6 +902,7 @@ tilegx_frame_base_address (const frame_info_ptr &this_frame, void **this_cache)
static const struct frame_unwind tilegx_frame_unwind = {
"tilegx prologue",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
tilegx_frame_this_id,
tilegx_frame_prev_register,
diff --git a/gdb/tramp-frame.c b/gdb/tramp-frame.c
index 4b397cbf046..2fcc3814e59 100644
--- a/gdb/tramp-frame.c
+++ b/gdb/tramp-frame.c
@@ -165,6 +165,7 @@ tramp_frame_prepend_unwinder (struct gdbarch *gdbarch,
data->tramp_frame = tramp_frame;
unwinder->type = tramp_frame->frame_type;
unwinder->unwind_data = data;
+ unwinder->unwinder_class = FRAME_UNWIND_GDB;
unwinder->sniffer = tramp_frame_sniffer;
unwinder->stop_reason = default_frame_unwind_stop_reason;
unwinder->this_id = tramp_frame_this_id;
diff --git a/gdb/v850-tdep.c b/gdb/v850-tdep.c
index 6bda14f0fa1..f875a351ac7 100644
--- a/gdb/v850-tdep.c
+++ b/gdb/v850-tdep.c
@@ -1322,6 +1322,7 @@ v850_frame_this_id (const frame_info_ptr &this_frame, void **this_cache,
static const struct frame_unwind v850_frame_unwind = {
"v850 prologue",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
v850_frame_this_id,
v850_frame_prev_register,
diff --git a/gdb/vax-tdep.c b/gdb/vax-tdep.c
index dd00898c298..460a6058d0a 100644
--- a/gdb/vax-tdep.c
+++ b/gdb/vax-tdep.c
@@ -389,6 +389,7 @@ static const struct frame_unwind vax_frame_unwind =
{
"vax prologue",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
vax_frame_this_id,
vax_frame_prev_register,
diff --git a/gdb/xstormy16-tdep.c b/gdb/xstormy16-tdep.c
index 166e6af8527..73fa6ed9c0d 100644
--- a/gdb/xstormy16-tdep.c
+++ b/gdb/xstormy16-tdep.c
@@ -730,6 +730,7 @@ xstormy16_frame_base_address (const frame_info_ptr &this_frame, void **this_cach
static const struct frame_unwind xstormy16_frame_unwind = {
"xstormy16 prologue",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
xstormy16_frame_this_id,
xstormy16_frame_prev_register,
diff --git a/gdb/xtensa-tdep.c b/gdb/xtensa-tdep.c
index 2c3d468d8be..a0801466c42 100644
--- a/gdb/xtensa-tdep.c
+++ b/gdb/xtensa-tdep.c
@@ -1500,6 +1500,7 @@ xtensa_unwind =
{
"xtensa prologue",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
xtensa_frame_this_id,
xtensa_frame_prev_register,
diff --git a/gdb/z80-tdep.c b/gdb/z80-tdep.c
index ee8e36b1867..ea78a01cbfc 100644
--- a/gdb/z80-tdep.c
+++ b/gdb/z80-tdep.c
@@ -1067,6 +1067,7 @@ z80_frame_unwind =
{
"z80",
NORMAL_FRAME,
+ FRAME_UNWIND_ARCH,
default_frame_unwind_stop_reason,
z80_frame_this_id,
z80_frame_prev_register,
--
2.44.0
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v2 3/5] gdb: Migrate frame unwinders to use C++ classes
2024-04-08 20:19 [PATCH v2 0/5] Modernize frame unwinders and add disable feature Guinevere Larsen
2024-04-08 20:19 ` [PATCH v2 1/5] gdb: make gdbarch store a vector of frame unwinders Guinevere Larsen
2024-04-08 20:19 ` [PATCH v2 2/5] gdb: add "unwinder class" to " Guinevere Larsen
@ 2024-04-08 20:19 ` Guinevere Larsen
2024-04-12 14:40 ` Guinevere Larsen
2024-04-08 20:19 ` [PATCH v2 4/5] gdb: introduce ability to disable frame unwinders Guinevere Larsen
` (3 subsequent siblings)
6 siblings, 1 reply; 12+ messages in thread
From: Guinevere Larsen @ 2024-04-08 20:19 UTC (permalink / raw)
To: gdb-patches; +Cc: Guinevere Larsen
Frame unwinders have historically been a structure populated with
callback pointers, so that architectures (or other specific unwinders)
could install their own way to handle the inferior. However, since
moving to c++, we could use polymorphism to get the same functionality
in a more readable way. Polymorphism also makes it simpler to add new
functionality to all frame unwinders, since all that's required is
adding it to the base class.
As part of the changes to add support to disabling frame unwinders,
this commit makes the first baby step in using polymorphism for the
frame unwinders, by making frame_unwind a virtual class, and adds a
couple of new classes. The main class added is frame_unwind_legacy,
which works the same as the previous structs, using function pointers
as callbacks. This class was added to allow the transition to happen
piecemeal. New unwinders should instead follow the lead of the other
classes implemented.
2 of the others, frame_unwind_python and frame_unwind_trampoline, were added
because it seemed simpler at the moment to do that instead of reworking
the dynamic allocation to work with the legacy class, and can be used as
an example to future implementations.
Finally, the cygwin unwinder was converted to a class since it was most
of the way there already.
---
gdb/aarch64-tdep.c | 10 +--
gdb/alpha-mdebug-tdep.c | 5 +-
gdb/alpha-tdep.c | 10 +--
gdb/amd64-obsd-tdep.c | 5 +-
gdb/amd64-tdep.c | 20 ++---
gdb/amd64-windows-tdep.c | 5 +-
gdb/amdgpu-tdep.c | 6 +-
gdb/arc-tdep.c | 8 +-
gdb/arm-tdep.c | 24 +++---
gdb/avr-tdep.c | 4 +-
gdb/bfin-tdep.c | 5 +-
gdb/bpf-tdep.c | 5 +-
gdb/cris-tdep.c | 10 +--
gdb/csky-tdep.c | 8 +-
gdb/dummy-frame.c | 7 +-
gdb/dummy-frame.h | 2 +-
gdb/dwarf2/frame-tailcall.c | 5 +-
gdb/dwarf2/frame-tailcall.h | 2 +-
gdb/dwarf2/frame.c | 14 ++--
gdb/frame-unwind.c | 61 ++++++++++++++-
gdb/frame-unwind.h | 150 +++++++++++++++++++++++++++++++++---
gdb/frame.c | 28 +++----
gdb/frv-linux-tdep.c | 5 +-
gdb/frv-tdep.c | 4 +-
gdb/ft32-tdep.c | 5 +-
gdb/h8300-tdep.c | 4 +-
gdb/hppa-linux-tdep.c | 4 +-
gdb/hppa-tdep.c | 14 ++--
gdb/i386-obsd-tdep.c | 4 +-
gdb/i386-tdep.c | 25 +++---
gdb/ia64-tdep.c | 20 ++---
gdb/inline-frame.c | 4 +-
gdb/inline-frame.h | 2 +-
gdb/iq2000-tdep.c | 4 +-
gdb/jit.c | 5 +-
gdb/lm32-tdep.c | 4 +-
gdb/loongarch-tdep.c | 6 +-
gdb/m32c-tdep.c | 4 +-
gdb/m32r-linux-tdep.c | 4 +-
gdb/m32r-tdep.c | 4 +-
gdb/m68hc11-tdep.c | 4 +-
gdb/m68k-linux-tdep.c | 5 +-
gdb/m68k-tdep.c | 5 +-
gdb/mep-tdep.c | 4 +-
gdb/microblaze-tdep.c | 5 +-
gdb/mips-sde-tdep.c | 5 +-
gdb/mips-tdep.c | 20 ++---
gdb/mn10300-tdep.c | 4 +-
gdb/moxie-tdep.c | 4 +-
gdb/msp430-tdep.c | 4 +-
gdb/nds32-tdep.c | 12 ++-
gdb/nios2-tdep.c | 10 +--
gdb/or1k-tdep.c | 6 +-
gdb/ppc-fbsd-tdep.c | 4 +-
gdb/ppc-obsd-tdep.c | 4 +-
gdb/python/py-unwind.c | 51 +++++++++---
gdb/record-btrace.c | 10 +--
gdb/record.h | 4 +-
gdb/riscv-tdep.c | 7 +-
gdb/rl78-tdep.c | 5 +-
gdb/rs6000-aix-tdep.c | 4 +-
gdb/rs6000-tdep.c | 10 +--
gdb/rx-tdep.c | 8 +-
gdb/s12z-tdep.c | 6 +-
gdb/s390-linux-tdep.c | 4 +-
gdb/s390-tdep.c | 8 +-
gdb/sentinel-frame.c | 7 +-
gdb/sentinel-frame.h | 2 +-
gdb/sh-tdep.c | 9 +--
gdb/sparc-netbsd-tdep.c | 5 +-
gdb/sparc-obsd-tdep.c | 5 +-
gdb/sparc-sol2-tdep.c | 5 +-
gdb/sparc-tdep.c | 5 +-
gdb/sparc64-fbsd-tdep.c | 5 +-
gdb/sparc64-netbsd-tdep.c | 5 +-
gdb/sparc64-obsd-tdep.c | 10 +--
gdb/sparc64-sol2-tdep.c | 5 +-
gdb/sparc64-tdep.c | 5 +-
gdb/tic6x-tdep.c | 10 +--
gdb/tilegx-tdep.c | 4 +-
gdb/tramp-frame.c | 57 +++++++++++---
gdb/v850-tdep.c | 4 +-
gdb/vax-tdep.c | 5 +-
gdb/windows-tdep.c | 33 ++++----
gdb/windows-tdep.h | 16 +++-
gdb/xstormy16-tdep.c | 4 +-
gdb/xtensa-tdep.c | 6 +-
gdb/z80-tdep.c | 6 +-
88 files changed, 561 insertions(+), 381 deletions(-)
diff --git a/gdb/aarch64-tdep.c b/gdb/aarch64-tdep.c
index 4c22d3705f5..c1a9ad67193 100644
--- a/gdb/aarch64-tdep.c
+++ b/gdb/aarch64-tdep.c
@@ -1203,8 +1203,7 @@ aarch64_prologue_prev_register (const frame_info_ptr &this_frame,
}
/* AArch64 prologue unwinder. */
-static frame_unwind aarch64_prologue_unwind =
-{
+static const frame_unwind_legacy aarch64_prologue_unwind (
"aarch64 prologue",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -1213,7 +1212,7 @@ static frame_unwind aarch64_prologue_unwind =
aarch64_prologue_prev_register,
NULL,
default_frame_sniffer
-};
+);
/* Allocate and fill in *THIS_CACHE with information about the prologue of
*THIS_FRAME. Do not do this is if *THIS_CACHE was already allocated.
@@ -1299,8 +1298,7 @@ aarch64_stub_unwind_sniffer (const struct frame_unwind *self,
}
/* AArch64 stub unwinder. */
-static frame_unwind aarch64_stub_unwind =
-{
+static const frame_unwind_legacy aarch64_stub_unwind (
"aarch64 stub",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -1309,7 +1307,7 @@ static frame_unwind aarch64_stub_unwind =
aarch64_prologue_prev_register,
NULL,
aarch64_stub_unwind_sniffer
-};
+);
/* Return the frame base address of *THIS_FRAME. */
diff --git a/gdb/alpha-mdebug-tdep.c b/gdb/alpha-mdebug-tdep.c
index b087afabae7..b43849c203d 100644
--- a/gdb/alpha-mdebug-tdep.c
+++ b/gdb/alpha-mdebug-tdep.c
@@ -330,8 +330,7 @@ alpha_mdebug_frame_sniffer (const struct frame_unwind *self,
return 1;
}
-static const struct frame_unwind alpha_mdebug_frame_unwind =
-{
+static const struct frame_unwind_legacy alpha_mdebug_frame_unwind (
"alpha mdebug",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -340,7 +339,7 @@ static const struct frame_unwind alpha_mdebug_frame_unwind =
alpha_mdebug_frame_prev_register,
NULL,
alpha_mdebug_frame_sniffer
-};
+);
static CORE_ADDR
alpha_mdebug_frame_base_address (const frame_info_ptr &this_frame,
diff --git a/gdb/alpha-tdep.c b/gdb/alpha-tdep.c
index dd3556d6ae0..4f7526e5b19 100644
--- a/gdb/alpha-tdep.c
+++ b/gdb/alpha-tdep.c
@@ -1006,8 +1006,7 @@ alpha_sigtramp_frame_sniffer (const struct frame_unwind *self,
return 0;
}
-static const struct frame_unwind alpha_sigtramp_frame_unwind =
-{
+static const struct frame_unwind_legacy alpha_sigtramp_frame_unwind (
"alpha sigtramp",
SIGTRAMP_FRAME,
FRAME_UNWIND_ARCH,
@@ -1016,7 +1015,7 @@ static const struct frame_unwind alpha_sigtramp_frame_unwind =
alpha_sigtramp_frame_prev_register,
NULL,
alpha_sigtramp_frame_sniffer
-};
+);
\f
@@ -1426,8 +1425,7 @@ alpha_heuristic_frame_prev_register (const frame_info_ptr &this_frame,
return trad_frame_get_prev_register (this_frame, info->saved_regs, regnum);
}
-static const struct frame_unwind alpha_heuristic_frame_unwind =
-{
+static const struct frame_unwind_legacy alpha_heuristic_frame_unwind (
"alpha prologue",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -1436,7 +1434,7 @@ static const struct frame_unwind alpha_heuristic_frame_unwind =
alpha_heuristic_frame_prev_register,
NULL,
default_frame_sniffer
-};
+);
static CORE_ADDR
alpha_heuristic_frame_base_address (const frame_info_ptr &this_frame,
diff --git a/gdb/amd64-obsd-tdep.c b/gdb/amd64-obsd-tdep.c
index 059628cd7f0..b4ff53eeab4 100644
--- a/gdb/amd64-obsd-tdep.c
+++ b/gdb/amd64-obsd-tdep.c
@@ -401,8 +401,7 @@ amd64obsd_trapframe_sniffer (const struct frame_unwind *self,
|| (startswith (name, "Xintr"))));
}
-static const struct frame_unwind amd64obsd_trapframe_unwind =
-{
+static const struct frame_unwind_legacy amd64obsd_trapframe_unwind (
/* FIXME: kettenis/20051219: This really is more like an interrupt
frame, but SIGTRAMP_FRAME would print <signal handler called>,
which really is not what we want here. */
@@ -414,7 +413,7 @@ static const struct frame_unwind amd64obsd_trapframe_unwind =
amd64obsd_trapframe_prev_register,
NULL,
amd64obsd_trapframe_sniffer
-};
+);
\f
static void
diff --git a/gdb/amd64-tdep.c b/gdb/amd64-tdep.c
index b3be7dbed82..1b18b67c9ee 100644
--- a/gdb/amd64-tdep.c
+++ b/gdb/amd64-tdep.c
@@ -2677,8 +2677,7 @@ amd64_frame_prev_register (const frame_info_ptr &this_frame, void **this_cache,
return frame_unwind_got_register (this_frame, regnum, regnum);
}
-static const struct frame_unwind amd64_frame_unwind =
-{
+static const struct frame_unwind_legacy amd64_frame_unwind (
"amd64 prologue",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -2687,7 +2686,7 @@ static const struct frame_unwind amd64_frame_unwind =
amd64_frame_prev_register,
NULL,
default_frame_sniffer
-};
+);
\f
/* Generate a bytecode expression to get the value of the saved PC. */
@@ -2824,8 +2823,7 @@ amd64_sigtramp_frame_sniffer (const struct frame_unwind *self,
return 0;
}
-static const struct frame_unwind amd64_sigtramp_frame_unwind =
-{
+static const struct frame_unwind_legacy amd64_sigtramp_frame_unwind (
"amd64 sigtramp",
SIGTRAMP_FRAME,
FRAME_UNWIND_ARCH,
@@ -2834,7 +2832,7 @@ static const struct frame_unwind amd64_sigtramp_frame_unwind =
amd64_sigtramp_frame_prev_register,
NULL,
amd64_sigtramp_frame_sniffer
-};
+);
\f
static CORE_ADDR
@@ -3017,8 +3015,7 @@ amd64_epilogue_frame_this_id (const frame_info_ptr &this_frame,
(*this_id) = frame_id_build (cache->base + 16, cache->pc);
}
-static const struct frame_unwind amd64_epilogue_override_frame_unwind =
-{
+static const struct frame_unwind_legacy amd64_epilogue_override_frame_unwind (
"amd64 epilogue override",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -3027,10 +3024,9 @@ static const struct frame_unwind amd64_epilogue_override_frame_unwind =
amd64_frame_prev_register,
NULL,
amd64_epilogue_override_frame_sniffer
-};
+);
-static const struct frame_unwind amd64_epilogue_frame_unwind =
-{
+static const struct frame_unwind_legacy amd64_epilogue_frame_unwind (
"amd64 epilogue",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -3039,7 +3035,7 @@ static const struct frame_unwind amd64_epilogue_frame_unwind =
amd64_frame_prev_register,
NULL,
amd64_epilogue_frame_sniffer
-};
+);
static struct frame_id
amd64_dummy_id (struct gdbarch *gdbarch, const frame_info_ptr &this_frame)
diff --git a/gdb/amd64-windows-tdep.c b/gdb/amd64-windows-tdep.c
index d395e3a73f2..fecce06fefa 100644
--- a/gdb/amd64-windows-tdep.c
+++ b/gdb/amd64-windows-tdep.c
@@ -1180,8 +1180,7 @@ amd64_windows_frame_this_id (const frame_info_ptr &this_frame, void **this_cache
/* Windows x64 SEH unwinder. */
-static const struct frame_unwind amd64_windows_frame_unwind =
-{
+static const struct frame_unwind_legacy amd64_windows_frame_unwind (
"amd64 windows",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -1190,7 +1189,7 @@ static const struct frame_unwind amd64_windows_frame_unwind =
&amd64_windows_frame_prev_register,
NULL,
default_frame_sniffer
-};
+);
/* Implement the "skip_prologue" gdbarch method. */
diff --git a/gdb/amdgpu-tdep.c b/gdb/amdgpu-tdep.c
index 679098a778f..4f02a7efd63 100644
--- a/gdb/amdgpu-tdep.c
+++ b/gdb/amdgpu-tdep.c
@@ -891,7 +891,7 @@ amdgpu_frame_prev_register (const frame_info_ptr &this_frame, void **this_cache,
return frame_unwind_got_register (this_frame, regnum, regnum);
}
-static const frame_unwind amdgpu_frame_unwind = {
+static const frame_unwind_legacy amdgpu_frame_unwind (
"amdgpu",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -901,8 +901,8 @@ static const frame_unwind amdgpu_frame_unwind = {
nullptr,
default_frame_sniffer,
nullptr,
- nullptr,
-};
+ nullptr
+);
static int
print_insn_amdgpu (bfd_vma memaddr, struct disassemble_info *info)
diff --git a/gdb/arc-tdep.c b/gdb/arc-tdep.c
index 373c392f700..d25c577b62d 100644
--- a/gdb/arc-tdep.c
+++ b/gdb/arc-tdep.c
@@ -1909,7 +1909,7 @@ arc_sigtramp_frame_sniffer (const struct frame_unwind *self,
the fallback unwinder, we use the default frame sniffer, which always
accepts the frame. */
-static const struct frame_unwind arc_frame_unwind = {
+static const struct frame_unwind_legacy arc_frame_unwind (
"arc prologue",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -1920,13 +1920,13 @@ static const struct frame_unwind arc_frame_unwind = {
default_frame_sniffer,
NULL,
NULL
-};
+);
/* Structure defining the ARC signal frame unwind functions. Custom
sniffer is used, because this frame must be accepted only in the right
context. */
-static const struct frame_unwind arc_sigtramp_frame_unwind = {
+static const struct frame_unwind_legacy arc_sigtramp_frame_unwind (
"arc sigtramp",
SIGTRAMP_FRAME,
FRAME_UNWIND_ARCH,
@@ -1937,7 +1937,7 @@ static const struct frame_unwind arc_sigtramp_frame_unwind = {
arc_sigtramp_frame_sniffer,
NULL,
NULL
-};
+);
static const struct frame_base arc_normal_base = {
diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index acee2d5b95f..a2785ae3358 100644
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -2468,7 +2468,7 @@ arm_prologue_prev_register (const frame_info_ptr &this_frame,
prev_regnum);
}
-static frame_unwind arm_prologue_unwind = {
+static const frame_unwind_legacy arm_prologue_unwind (
"arm prologue",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -2477,7 +2477,7 @@ static frame_unwind arm_prologue_unwind = {
arm_prologue_prev_register,
NULL,
default_frame_sniffer
-};
+);
/* Maintain a list of ARM exception table entries per objfile, similar to the
list of mapping symbols. We only cache entries for standard ARM-defined
@@ -3188,7 +3188,7 @@ arm_exidx_unwind_sniffer (const struct frame_unwind *self,
return 1;
}
-struct frame_unwind arm_exidx_unwind = {
+struct frame_unwind_legacy arm_exidx_unwind (
"arm exidx",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -3197,7 +3197,7 @@ struct frame_unwind arm_exidx_unwind = {
arm_prologue_prev_register,
NULL,
arm_exidx_unwind_sniffer
-};
+);
static struct arm_prologue_cache *
arm_make_epilogue_frame_cache (const frame_info_ptr &this_frame)
@@ -3298,8 +3298,7 @@ arm_epilogue_frame_sniffer (const struct frame_unwind *self,
/* Frame unwinder from epilogue. */
-static const struct frame_unwind arm_epilogue_frame_unwind =
-{
+static const struct frame_unwind_legacy arm_epilogue_frame_unwind (
"arm epilogue",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -3307,8 +3306,8 @@ static const struct frame_unwind arm_epilogue_frame_unwind =
arm_epilogue_frame_this_id,
arm_epilogue_frame_prev_register,
NULL,
- arm_epilogue_frame_sniffer,
-};
+ arm_epilogue_frame_sniffer
+);
/* Recognize GCC's trampoline for thumb call-indirect. If we are in a
trampoline, return the target PC. Otherwise return 0.
@@ -3429,7 +3428,7 @@ arm_stub_unwind_sniffer (const struct frame_unwind *self,
return 0;
}
-struct frame_unwind arm_stub_unwind = {
+struct frame_unwind_legacy arm_stub_unwind (
"arm stub",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -3438,7 +3437,7 @@ struct frame_unwind arm_stub_unwind = {
arm_prologue_prev_register,
NULL,
arm_stub_unwind_sniffer
-};
+);
/* Put here the code to store, into CACHE->saved_regs, the addresses
of the saved registers of frame described by THIS_FRAME. CACHE is
@@ -3955,8 +3954,7 @@ arm_m_exception_unwind_sniffer (const struct frame_unwind *self,
/* Frame unwinder for M-profile exceptions (EXC_RETURN on stack),
lockup and secure/nonsecure interstate function calls (FNC_RETURN). */
-struct frame_unwind arm_m_exception_unwind =
-{
+struct frame_unwind_legacy arm_m_exception_unwind (
"arm m exception lockup sec_fnc",
SIGTRAMP_FRAME,
FRAME_UNWIND_ARCH,
@@ -3965,7 +3963,7 @@ struct frame_unwind arm_m_exception_unwind =
arm_m_exception_prev_register,
NULL,
arm_m_exception_unwind_sniffer
-};
+);
static CORE_ADDR
arm_normal_frame_base (const frame_info_ptr &this_frame, void **this_cache)
diff --git a/gdb/avr-tdep.c b/gdb/avr-tdep.c
index d3b6f949843..82ce125f1e9 100644
--- a/gdb/avr-tdep.c
+++ b/gdb/avr-tdep.c
@@ -1154,7 +1154,7 @@ avr_frame_prev_register (const frame_info_ptr &this_frame,
return trad_frame_get_prev_register (this_frame, info->saved_regs, regnum);
}
-static const struct frame_unwind avr_frame_unwind = {
+static const struct frame_unwind_legacy avr_frame_unwind (
"avr prologue",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -1163,7 +1163,7 @@ static const struct frame_unwind avr_frame_unwind = {
avr_frame_prev_register,
NULL,
default_frame_sniffer
-};
+);
static CORE_ADDR
avr_frame_base_address (const frame_info_ptr &this_frame, void **this_cache)
diff --git a/gdb/bfin-tdep.c b/gdb/bfin-tdep.c
index 5400857a929..3849002c40e 100644
--- a/gdb/bfin-tdep.c
+++ b/gdb/bfin-tdep.c
@@ -371,8 +371,7 @@ bfin_frame_prev_register (const frame_info_ptr &this_frame,
return frame_unwind_got_register (this_frame, regnum, regnum);
}
-static const struct frame_unwind bfin_frame_unwind =
-{
+static const struct frame_unwind_legacy bfin_frame_unwind (
"bfin prologue",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -381,7 +380,7 @@ static const struct frame_unwind bfin_frame_unwind =
bfin_frame_prev_register,
NULL,
default_frame_sniffer
-};
+);
/* Check for "[--SP] = <reg>;" insns. These are appear in function
prologues to save misc registers onto the stack. */
diff --git a/gdb/bpf-tdep.c b/gdb/bpf-tdep.c
index 83bee2bf676..6f1ae050225 100644
--- a/gdb/bpf-tdep.c
+++ b/gdb/bpf-tdep.c
@@ -181,8 +181,7 @@ bpf_frame_prev_register (const frame_info_ptr &this_frame,
/* Frame unwinder machinery for BPF. */
-static const struct frame_unwind bpf_frame_unwind =
-{
+static const struct frame_unwind_legacy bpf_frame_unwind (
"bpf prologue",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -191,7 +190,7 @@ static const struct frame_unwind bpf_frame_unwind =
bpf_frame_prev_register,
NULL,
default_frame_sniffer
-};
+);
\f
/* Breakpoints. */
diff --git a/gdb/cris-tdep.c b/gdb/cris-tdep.c
index 7345dd2d668..c91d3a6019d 100644
--- a/gdb/cris-tdep.c
+++ b/gdb/cris-tdep.c
@@ -434,8 +434,7 @@ cris_sigtramp_frame_sniffer (const struct frame_unwind *self,
return 0;
}
-static const struct frame_unwind cris_sigtramp_frame_unwind =
-{
+static const struct frame_unwind_legacy cris_sigtramp_frame_unwind (
"cris sigtramp",
SIGTRAMP_FRAME,
FRAME_UNWIND_ARCH,
@@ -444,7 +443,7 @@ static const struct frame_unwind cris_sigtramp_frame_unwind =
cris_sigtramp_frame_prev_register,
NULL,
cris_sigtramp_frame_sniffer
-};
+);
static int
crisv32_single_step_through_delay (struct gdbarch *gdbarch,
@@ -900,8 +899,7 @@ cris_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
return sp;
}
-static const struct frame_unwind cris_frame_unwind =
-{
+static const struct frame_unwind_legacy cris_frame_unwind (
"cris prologue",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -910,7 +908,7 @@ static const struct frame_unwind cris_frame_unwind =
cris_frame_prev_register,
NULL,
default_frame_sniffer
-};
+);
static CORE_ADDR
cris_frame_base_address (const frame_info_ptr &this_frame, void **this_cache)
diff --git a/gdb/csky-tdep.c b/gdb/csky-tdep.c
index fc13865e22f..3313803c19a 100644
--- a/gdb/csky-tdep.c
+++ b/gdb/csky-tdep.c
@@ -2158,7 +2158,7 @@ csky_frame_prev_register (const frame_info_ptr &this_frame,
/* Data structures for the normal prologue-analysis-based
unwinder. */
-static const struct frame_unwind csky_unwind_cache = {
+static const struct frame_unwind_legacy csky_unwind_cache (
"cski prologue",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -2169,7 +2169,7 @@ static const struct frame_unwind csky_unwind_cache = {
default_frame_sniffer,
NULL,
NULL
-};
+);
static CORE_ADDR
csky_check_long_branch (const frame_info_ptr &frame, CORE_ADDR pc)
@@ -2293,7 +2293,7 @@ csky_stub_prev_register (const frame_info_ptr &this_frame,
prev_regnum);
}
-static frame_unwind csky_stub_unwind = {
+static const frame_unwind_legacy csky_stub_unwind (
"csky stub",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -2302,7 +2302,7 @@ static frame_unwind csky_stub_unwind = {
csky_stub_prev_register,
NULL,
csky_stub_unwind_sniffer
-};
+);
/* Implement the this_base, this_locals, and this_args hooks
for the normal unwinder. */
diff --git a/gdb/dummy-frame.c b/gdb/dummy-frame.c
index 09513ea4aad..045c2e44872 100644
--- a/gdb/dummy-frame.c
+++ b/gdb/dummy-frame.c
@@ -375,8 +375,7 @@ dummy_frame_this_id (const frame_info_ptr &this_frame,
(*this_id) = cache->this_id;
}
-const struct frame_unwind dummy_frame_unwind =
-{
+const struct frame_unwind_legacy dummy_frame_unwind (
"dummy",
DUMMY_FRAME,
FRAME_UNWIND_GDB,
@@ -384,8 +383,8 @@ const struct frame_unwind dummy_frame_unwind =
dummy_frame_this_id,
dummy_frame_prev_register,
NULL,
- dummy_frame_sniffer,
-};
+ dummy_frame_sniffer
+);
/* See dummy-frame.h. */
diff --git a/gdb/dummy-frame.h b/gdb/dummy-frame.h
index 7d963ad9beb..a1341797acd 100644
--- a/gdb/dummy-frame.h
+++ b/gdb/dummy-frame.h
@@ -54,7 +54,7 @@ extern void dummy_frame_discard (frame_id dummy_id, thread_info *thread);
/* If the PC falls in a dummy frame, return a dummy frame
unwinder. */
-extern const struct frame_unwind dummy_frame_unwind;
+extern const struct frame_unwind_legacy dummy_frame_unwind;
/* Destructor for dummy_frame. DATA is supplied by registrant.
REGISTERS_VALID is 1 for dummy_frame_pop, 0 for dummy_frame_discard. */
diff --git a/gdb/dwarf2/frame-tailcall.c b/gdb/dwarf2/frame-tailcall.c
index 45ba3a70262..20a98f436aa 100644
--- a/gdb/dwarf2/frame-tailcall.c
+++ b/gdb/dwarf2/frame-tailcall.c
@@ -469,8 +469,7 @@ tailcall_frame_prev_arch (const frame_info_ptr &this_frame,
/* Virtual tail call frame unwinder if dwarf2_tailcall_sniffer_first finds
a chain to create. */
-const struct frame_unwind dwarf2_tailcall_frame_unwind =
-{
+const struct frame_unwind_legacy dwarf2_tailcall_frame_unwind (
"dwarf2 tailcall",
TAILCALL_FRAME,
FRAME_UNWIND_DEBUGINFO,
@@ -481,7 +480,7 @@ const struct frame_unwind dwarf2_tailcall_frame_unwind =
tailcall_frame_sniffer,
tailcall_frame_dealloc_cache,
tailcall_frame_prev_arch
-};
+);
void _initialize_tailcall_frame ();
void
diff --git a/gdb/dwarf2/frame-tailcall.h b/gdb/dwarf2/frame-tailcall.h
index 3f49487ac2a..3569c7dd3e2 100644
--- a/gdb/dwarf2/frame-tailcall.h
+++ b/gdb/dwarf2/frame-tailcall.h
@@ -34,6 +34,6 @@ extern struct value *
dwarf2_tailcall_prev_register_first (const frame_info_ptr &this_frame,
void **tailcall_cachep, int regnum);
-extern const struct frame_unwind dwarf2_tailcall_frame_unwind;
+extern const struct frame_unwind_legacy dwarf2_tailcall_frame_unwind;
#endif /* !DWARF2_FRAME_TAILCALL_H */
diff --git a/gdb/dwarf2/frame.c b/gdb/dwarf2/frame.c
index 7bbe6cab22d..6386ac20899 100644
--- a/gdb/dwarf2/frame.c
+++ b/gdb/dwarf2/frame.c
@@ -1331,16 +1331,15 @@ dwarf2_frame_sniffer (const struct frame_unwind *self,
if (fde->cie->signal_frame
|| dwarf2_frame_signal_frame_p (get_frame_arch (this_frame),
this_frame))
- return self->type == SIGTRAMP_FRAME;
+ return self->type () == SIGTRAMP_FRAME;
- if (self->type != NORMAL_FRAME)
+ if (self->type () != NORMAL_FRAME)
return 0;
return 1;
}
-static const struct frame_unwind dwarf2_frame_unwind =
-{
+static const struct frame_unwind_legacy dwarf2_frame_unwind (
"dwarf2",
NORMAL_FRAME,
FRAME_UNWIND_DEBUGINFO,
@@ -1350,10 +1349,9 @@ static const struct frame_unwind dwarf2_frame_unwind =
NULL,
dwarf2_frame_sniffer,
dwarf2_frame_dealloc_cache
-};
+);
-static const struct frame_unwind dwarf2_signal_frame_unwind =
-{
+static const struct frame_unwind_legacy dwarf2_signal_frame_unwind (
"dwarf2 signal",
SIGTRAMP_FRAME,
FRAME_UNWIND_DEBUGINFO,
@@ -1365,7 +1363,7 @@ static const struct frame_unwind dwarf2_signal_frame_unwind =
/* TAILCALL_CACHE can never be in such frame to need dealloc_cache. */
NULL
-};
+);
/* Append the DWARF-2 frame unwinders to GDBARCH's list. */
diff --git a/gdb/frame-unwind.c b/gdb/frame-unwind.c
index fa0ea1cba4c..fd3d3b378ab 100644
--- a/gdb/frame-unwind.c
+++ b/gdb/frame-unwind.c
@@ -128,7 +128,7 @@ frame_unwind_try_unwinder (const frame_info_ptr &this_frame, void **this_cache,
try
{
- frame_debug_printf ("trying unwinder \"%s\"", unwinder->name);
+ frame_debug_printf ("trying unwinder \"%s\"", unwinder->name ());
res = unwinder->sniffer (unwinder, this_frame, this_cache);
}
catch (const gdb_exception &ex)
@@ -334,6 +334,59 @@ frame_unwind_got_address (const frame_info_ptr &frame, int regnum,
return reg_val;
}
+/* This method just passes the parameters to the callback pointer. */
+enum unwind_stop_reason
+frame_unwind_legacy::stop_reason (const frame_info_ptr &this_frame,
+ void **this_prologue_cache) const
+{
+ return stop_reason_p (this_frame, this_prologue_cache);
+}
+
+/* This method just passes the parameters to the callback pointer. */
+void
+frame_unwind_legacy::this_id (const frame_info_ptr &this_frame,
+ void **this_prologue_cache,
+ struct frame_id *id) const
+{
+ return this_id_p (this_frame, this_prologue_cache, id);
+}
+
+/* This method just passes the parameters to the callback pointer. */
+struct value *
+frame_unwind_legacy::prev_register (const frame_info_ptr &this_frame,
+ void **this_prologue_cache,
+ int regnum) const
+{
+ return prev_register_p (this_frame, this_prologue_cache, regnum);
+}
+
+/* This method just passes the parameters to the callback pointer. */
+int
+frame_unwind_legacy::sniffer (const struct frame_unwind *self,
+ const frame_info_ptr &this_frame,
+ void **this_prologue_cache) const
+{
+ return sniffer_p (self, this_frame, this_prologue_cache);
+}
+
+/* This method just passes the parameters to the callback pointer. */
+void
+frame_unwind_legacy::dealloc_cache (frame_info *self, void *this_cache) const
+{
+ if (dealloc_cache_p != nullptr)
+ dealloc_cache_p (self, this_cache);
+}
+
+/* This method just passes the parameters to the callback pointer. */
+struct gdbarch *
+frame_unwind_legacy::prev_arch (const frame_info_ptr &this_frame,
+ void **this_prologue_cache) const
+{
+ if (prev_arch_p == nullptr)
+ error (_("No prev_arch callback installed"));
+ return prev_arch_p (this_frame, this_prologue_cache);
+}
+
/* Implement "maintenance info frame-unwinders" command. */
static void
@@ -351,9 +404,9 @@ maintenance_info_frame_unwinders (const char *args, int from_tty)
for (const struct frame_unwind* unwinder: table)
{
- const char *name = unwinder->name;
- const char *type = frame_type_str (unwinder->type);
- const char *uclass = frame_unwinder_class_str (unwinder->unwinder_class);
+ const char *name = unwinder->name ();
+ const char *type = frame_type_str (unwinder->type ());
+ const char *uclass = frame_unwinder_class_str (unwinder->unwinder_class ());
ui_out_emit_list tuple_emitter (uiout, nullptr);
uiout->field_string ("name", name);
diff --git a/gdb/frame-unwind.h b/gdb/frame-unwind.h
index deab4f7dbfb..62da34b6ee8 100644
--- a/gdb/frame-unwind.h
+++ b/gdb/frame-unwind.h
@@ -169,25 +169,153 @@ enum frame_unwind_class
FRAME_UNWIND_ARCH,
};
-struct frame_unwind
+class frame_unwind
{
- const char *name;
+ const char *m_name;
/* The frame's type. Should this instead be a collection of
predicates that test the frame for various attributes? */
- enum frame_type type;
+ enum frame_type m_type;
/* What kind of unwinder is this. It generally follows from where
the unwinder was added or where it looks for information to do the
unwinding. */
- enum frame_unwind_class unwinder_class;
+ enum frame_unwind_class m_unwinder_class;
+ const struct frame_data *m_unwind_data;
+public:
+ frame_unwind (const char *name, frame_type type, frame_unwind_class uclass,
+ const struct frame_data *data)
+ : m_name (name), m_type (type), m_unwinder_class (uclass),
+ m_unwind_data (data)
+ { }
+
+ const char *name () const
+ {
+ return m_name;
+ }
+
+ enum frame_type type () const
+ {
+ return m_type;
+ }
+
+ enum frame_unwind_class unwinder_class () const
+ {
+ return m_unwinder_class;
+ }
+
+ const struct frame_data *unwind_data () const
+ {
+ return m_unwind_data;
+ }
+
+ /* Default stop_reason function. It reports NO_REASON, unless the
+ frame is the outermost. */
+ virtual enum unwind_stop_reason stop_reason (const frame_info_ptr &this_frame,
+ void **this_prologue_cache) const
+ {
+ return default_frame_unwind_stop_reason (this_frame, this_prologue_cache);
+ }
+
+ /* Default frame sniffer. Will always return that the unwinder
+ is able to unwind the frame. */
+ virtual int sniffer (const frame_unwind *self,
+ const frame_info_ptr &this_frame,
+ void **this_prologue_cache) const
+ {
+ return 1;
+ }
+
+ /* The following methods are here mostly for interface functionality. They
+ all throw an error when called, as a safe way to check if an unwinder has
+ implemented the desired functionality. */
+
+ /* Calculate the ID of the given frame using this unwinder. */
+ virtual void this_id (const frame_info_ptr &this_frame,
+ void **this_prologue_cache,
+ struct frame_id *id) const
+ {
+ error (_("No method this_id implemented for unwinder %s"), m_name);
+ }
+
+ /* Get the value of a register in a previous frame. */
+ virtual struct value *prev_register (const frame_info_ptr &this_frame,
+ void **this_prologue_cache,
+ int regnum) const
+ {
+ error (_("No method prev_register implemented for unwinder %s"), m_name);
+ }
+
+ /* Properly deallocate the cache. */
+ virtual void dealloc_cache (frame_info *self, void *this_cache) const
+ {
+ error (_("No method dealloc_cache implemented for unwinder %s"), m_name);
+ }
+
+ /* Get the previous architecture. */
+ virtual struct gdbarch *prev_arch (const frame_info_ptr &this_frame,
+ void **this_prologue_cache) const
+ {
+ error (_("No method prev_arch implemented for unwinder %s"), m_name);
+ }
+};
+
+/* This is a legacy version of the frame unwinder. The original struct
+ used function pointers for callbacks, this updated version has a
+ method that just passes the parameters along to the callback
+ pointer.
+ Do not use this class for new unwinders. Instead, see other classes
+ that inherit from frame_unwind, such as the python unwinder. */
+class frame_unwind_legacy : public frame_unwind
+{
+private:
/* Should an attribute indicating the frame's address-in-block go
here? */
- frame_unwind_stop_reason_ftype *stop_reason;
- frame_this_id_ftype *this_id;
- frame_prev_register_ftype *prev_register;
- const struct frame_data *unwind_data;
- frame_sniffer_ftype *sniffer;
- frame_dealloc_cache_ftype *dealloc_cache;
- frame_prev_arch_ftype *prev_arch;
+ frame_unwind_stop_reason_ftype *stop_reason_p;
+ frame_this_id_ftype *this_id_p;
+ frame_prev_register_ftype *prev_register_p;
+ frame_sniffer_ftype *sniffer_p;
+ frame_dealloc_cache_ftype *dealloc_cache_p;
+ frame_prev_arch_ftype *prev_arch_p;
+public:
+ frame_unwind_legacy (const char *n, frame_type t, frame_unwind_class c,
+ frame_unwind_stop_reason_ftype *sr,
+ frame_this_id_ftype *ti,
+ frame_prev_register_ftype *pr,
+ const struct frame_data *ud,
+ frame_sniffer_ftype *s,
+ frame_dealloc_cache_ftype *dc = nullptr,
+ frame_prev_arch_ftype *pa = nullptr)
+ : frame_unwind (n, t, c, ud), stop_reason_p (sr),
+ this_id_p (ti), prev_register_p (pr), sniffer_p (s),
+ dealloc_cache_p (dc), prev_arch_p (pa) { }
+
+ /* This method just passes the parameters to the callback pointer. */
+ enum unwind_stop_reason stop_reason (const frame_info_ptr &this_frame,
+ void **this_prologue_cache) const override;
+
+ /* This method just passes the parameters to the callback pointer. */
+ void this_id (const frame_info_ptr &this_frame, void **this_prologue_cache,
+ struct frame_id *id) const override;
+
+ /* This method just passes the parameters to the callback pointer. */
+ struct value *prev_register (const frame_info_ptr &this_frame,
+ void **this_prologue_cache,
+ int regnum) const override;
+
+ /* This method just passes the parameters to the callback pointer. */
+ int sniffer (const frame_unwind *self,
+ const frame_info_ptr &this_frame,
+ void **this_prologue_cache) const override;
+
+ /* This method just passes the parameters to the callback pointer.
+ It is safe to call this method if no callback is installed, it
+ just turns into a noop. */
+ void dealloc_cache (frame_info *self, void *this_cache) const override;
+
+ /* This method just passes the parameters to the callback pointer.
+ If this function is called with no installed callback, this method
+ will error out. Wrap calls in try-catch blocks. */
+ struct gdbarch *prev_arch (const frame_info_ptr &this_frame,
+ void **this_prologue_cache) const override;
};
/* Register a frame unwinder, _prepending_ it to the front of the
diff --git a/gdb/frame.c b/gdb/frame.c
index f042bbb2ec2..b20a8f5668d 100644
--- a/gdb/frame.c
+++ b/gdb/frame.c
@@ -267,12 +267,10 @@ frame_addr_hash_eq (const void *a, const void *b)
static void
frame_info_del (frame_info *frame)
{
- if (frame->prologue_cache != nullptr
- && frame->unwind->dealloc_cache != nullptr)
+ if (frame->prologue_cache != nullptr)
frame->unwind->dealloc_cache (frame, frame->prologue_cache);
- if (frame->base_cache != nullptr
- && frame->base->unwind->dealloc_cache != nullptr)
+ if (frame->base_cache != nullptr)
frame->base->unwind->dealloc_cache (frame, frame->base_cache);
}
@@ -485,12 +483,12 @@ frame_info::to_string () const
res += string_printf ("{level=%d,", fi->level);
if (fi->unwind != NULL)
- res += string_printf ("type=%s,", frame_type_str (fi->unwind->type));
+ res += string_printf ("type=%s,", frame_type_str (fi->unwind->type ()));
else
res += "type=<unknown>,";
if (fi->unwind != NULL)
- res += string_printf ("unwinder=\"%s\",", fi->unwind->name);
+ res += string_printf ("unwinder=\"%s\",", fi->unwind->name ());
else
res += "unwinder=<unknown>,";
@@ -2361,7 +2359,7 @@ get_prev_frame_always_1 (const frame_info_ptr &this_frame)
This check is valid only if this frame and the next frame are NORMAL.
See the comment at frame_id_inner for details. */
if (get_frame_type (this_frame) == NORMAL_FRAME
- && this_frame->next->unwind->type == NORMAL_FRAME
+ && this_frame->next->unwind->type () == NORMAL_FRAME
&& frame_id_inner (get_frame_arch (frame_info_ptr (this_frame->next)),
get_frame_id (this_frame),
get_frame_id (frame_info_ptr (this_frame->next))))
@@ -2989,7 +2987,7 @@ get_frame_type (const frame_info_ptr &frame)
/* Initialize the frame's unwinder because that's what
provides the frame's type. */
frame_unwind_find_by_frame (frame, &frame->prologue_cache);
- return frame->unwind->type;
+ return frame->unwind->type ();
}
struct program_space *
@@ -3070,11 +3068,15 @@ frame_unwind_arch (const frame_info_ptr &next_frame)
if (next_frame->unwind == NULL)
frame_unwind_find_by_frame (next_frame, &next_frame->prologue_cache);
- if (next_frame->unwind->prev_arch != NULL)
- arch = next_frame->unwind->prev_arch (next_frame,
- &next_frame->prologue_cache);
- else
- arch = get_frame_arch (next_frame);
+ try
+ {
+ arch = next_frame->unwind->prev_arch (next_frame,
+ &next_frame->prologue_cache);
+ }
+ catch (gdb_exception &e)
+ {
+ arch = get_frame_arch (next_frame);
+ }
next_frame->prev_arch.arch = arch;
next_frame->prev_arch.p = true;
diff --git a/gdb/frv-linux-tdep.c b/gdb/frv-linux-tdep.c
index 874e2b02e8d..5251e7bd0c9 100644
--- a/gdb/frv-linux-tdep.c
+++ b/gdb/frv-linux-tdep.c
@@ -331,8 +331,7 @@ frv_linux_sigtramp_frame_sniffer (const struct frame_unwind *self,
return 0;
}
-static const struct frame_unwind frv_linux_sigtramp_frame_unwind =
-{
+static const struct frame_unwind_legacy frv_linux_sigtramp_frame_unwind (
"frv linux sigtramp",
SIGTRAMP_FRAME,
FRAME_UNWIND_ARCH,
@@ -341,7 +340,7 @@ static const struct frame_unwind frv_linux_sigtramp_frame_unwind =
frv_linux_sigtramp_frame_prev_register,
NULL,
frv_linux_sigtramp_frame_sniffer
-};
+);
\f
/* The FRV kernel defines ELF_NGREG as 46. We add 2 in order to include
the loadmap addresses in the register set. (See below for more info.) */
diff --git a/gdb/frv-tdep.c b/gdb/frv-tdep.c
index e443fe22b76..bc18ea126ca 100644
--- a/gdb/frv-tdep.c
+++ b/gdb/frv-tdep.c
@@ -1404,7 +1404,7 @@ frv_frame_prev_register (const frame_info_ptr &this_frame,
return trad_frame_get_prev_register (this_frame, info->saved_regs, regnum);
}
-static const struct frame_unwind frv_frame_unwind = {
+static const struct frame_unwind_legacy frv_frame_unwind (
"frv prologue",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -1413,7 +1413,7 @@ static const struct frame_unwind frv_frame_unwind = {
frv_frame_prev_register,
NULL,
default_frame_sniffer
-};
+);
static CORE_ADDR
frv_frame_base_address (const frame_info_ptr &this_frame, void **this_cache)
diff --git a/gdb/ft32-tdep.c b/gdb/ft32-tdep.c
index 42102bdbb66..ec8ea67eabd 100644
--- a/gdb/ft32-tdep.c
+++ b/gdb/ft32-tdep.c
@@ -523,8 +523,7 @@ ft32_frame_prev_register (const frame_info_ptr &this_frame,
return frame_unwind_got_register (this_frame, regnum, regnum);
}
-static const struct frame_unwind ft32_frame_unwind =
-{
+static const struct frame_unwind_legacy ft32_frame_unwind (
"ft32 prologue",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -533,7 +532,7 @@ static const struct frame_unwind ft32_frame_unwind =
ft32_frame_prev_register,
NULL,
default_frame_sniffer
-};
+);
/* Return the base address of this_frame. */
diff --git a/gdb/h8300-tdep.c b/gdb/h8300-tdep.c
index 017be737796..3a8fc9d1821 100644
--- a/gdb/h8300-tdep.c
+++ b/gdb/h8300-tdep.c
@@ -499,7 +499,7 @@ h8300_frame_prev_register (const frame_info_ptr &this_frame, void **this_cache,
return frame_unwind_got_register (this_frame, regnum, regnum);
}
-static const struct frame_unwind h8300_frame_unwind = {
+static const struct frame_unwind_legacy h8300_frame_unwind (
"h8300 prologue",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -508,7 +508,7 @@ static const struct frame_unwind h8300_frame_unwind = {
h8300_frame_prev_register,
NULL,
default_frame_sniffer
-};
+);
static CORE_ADDR
h8300_frame_base_address (const frame_info_ptr &this_frame, void **this_cache)
diff --git a/gdb/hppa-linux-tdep.c b/gdb/hppa-linux-tdep.c
index 6cd7de08308..13229bf3e87 100644
--- a/gdb/hppa-linux-tdep.c
+++ b/gdb/hppa-linux-tdep.c
@@ -307,7 +307,7 @@ hppa_linux_sigtramp_frame_sniffer (const struct frame_unwind *self,
return 0;
}
-static const struct frame_unwind hppa_linux_sigtramp_frame_unwind = {
+static const struct frame_unwind_legacy hppa_linux_sigtramp_frame_unwind (
"hppa linux sigtramp",
SIGTRAMP_FRAME,
FRAME_UNWIND_ARCH,
@@ -316,7 +316,7 @@ static const struct frame_unwind hppa_linux_sigtramp_frame_unwind = {
hppa_linux_sigtramp_frame_prev_register,
NULL,
hppa_linux_sigtramp_frame_sniffer
-};
+);
/* Attempt to find (and return) the global pointer for the given
function.
diff --git a/gdb/hppa-tdep.c b/gdb/hppa-tdep.c
index 838cc42ec77..deb7e5f7b4e 100644
--- a/gdb/hppa-tdep.c
+++ b/gdb/hppa-tdep.c
@@ -2282,8 +2282,7 @@ hppa_frame_unwind_sniffer (const struct frame_unwind *self,
return 0;
}
-static const struct frame_unwind hppa_frame_unwind =
-{
+static const struct frame_unwind_legacy hppa_frame_unwind (
"hppa unwind table",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -2292,7 +2291,7 @@ static const struct frame_unwind hppa_frame_unwind =
hppa_frame_prev_register,
NULL,
hppa_frame_unwind_sniffer
-};
+);
/* This is a generic fallback frame unwinder that kicks in if we fail all
the other ones. Normally we would expect the stub and regular unwinder
@@ -2396,8 +2395,7 @@ hppa_fallback_frame_prev_register (const frame_info_ptr &this_frame,
info->saved_regs, regnum);
}
-static const struct frame_unwind hppa_fallback_frame_unwind =
-{
+static const struct frame_unwind_legacy hppa_fallback_frame_unwind (
"hppa prologue",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -2406,7 +2404,7 @@ static const struct frame_unwind hppa_fallback_frame_unwind =
hppa_fallback_frame_prev_register,
NULL,
default_frame_sniffer
-};
+);
/* Stub frames, used for all kinds of call stubs. */
struct hppa_stub_unwind_cache
@@ -2479,7 +2477,7 @@ hppa_stub_unwind_sniffer (const struct frame_unwind *self,
return 0;
}
-static const struct frame_unwind hppa_stub_frame_unwind = {
+static const struct frame_unwind_legacy hppa_stub_frame_unwind (
"hppa stub",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -2488,7 +2486,7 @@ static const struct frame_unwind hppa_stub_frame_unwind = {
hppa_stub_frame_prev_register,
NULL,
hppa_stub_unwind_sniffer
-};
+);
CORE_ADDR
hppa_unwind_pc (struct gdbarch *gdbarch, const frame_info_ptr &next_frame)
diff --git a/gdb/i386-obsd-tdep.c b/gdb/i386-obsd-tdep.c
index e262528506c..1d2bef770bc 100644
--- a/gdb/i386-obsd-tdep.c
+++ b/gdb/i386-obsd-tdep.c
@@ -389,7 +389,7 @@ i386obsd_trapframe_sniffer (const struct frame_unwind *self,
|| startswith (name, "Xsoft")));
}
-static const struct frame_unwind i386obsd_trapframe_unwind = {
+static const struct frame_unwind_legacy i386obsd_trapframe_unwind (
"i386 openbsd trap",
/* FIXME: kettenis/20051219: This really is more like an interrupt
frame, but SIGTRAMP_FRAME would print <signal handler called>,
@@ -401,7 +401,7 @@ static const struct frame_unwind i386obsd_trapframe_unwind = {
i386obsd_trapframe_prev_register,
NULL,
i386obsd_trapframe_sniffer
-};
+);
\f
static void
diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c
index 57c0253e1de..e98e7caffd8 100644
--- a/gdb/i386-tdep.c
+++ b/gdb/i386-tdep.c
@@ -2195,8 +2195,7 @@ i386_frame_prev_register (const frame_info_ptr &this_frame, void **this_cache,
return frame_unwind_got_register (this_frame, regnum, regnum);
}
-static const struct frame_unwind i386_frame_unwind =
-{
+static const struct frame_unwind_legacy i386_frame_unwind (
"i386 prologue",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -2205,7 +2204,7 @@ static const struct frame_unwind i386_frame_unwind =
i386_frame_prev_register,
NULL,
default_frame_sniffer
-};
+);
/* Normal frames, but in a function epilogue. */
@@ -2351,8 +2350,7 @@ i386_epilogue_frame_prev_register (const frame_info_ptr &this_frame,
return i386_frame_prev_register (this_frame, this_cache, regnum);
}
-static const struct frame_unwind i386_epilogue_override_frame_unwind =
-{
+static const struct frame_unwind_legacy i386_epilogue_override_frame_unwind (
"i386 epilogue override",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -2361,10 +2359,9 @@ static const struct frame_unwind i386_epilogue_override_frame_unwind =
i386_epilogue_frame_prev_register,
NULL,
i386_epilogue_override_frame_sniffer
-};
+);
-static const struct frame_unwind i386_epilogue_frame_unwind =
-{
+static const struct frame_unwind_legacy i386_epilogue_frame_unwind (
"i386 epilogue",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -2373,7 +2370,7 @@ static const struct frame_unwind i386_epilogue_frame_unwind =
i386_epilogue_frame_prev_register,
NULL,
i386_epilogue_frame_sniffer
-};
+);
\f
/* Stack-based trampolines. */
@@ -2446,8 +2443,7 @@ i386_stack_tramp_frame_sniffer (const struct frame_unwind *self,
return 0;
}
-static const struct frame_unwind i386_stack_tramp_frame_unwind =
-{
+static const struct frame_unwind_legacy i386_stack_tramp_frame_unwind (
"i386 stack tramp",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -2456,7 +2452,7 @@ static const struct frame_unwind i386_stack_tramp_frame_unwind =
i386_epilogue_frame_prev_register,
NULL,
i386_stack_tramp_frame_sniffer
-};
+);
\f
/* Generate a bytecode expression to get the value of the saved PC. */
@@ -2596,8 +2592,7 @@ i386_sigtramp_frame_sniffer (const struct frame_unwind *self,
return 0;
}
-static const struct frame_unwind i386_sigtramp_frame_unwind =
-{
+static const struct frame_unwind_legacy i386_sigtramp_frame_unwind (
"i386 sigtramp",
SIGTRAMP_FRAME,
FRAME_UNWIND_ARCH,
@@ -2606,7 +2601,7 @@ static const struct frame_unwind i386_sigtramp_frame_unwind =
i386_sigtramp_frame_prev_register,
NULL,
i386_sigtramp_frame_sniffer
-};
+);
\f
static CORE_ADDR
diff --git a/gdb/ia64-tdep.c b/gdb/ia64-tdep.c
index e214d963f5f..f4ff03c2df8 100644
--- a/gdb/ia64-tdep.c
+++ b/gdb/ia64-tdep.c
@@ -2161,8 +2161,7 @@ ia64_frame_prev_register (const frame_info_ptr &this_frame, void **this_cache,
}
}
-static const struct frame_unwind ia64_frame_unwind =
-{
+static const struct frame_unwind_legacy ia64_frame_unwind (
"ia64 prologue",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -2171,7 +2170,7 @@ static const struct frame_unwind ia64_frame_unwind =
&ia64_frame_prev_register,
NULL,
default_frame_sniffer
-};
+);
/* Signal trampolines. */
@@ -2351,8 +2350,7 @@ ia64_sigtramp_frame_sniffer (const struct frame_unwind *self,
return 0;
}
-static const struct frame_unwind ia64_sigtramp_frame_unwind =
-{
+static const struct frame_unwind_legacy ia64_sigtramp_frame_unwind (
"ia64 sigtramp",
SIGTRAMP_FRAME,
FRAME_UNWIND_ARCH,
@@ -2361,7 +2359,7 @@ static const struct frame_unwind ia64_sigtramp_frame_unwind =
ia64_sigtramp_frame_prev_register,
NULL,
ia64_sigtramp_frame_sniffer
-};
+);
\f
@@ -3012,8 +3010,7 @@ ia64_libunwind_frame_sniffer (const struct frame_unwind *self,
return 0;
}
-static const struct frame_unwind ia64_libunwind_frame_unwind =
-{
+static const struct frame_unwind_legacy ia64_libunwind_frame_unwind (
"ia64 libunwind",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -3023,7 +3020,7 @@ static const struct frame_unwind ia64_libunwind_frame_unwind =
NULL,
ia64_libunwind_frame_sniffer,
libunwind_frame_dealloc_cache
-};
+);
static void
ia64_libunwind_sigtramp_frame_this_id (const frame_info_ptr &this_frame,
@@ -3102,8 +3099,7 @@ ia64_libunwind_sigtramp_frame_sniffer (const struct frame_unwind *self,
return ia64_sigtramp_frame_sniffer (self, this_frame, this_cache);
}
-static const struct frame_unwind ia64_libunwind_sigtramp_frame_unwind =
-{
+static const struct frame_unwind_legacy ia64_libunwind_sigtramp_frame_unwind (
"ia64 libunwind sigtramp",
SIGTRAMP_FRAME,
FRAME_UNWIND_ARCH,
@@ -3112,7 +3108,7 @@ static const struct frame_unwind ia64_libunwind_sigtramp_frame_unwind =
ia64_libunwind_sigtramp_frame_prev_register,
NULL,
ia64_libunwind_sigtramp_frame_sniffer
-};
+);
/* Set of libunwind callback acccessor functions. */
unw_accessors_t ia64_unw_accessors =
diff --git a/gdb/inline-frame.c b/gdb/inline-frame.c
index 2da4cad5f9d..b274ab23125 100644
--- a/gdb/inline-frame.c
+++ b/gdb/inline-frame.c
@@ -264,7 +264,7 @@ inline_frame_sniffer (const struct frame_unwind *self,
return 1;
}
-const struct frame_unwind inline_frame_unwind = {
+const struct frame_unwind_legacy inline_frame_unwind (
"inline",
INLINE_FRAME,
FRAME_UNWIND_GDB,
@@ -273,7 +273,7 @@ const struct frame_unwind inline_frame_unwind = {
inline_frame_prev_register,
NULL,
inline_frame_sniffer
-};
+);
/* Return non-zero if BLOCK, an inlined function block containing PC,
has a group of contiguous instructions starting at PC (but not
diff --git a/gdb/inline-frame.h b/gdb/inline-frame.h
index bbe617c7c5b..a8bd9b07414 100644
--- a/gdb/inline-frame.h
+++ b/gdb/inline-frame.h
@@ -27,7 +27,7 @@ struct process_stratum_target;
/* The inline frame unwinder. */
-extern const struct frame_unwind inline_frame_unwind;
+extern const struct frame_unwind_legacy inline_frame_unwind;
/* Skip all inlined functions whose call sites are at the current PC.
diff --git a/gdb/iq2000-tdep.c b/gdb/iq2000-tdep.c
index ea249060e6b..48e0ab18094 100644
--- a/gdb/iq2000-tdep.c
+++ b/gdb/iq2000-tdep.c
@@ -423,7 +423,7 @@ iq2000_frame_this_id (const frame_info_ptr &this_frame, void **this_cache,
*this_id = frame_id_build (cache->saved_sp, cache->pc);
}
-static const struct frame_unwind iq2000_frame_unwind = {
+static const struct frame_unwind_legacy iq2000_frame_unwind (
"iq2000 prologue",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -432,7 +432,7 @@ static const struct frame_unwind iq2000_frame_unwind = {
iq2000_frame_prev_register,
NULL,
default_frame_sniffer
-};
+);
static CORE_ADDR
iq2000_frame_base_address (const frame_info_ptr &this_frame, void **this_cache)
diff --git a/gdb/jit.c b/gdb/jit.c
index db1b64d0b0b..efb65167a08 100644
--- a/gdb/jit.c
+++ b/gdb/jit.c
@@ -1103,8 +1103,7 @@ jit_frame_prev_register (const frame_info_ptr &this_frame, void **cache, int reg
/* Relay everything back to the unwinder registered by the JIT debug
info reader.*/
-static const struct frame_unwind jit_frame_unwind =
-{
+static const struct frame_unwind_legacy jit_frame_unwind (
"jit",
NORMAL_FRAME,
FRAME_UNWIND_EXTENSION,
@@ -1114,7 +1113,7 @@ static const struct frame_unwind jit_frame_unwind =
NULL,
jit_frame_sniffer,
jit_dealloc_cache
-};
+);
/* This is the information that is stored at jit_gdbarch_data for each
diff --git a/gdb/lm32-tdep.c b/gdb/lm32-tdep.c
index 7fbf403dd28..02bd1a8762a 100644
--- a/gdb/lm32-tdep.c
+++ b/gdb/lm32-tdep.c
@@ -446,7 +446,7 @@ lm32_frame_prev_register (const frame_info_ptr &this_frame,
return trad_frame_get_prev_register (this_frame, info->saved_regs, regnum);
}
-static const struct frame_unwind lm32_frame_unwind = {
+static const struct frame_unwind_legacy lm32_frame_unwind (
"lm32 prologue",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -455,7 +455,7 @@ static const struct frame_unwind lm32_frame_unwind = {
lm32_frame_prev_register,
NULL,
default_frame_sniffer
-};
+);
static CORE_ADDR
lm32_frame_base_address (const frame_info_ptr &this_frame, void **this_cache)
diff --git a/gdb/loongarch-tdep.c b/gdb/loongarch-tdep.c
index c86a2f9ea9c..5b2293911ea 100644
--- a/gdb/loongarch-tdep.c
+++ b/gdb/loongarch-tdep.c
@@ -449,7 +449,7 @@ loongarch_frame_prev_register (const frame_info_ptr &this_frame,
return trad_frame_get_register (info, this_frame, regnum);
}
-static const struct frame_unwind loongarch_frame_unwind = {
+static const struct frame_unwind_legacy loongarch_frame_unwind (
"loongarch prologue",
/*.type =*/NORMAL_FRAME,
/*.unwinder_class=*/FRAME_UNWIND_ARCH,
@@ -459,8 +459,8 @@ static const struct frame_unwind loongarch_frame_unwind = {
/*.unwind_data =*/nullptr,
/*.sniffer =*/default_frame_sniffer,
/*.dealloc_cache =*/nullptr,
- /*.prev_arch =*/nullptr,
-};
+ /*.prev_arch =*/nullptr
+);
/* Write the contents of buffer VAL into the general-purpose argument
register defined by GAR in REGCACHE. GAR indicates the available
diff --git a/gdb/m32c-tdep.c b/gdb/m32c-tdep.c
index 0f74cf1458e..fca328eda73 100644
--- a/gdb/m32c-tdep.c
+++ b/gdb/m32c-tdep.c
@@ -1954,7 +1954,7 @@ m32c_prev_register (const frame_info_ptr &this_frame,
}
-static const struct frame_unwind m32c_unwind = {
+static const struct frame_unwind_legacy m32c_unwind (
"m32c prologue",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -1963,7 +1963,7 @@ static const struct frame_unwind m32c_unwind = {
m32c_prev_register,
NULL,
default_frame_sniffer
-};
+);
\f
/* Inferior calls. */
diff --git a/gdb/m32r-linux-tdep.c b/gdb/m32r-linux-tdep.c
index ae8e364d794..01e47ed67ec 100644
--- a/gdb/m32r-linux-tdep.c
+++ b/gdb/m32r-linux-tdep.c
@@ -300,7 +300,7 @@ m32r_linux_sigtramp_frame_sniffer (const struct frame_unwind *self,
return 0;
}
-static const struct frame_unwind m32r_linux_sigtramp_frame_unwind = {
+static const struct frame_unwind_legacy m32r_linux_sigtramp_frame_unwind (
"m32r linux sigtramp",
SIGTRAMP_FRAME,
FRAME_UNWIND_ARCH,
@@ -309,7 +309,7 @@ static const struct frame_unwind m32r_linux_sigtramp_frame_unwind = {
m32r_linux_sigtramp_frame_prev_register,
NULL,
m32r_linux_sigtramp_frame_sniffer
-};
+);
/* Mapping between the registers in `struct pt_regs'
format and GDB's register array layout. */
diff --git a/gdb/m32r-tdep.c b/gdb/m32r-tdep.c
index 1743884ba3c..c58c82e3fa6 100644
--- a/gdb/m32r-tdep.c
+++ b/gdb/m32r-tdep.c
@@ -830,7 +830,7 @@ m32r_frame_prev_register (const frame_info_ptr &this_frame,
return trad_frame_get_prev_register (this_frame, info->saved_regs, regnum);
}
-static const struct frame_unwind m32r_frame_unwind = {
+static const struct frame_unwind_legacy m32r_frame_unwind (
"m32r prologue",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -839,7 +839,7 @@ static const struct frame_unwind m32r_frame_unwind = {
m32r_frame_prev_register,
NULL,
default_frame_sniffer
-};
+);
static CORE_ADDR
m32r_frame_base_address (const frame_info_ptr &this_frame, void **this_cache)
diff --git a/gdb/m68hc11-tdep.c b/gdb/m68hc11-tdep.c
index 44a032157af..7c00061bd09 100644
--- a/gdb/m68hc11-tdep.c
+++ b/gdb/m68hc11-tdep.c
@@ -935,7 +935,7 @@ m68hc11_frame_prev_register (const frame_info_ptr &this_frame,
return value;
}
-static const struct frame_unwind m68hc11_frame_unwind = {
+static const struct frame_unwind_legacy m68hc11_frame_unwind (
"m68hc11 prologue",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -944,7 +944,7 @@ static const struct frame_unwind m68hc11_frame_unwind = {
m68hc11_frame_prev_register,
NULL,
default_frame_sniffer
-};
+);
static CORE_ADDR
m68hc11_frame_base_address (const frame_info_ptr &this_frame, void **this_cache)
diff --git a/gdb/m68k-linux-tdep.c b/gdb/m68k-linux-tdep.c
index e1d2f51522a..5b3ad72074b 100644
--- a/gdb/m68k-linux-tdep.c
+++ b/gdb/m68k-linux-tdep.c
@@ -313,8 +313,7 @@ m68k_linux_sigtramp_frame_sniffer (const struct frame_unwind *self,
return m68k_linux_pc_in_sigtramp (this_frame);
}
-static const struct frame_unwind m68k_linux_sigtramp_frame_unwind =
-{
+static const struct frame_unwind_legacy m68k_linux_sigtramp_frame_unwind (
"m68k linux sigtramp",
SIGTRAMP_FRAME,
FRAME_UNWIND_ARCH,
@@ -323,7 +322,7 @@ static const struct frame_unwind m68k_linux_sigtramp_frame_unwind =
m68k_linux_sigtramp_frame_prev_register,
NULL,
m68k_linux_sigtramp_frame_sniffer
-};
+);
/* Register maps for supply/collect regset functions. */
diff --git a/gdb/m68k-tdep.c b/gdb/m68k-tdep.c
index 0fcd340eee7..a051e514245 100644
--- a/gdb/m68k-tdep.c
+++ b/gdb/m68k-tdep.c
@@ -1006,8 +1006,7 @@ m68k_frame_prev_register (const frame_info_ptr &this_frame, void **this_cache,
return frame_unwind_got_register (this_frame, regnum, regnum);
}
-static const struct frame_unwind m68k_frame_unwind =
-{
+static const struct frame_unwind_legacy m68k_frame_unwind (
"m68k prologue",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -1016,7 +1015,7 @@ static const struct frame_unwind m68k_frame_unwind =
m68k_frame_prev_register,
NULL,
default_frame_sniffer
-};
+);
\f
static CORE_ADDR
m68k_frame_base_address (const frame_info_ptr &this_frame, void **this_cache)
diff --git a/gdb/mep-tdep.c b/gdb/mep-tdep.c
index 004a9f44dca..1648f3fee85 100644
--- a/gdb/mep-tdep.c
+++ b/gdb/mep-tdep.c
@@ -2060,7 +2060,7 @@ mep_frame_prev_register (const frame_info_ptr &this_frame,
}
-static const struct frame_unwind mep_frame_unwind = {
+static const struct frame_unwind_legacy mep_frame_unwind (
"mep prologue",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -2069,7 +2069,7 @@ static const struct frame_unwind mep_frame_unwind = {
mep_frame_prev_register,
NULL,
default_frame_sniffer
-};
+);
\f
/* Return values. */
diff --git a/gdb/microblaze-tdep.c b/gdb/microblaze-tdep.c
index 8d53d193dd4..05fedf6c9d6 100644
--- a/gdb/microblaze-tdep.c
+++ b/gdb/microblaze-tdep.c
@@ -477,8 +477,7 @@ microblaze_frame_prev_register (const frame_info_ptr &this_frame,
}
-static const struct frame_unwind microblaze_frame_unwind =
-{
+static const struct frame_unwind_legacy microblaze_frame_unwind (
"microblaze prologue",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -487,7 +486,7 @@ static const struct frame_unwind microblaze_frame_unwind =
microblaze_frame_prev_register,
NULL,
default_frame_sniffer
-};
+);
\f
static CORE_ADDR
microblaze_frame_base_address (const frame_info_ptr &next_frame,
diff --git a/gdb/mips-sde-tdep.c b/gdb/mips-sde-tdep.c
index 18cb9485639..783e6fd35ab 100644
--- a/gdb/mips-sde-tdep.c
+++ b/gdb/mips-sde-tdep.c
@@ -160,8 +160,7 @@ mips_sde_frame_sniffer (const struct frame_unwind *self,
/* Data structure for the SDE frame unwinder. */
-static const struct frame_unwind mips_sde_frame_unwind =
-{
+static const struct frame_unwind_legacy mips_sde_frame_unwind (
"mips sde sigtramp",
SIGTRAMP_FRAME,
FRAME_UNWIND_ARCH,
@@ -170,7 +169,7 @@ static const struct frame_unwind mips_sde_frame_unwind =
mips_sde_frame_prev_register,
NULL,
mips_sde_frame_sniffer
-};
+);
/* Implement the this_base, this_locals, and this_args hooks
for the normal unwinder. */
diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c
index 92630f329d8..b33df4e3461 100644
--- a/gdb/mips-tdep.c
+++ b/gdb/mips-tdep.c
@@ -2928,8 +2928,7 @@ mips_insn16_frame_sniffer (const struct frame_unwind *self,
return 0;
}
-static const struct frame_unwind mips_insn16_frame_unwind =
-{
+static const struct frame_unwind_legacy mips_insn16_frame_unwind (
"mips insn16 prologue",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -2938,7 +2937,7 @@ static const struct frame_unwind mips_insn16_frame_unwind =
mips_insn16_frame_prev_register,
NULL,
mips_insn16_frame_sniffer
-};
+);
static CORE_ADDR
mips_insn16_frame_base_address (const frame_info_ptr &this_frame,
@@ -3365,8 +3364,7 @@ mips_micro_frame_sniffer (const struct frame_unwind *self,
return 0;
}
-static const struct frame_unwind mips_micro_frame_unwind =
-{
+static const struct frame_unwind_legacy mips_micro_frame_unwind (
"mips micro prologue",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -3375,7 +3373,7 @@ static const struct frame_unwind mips_micro_frame_unwind =
mips_micro_frame_prev_register,
NULL,
mips_micro_frame_sniffer
-};
+);
static CORE_ADDR
mips_micro_frame_base_address (const frame_info_ptr &this_frame,
@@ -3745,8 +3743,7 @@ mips_insn32_frame_sniffer (const struct frame_unwind *self,
return 0;
}
-static const struct frame_unwind mips_insn32_frame_unwind =
-{
+static const struct frame_unwind_legacy mips_insn32_frame_unwind (
"mips insn32 prologue",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -3755,7 +3752,7 @@ static const struct frame_unwind mips_insn32_frame_unwind =
mips_insn32_frame_prev_register,
NULL,
mips_insn32_frame_sniffer
-};
+);
static CORE_ADDR
mips_insn32_frame_base_address (const frame_info_ptr &this_frame,
@@ -3863,8 +3860,7 @@ mips_stub_frame_sniffer (const struct frame_unwind *self,
return 0;
}
-static const struct frame_unwind mips_stub_frame_unwind =
-{
+static const struct frame_unwind_legacy mips_stub_frame_unwind (
"mips stub",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -3873,7 +3869,7 @@ static const struct frame_unwind mips_stub_frame_unwind =
mips_stub_frame_prev_register,
NULL,
mips_stub_frame_sniffer
-};
+);
static CORE_ADDR
mips_stub_frame_base_address (const frame_info_ptr &this_frame,
diff --git a/gdb/mn10300-tdep.c b/gdb/mn10300-tdep.c
index 63fc62c734f..19dd3b2bac0 100644
--- a/gdb/mn10300-tdep.c
+++ b/gdb/mn10300-tdep.c
@@ -1126,7 +1126,7 @@ mn10300_frame_prev_register (const frame_info_ptr &this_frame,
return frame_unwind_got_register (this_frame, regnum, regnum);
}
-static const struct frame_unwind mn10300_frame_unwind = {
+static const struct frame_unwind_legacy mn10300_frame_unwind (
"mn10300 prologue",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -1135,7 +1135,7 @@ static const struct frame_unwind mn10300_frame_unwind = {
mn10300_frame_prev_register,
NULL,
default_frame_sniffer
-};
+);
static void
mn10300_frame_unwind_init (struct gdbarch *gdbarch)
diff --git a/gdb/moxie-tdep.c b/gdb/moxie-tdep.c
index d4684a0d3c3..22c74d28920 100644
--- a/gdb/moxie-tdep.c
+++ b/gdb/moxie-tdep.c
@@ -584,7 +584,7 @@ moxie_frame_prev_register (const frame_info_ptr &this_frame,
return frame_unwind_got_register (this_frame, regnum, regnum);
}
-static const struct frame_unwind moxie_frame_unwind = {
+static const struct frame_unwind_legacy moxie_frame_unwind (
"moxie prologue",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -593,7 +593,7 @@ static const struct frame_unwind moxie_frame_unwind = {
moxie_frame_prev_register,
NULL,
default_frame_sniffer
-};
+);
/* Return the base address of this_frame. */
diff --git a/gdb/msp430-tdep.c b/gdb/msp430-tdep.c
index 765b15b87e7..ce82a0cee34 100644
--- a/gdb/msp430-tdep.c
+++ b/gdb/msp430-tdep.c
@@ -541,7 +541,7 @@ msp430_prev_register (const frame_info_ptr &this_frame,
return frame_unwind_got_register (this_frame, regnum, regnum);
}
-static const struct frame_unwind msp430_unwind = {
+static const struct frame_unwind_legacy msp430_unwind (
"msp430 prologue",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -550,7 +550,7 @@ static const struct frame_unwind msp430_unwind = {
msp430_prev_register,
NULL,
default_frame_sniffer
-};
+);
/* Implement the "dwarf2_reg_to_regnum" gdbarch method. */
diff --git a/gdb/nds32-tdep.c b/gdb/nds32-tdep.c
index 6fd5c3c7a28..6aca27ee96a 100644
--- a/gdb/nds32-tdep.c
+++ b/gdb/nds32-tdep.c
@@ -987,8 +987,7 @@ nds32_frame_prev_register (const frame_info_ptr &this_frame, void **this_cache,
return frame_unwind_got_register (this_frame, regnum, regnum);
}
-static const struct frame_unwind nds32_frame_unwind =
-{
+static const struct frame_unwind_legacy nds32_frame_unwind (
"nds32 prologue",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -996,8 +995,8 @@ static const struct frame_unwind nds32_frame_unwind =
nds32_frame_this_id,
nds32_frame_prev_register,
NULL,
- default_frame_sniffer,
-};
+ default_frame_sniffer
+);
/* Return the frame base address of *THIS_FRAME. */
@@ -1372,8 +1371,7 @@ nds32_epilogue_frame_prev_register (const frame_info_ptr &this_frame,
return frame_unwind_got_register (this_frame, regnum, regnum);
}
-static const struct frame_unwind nds32_epilogue_frame_unwind =
-{
+static const struct frame_unwind_legacy nds32_epilogue_frame_unwind (
"nds32 epilogue",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -1382,7 +1380,7 @@ static const struct frame_unwind nds32_epilogue_frame_unwind =
nds32_epilogue_frame_prev_register,
NULL,
nds32_epilogue_frame_sniffer
-};
+);
\f
/* Floating type and struct type that has only one floating type member
diff --git a/gdb/nios2-tdep.c b/gdb/nios2-tdep.c
index 179c3d72a49..709b86742e3 100644
--- a/gdb/nios2-tdep.c
+++ b/gdb/nios2-tdep.c
@@ -1976,8 +1976,7 @@ nios2_frame_base_address (const frame_info_ptr &this_frame, void **this_cache)
/* Data structures for the normal prologue-analysis-based
unwinder. */
-static const struct frame_unwind nios2_frame_unwind =
-{
+static const struct frame_unwind_legacy nios2_frame_unwind (
"nios2 prologue",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -1986,7 +1985,7 @@ static const struct frame_unwind nios2_frame_unwind =
nios2_frame_prev_register,
NULL,
default_frame_sniffer
-};
+);
static const struct frame_base nios2_frame_base =
{
@@ -2078,8 +2077,7 @@ nios2_stub_frame_sniffer (const struct frame_unwind *self,
/* Define the data structures for the stub unwinder. */
-static const struct frame_unwind nios2_stub_frame_unwind =
-{
+static const struct frame_unwind_legacy nios2_stub_frame_unwind (
"nios2 stub",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -2088,7 +2086,7 @@ static const struct frame_unwind nios2_stub_frame_unwind =
nios2_stub_frame_prev_register,
NULL,
nios2_stub_frame_sniffer
-};
+);
diff --git a/gdb/or1k-tdep.c b/gdb/or1k-tdep.c
index b1d7911de98..e36e4ce9dd1 100644
--- a/gdb/or1k-tdep.c
+++ b/gdb/or1k-tdep.c
@@ -1124,7 +1124,7 @@ or1k_frame_prev_register (const frame_info_ptr &this_frame,
/* Data structures for the normal prologue-analysis-based unwinder. */
-static const struct frame_unwind or1k_frame_unwind = {
+static const struct frame_unwind_legacy or1k_frame_unwind (
"or1k prologue",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -1133,8 +1133,8 @@ static const struct frame_unwind or1k_frame_unwind = {
or1k_frame_prev_register,
NULL,
default_frame_sniffer,
- NULL,
-};
+ NULL
+);
/* Architecture initialization for OpenRISC 1000. */
diff --git a/gdb/ppc-fbsd-tdep.c b/gdb/ppc-fbsd-tdep.c
index f7f99660e29..d8c76f77fd8 100644
--- a/gdb/ppc-fbsd-tdep.c
+++ b/gdb/ppc-fbsd-tdep.c
@@ -261,7 +261,7 @@ ppcfbsd_sigtramp_frame_prev_register (const frame_info_ptr &this_frame,
return trad_frame_get_register (cache, this_frame, regnum);
}
-static const struct frame_unwind ppcfbsd_sigtramp_frame_unwind = {
+static const struct frame_unwind_legacy ppcfbsd_sigtramp_frame_unwind (
"ppc freebsd sigtramp",
SIGTRAMP_FRAME,
FRAME_UNWIND_ARCH,
@@ -270,7 +270,7 @@ static const struct frame_unwind ppcfbsd_sigtramp_frame_unwind = {
ppcfbsd_sigtramp_frame_prev_register,
NULL,
ppcfbsd_sigtramp_frame_sniffer
-};
+);
static enum return_value_convention
ppcfbsd_return_value (struct gdbarch *gdbarch, struct value *function,
diff --git a/gdb/ppc-obsd-tdep.c b/gdb/ppc-obsd-tdep.c
index f7e642ee05c..68edd54dd96 100644
--- a/gdb/ppc-obsd-tdep.c
+++ b/gdb/ppc-obsd-tdep.c
@@ -230,7 +230,7 @@ ppcobsd_sigtramp_frame_prev_register (const frame_info_ptr &this_frame,
return trad_frame_get_register (cache, this_frame, regnum);
}
-static const struct frame_unwind ppcobsd_sigtramp_frame_unwind = {
+static const struct frame_unwind_legacy ppcobsd_sigtramp_frame_unwind (
"ppc openbsd sigtramp",
SIGTRAMP_FRAME,
FRAME_UNWIND_ARCH,
@@ -239,7 +239,7 @@ static const struct frame_unwind ppcobsd_sigtramp_frame_unwind = {
ppcobsd_sigtramp_frame_prev_register,
NULL,
ppcobsd_sigtramp_frame_sniffer
-};
+);
\f
static void
diff --git a/gdb/python/py-unwind.c b/gdb/python/py-unwind.c
index 668835e0444..91c9fbf2274 100644
--- a/gdb/python/py-unwind.c
+++ b/gdb/python/py-unwind.c
@@ -806,7 +806,7 @@ pyuw_sniffer (const struct frame_unwind *self, const frame_info_ptr &this_frame,
{
PYUW_SCOPED_DEBUG_ENTER_EXIT;
- struct gdbarch *gdbarch = (struct gdbarch *) (self->unwind_data);
+ struct gdbarch *gdbarch = (struct gdbarch *) (self->unwind_data ());
cached_frame_info *cached_frame;
gdbpy_enter enter_py (gdbarch);
@@ -947,6 +947,41 @@ struct pyuw_gdbarch_data_type
static const registry<gdbarch>::key<pyuw_gdbarch_data_type> pyuw_gdbarch_data;
+/* Class for frame unwinders registered by the Python architecture callback. */
+class frame_unwind_python : public frame_unwind
+{
+public:
+ frame_unwind_python (const struct frame_data *newarch)
+ : frame_unwind ("python", NORMAL_FRAME, FRAME_UNWIND_EXTENSION, newarch)
+ { }
+
+ /* No need to override stop_reason, we want the default. */
+
+ int sniffer (const frame_unwind *self, const frame_info_ptr &this_frame,
+ void **this_prologue_cache) const override
+ {
+ return pyuw_sniffer (self, this_frame, this_prologue_cache);
+ }
+
+ void this_id (const frame_info_ptr &this_frame, void **this_prologue_cache,
+ struct frame_id *id) const override
+ {
+ pyuw_this_id (this_frame, this_prologue_cache, id);
+ }
+
+ struct value *prev_register (const frame_info_ptr &this_frame,
+ void **this_prologue_cache,
+ int regnum) const override
+ {
+ return pyuw_prev_register (this_frame, this_prologue_cache, regnum);
+ }
+
+ void dealloc_cache (frame_info *self, void *this_cache) const override
+ {
+ pyuw_dealloc_cache (self, this_cache);
+ }
+};
+
/* New inferior architecture callback: register the Python unwinders
intermediary. */
@@ -960,17 +995,9 @@ pyuw_on_new_gdbarch (gdbarch *newarch)
if (!data->unwinder_registered)
{
struct frame_unwind *unwinder
- = GDBARCH_OBSTACK_ZALLOC (newarch, struct frame_unwind);
-
- unwinder->name = "python";
- unwinder->type = NORMAL_FRAME;
- unwinder->unwinder_class = FRAME_UNWIND_EXTENSION;
- unwinder->stop_reason = default_frame_unwind_stop_reason;
- unwinder->this_id = pyuw_this_id;
- unwinder->prev_register = pyuw_prev_register;
- unwinder->unwind_data = (const struct frame_data *) newarch;
- unwinder->sniffer = pyuw_sniffer;
- unwinder->dealloc_cache = pyuw_dealloc_cache;
+ = obstack_new<frame_unwind_python>
+ (gdbarch_obstack (newarch), (const struct frame_data *) newarch);
+
frame_unwind_prepend_unwinder (newarch, unwinder);
data->unwinder_registered = 1;
}
diff --git a/gdb/record-btrace.c b/gdb/record-btrace.c
index 2bf3e214446..c069850d4bd 100644
--- a/gdb/record-btrace.c
+++ b/gdb/record-btrace.c
@@ -1893,8 +1893,7 @@ record_btrace_frame_dealloc_cache (frame_info *self, void *this_cache)
Therefore this unwinder reports any possibly unwound registers as
<unavailable>. */
-const struct frame_unwind record_btrace_frame_unwind =
-{
+const struct frame_unwind_legacy record_btrace_frame_unwind (
"record-btrace",
NORMAL_FRAME,
FRAME_UNWIND_GDB,
@@ -1904,10 +1903,9 @@ const struct frame_unwind record_btrace_frame_unwind =
NULL,
record_btrace_frame_sniffer,
record_btrace_frame_dealloc_cache
-};
+);
-const struct frame_unwind record_btrace_tailcall_frame_unwind =
-{
+const struct frame_unwind_legacy record_btrace_tailcall_frame_unwind (
"record-btrace tailcall",
TAILCALL_FRAME,
FRAME_UNWIND_GDB,
@@ -1917,7 +1915,7 @@ const struct frame_unwind record_btrace_tailcall_frame_unwind =
NULL,
record_btrace_tailcall_frame_sniffer,
record_btrace_frame_dealloc_cache
-};
+);
/* Implement the get_unwinder method. */
diff --git a/gdb/record.h b/gdb/record.h
index f44b3952943..44918ef4242 100644
--- a/gdb/record.h
+++ b/gdb/record.h
@@ -36,8 +36,8 @@ extern struct cmd_list_element *show_record_cmdlist;
extern struct cmd_list_element *info_record_cmdlist;
/* Unwinders for some record targets. */
-extern const struct frame_unwind record_btrace_frame_unwind;
-extern const struct frame_unwind record_btrace_tailcall_frame_unwind;
+extern const struct frame_unwind_legacy record_btrace_frame_unwind;
+extern const struct frame_unwind_legacy record_btrace_tailcall_frame_unwind;
/* A list of different recording methods. */
enum record_method
diff --git a/gdb/riscv-tdep.c b/gdb/riscv-tdep.c
index 860a895bc06..b9391d0845b 100644
--- a/gdb/riscv-tdep.c
+++ b/gdb/riscv-tdep.c
@@ -3899,8 +3899,7 @@ riscv_frame_prev_register (const frame_info_ptr &this_frame,
are the fallback unwinder (DWARF unwinder is used first), we use the
default frame sniffer, which always accepts the frame. */
-static const struct frame_unwind riscv_frame_unwind =
-{
+static const struct frame_unwind_legacy riscv_frame_unwind (
/*.name =*/ "riscv prologue",
/*.type =*/ NORMAL_FRAME,
/*.unwinder_class=*/FRAME_UNWIND_ARCH,
@@ -3910,8 +3909,8 @@ static const struct frame_unwind riscv_frame_unwind =
/*.unwind_data =*/ NULL,
/*.sniffer =*/ default_frame_sniffer,
/*.dealloc_cache =*/ NULL,
- /*.prev_arch =*/ NULL,
-};
+ /*.prev_arch =*/ NULL
+);
/* Extract a set of required target features out of ABFD. If ABFD is
nullptr then a RISCV_GDBARCH_FEATURES is returned in its default state. */
diff --git a/gdb/rl78-tdep.c b/gdb/rl78-tdep.c
index 4af93c37df1..62098d9f85a 100644
--- a/gdb/rl78-tdep.c
+++ b/gdb/rl78-tdep.c
@@ -1182,8 +1182,7 @@ rl78_prev_register (const frame_info_ptr &this_frame,
return frame_unwind_got_register (this_frame, regnum, regnum);
}
-static const struct frame_unwind rl78_unwind =
-{
+static const struct frame_unwind_legacy rl78_unwind (
"rl78 prologue",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -1192,7 +1191,7 @@ static const struct frame_unwind rl78_unwind =
rl78_prev_register,
NULL,
default_frame_sniffer
-};
+);
/* Implement the "dwarf_reg_to_regnum" gdbarch method. */
diff --git a/gdb/rs6000-aix-tdep.c b/gdb/rs6000-aix-tdep.c
index ea44765c7fa..4cf539507ac 100644
--- a/gdb/rs6000-aix-tdep.c
+++ b/gdb/rs6000-aix-tdep.c
@@ -327,7 +327,7 @@ aix_sighandle_frame_sniffer (const struct frame_unwind *self,
/* AIX signal handler frame unwinder */
-static const struct frame_unwind aix_sighandle_frame_unwind = {
+static const struct frame_unwind_legacy aix_sighandle_frame_unwind (
"rs6000 aix sighandle",
SIGTRAMP_FRAME,
FRAME_UNWIND_ARCH,
@@ -336,7 +336,7 @@ static const struct frame_unwind aix_sighandle_frame_unwind = {
aix_sighandle_frame_prev_register,
NULL,
aix_sighandle_frame_sniffer
-};
+);
/* Core file support. */
diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c
index 5d1fde07145..c4f015de4b3 100644
--- a/gdb/rs6000-tdep.c
+++ b/gdb/rs6000-tdep.c
@@ -3837,8 +3837,7 @@ rs6000_frame_prev_register (const frame_info_ptr &this_frame,
return trad_frame_get_prev_register (this_frame, info->saved_regs, regnum);
}
-static const struct frame_unwind rs6000_frame_unwind =
-{
+static const struct frame_unwind_legacy rs6000_frame_unwind (
"rs6000 prologue",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -3847,7 +3846,7 @@ static const struct frame_unwind rs6000_frame_unwind =
rs6000_frame_prev_register,
NULL,
default_frame_sniffer
-};
+);
/* Allocate and initialize a frame cache for an epilogue frame.
SP is restored and prev-PC is stored in LR. */
@@ -3979,8 +3978,7 @@ rs6000_epilogue_frame_sniffer (const struct frame_unwind *self,
/* Frame unwinder for epilogue frame. This is required for reverse step-over
a function without debug information. */
-static const struct frame_unwind rs6000_epilogue_frame_unwind =
-{
+static const struct frame_unwind_legacy rs6000_epilogue_frame_unwind (
"rs6000 epilogue",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -3988,7 +3986,7 @@ static const struct frame_unwind rs6000_epilogue_frame_unwind =
rs6000_epilogue_frame_this_id, rs6000_epilogue_frame_prev_register,
NULL,
rs6000_epilogue_frame_sniffer
-};
+);
\f
static CORE_ADDR
diff --git a/gdb/rx-tdep.c b/gdb/rx-tdep.c
index b35d477204e..ebdb324945d 100644
--- a/gdb/rx-tdep.c
+++ b/gdb/rx-tdep.c
@@ -630,7 +630,7 @@ rx_exception_sniffer (const struct frame_unwind *self,
/* Data structure for normal code using instruction-based prologue
analyzer. */
-static const struct frame_unwind rx_frame_unwind = {
+static const struct frame_unwind_legacy rx_frame_unwind (
"rx prologue",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -639,12 +639,12 @@ static const struct frame_unwind rx_frame_unwind = {
rx_frame_prev_register,
NULL,
rx_frame_sniffer
-};
+);
/* Data structure for exception code using instruction-based prologue
analyzer. */
-static const struct frame_unwind rx_exception_unwind = {
+static const struct frame_unwind_legacy rx_exception_unwind (
"rx exception",
/* SIGTRAMP_FRAME could be used here, but backtraces are less informative. */
NORMAL_FRAME,
@@ -654,7 +654,7 @@ static const struct frame_unwind rx_exception_unwind = {
rx_frame_prev_register,
NULL,
rx_exception_sniffer
-};
+);
/* Implement the "push_dummy_call" gdbarch method. */
static CORE_ADDR
diff --git a/gdb/s12z-tdep.c b/gdb/s12z-tdep.c
index bb0c8bef327..6a377709eff 100644
--- a/gdb/s12z-tdep.c
+++ b/gdb/s12z-tdep.c
@@ -441,7 +441,7 @@ s12z_frame_prev_register (const frame_info_ptr &this_frame,
}
/* Data structures for the normal prologue-analysis-based unwinder. */
-static const struct frame_unwind s12z_frame_unwind = {
+static const struct frame_unwind_legacy s12z_frame_unwind (
"s12z prologue",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -450,8 +450,8 @@ static const struct frame_unwind s12z_frame_unwind = {
s12z_frame_prev_register,
NULL,
default_frame_sniffer,
- NULL,
-};
+ NULL
+);
constexpr gdb_byte s12z_break_insn[] = {0x00};
diff --git a/gdb/s390-linux-tdep.c b/gdb/s390-linux-tdep.c
index 556fad64926..96d6d446219 100644
--- a/gdb/s390-linux-tdep.c
+++ b/gdb/s390-linux-tdep.c
@@ -541,7 +541,7 @@ s390_sigtramp_frame_sniffer (const struct frame_unwind *self,
/* S390 sigtramp frame unwinder. */
-static const struct frame_unwind s390_sigtramp_frame_unwind = {
+static const struct frame_unwind_legacy s390_sigtramp_frame_unwind (
"s390 linux sigtramp",
SIGTRAMP_FRAME,
FRAME_UNWIND_ARCH,
@@ -550,7 +550,7 @@ static const struct frame_unwind s390_sigtramp_frame_unwind = {
s390_sigtramp_frame_prev_register,
NULL,
s390_sigtramp_frame_sniffer
-};
+);
/* Syscall handling. */
diff --git a/gdb/s390-tdep.c b/gdb/s390-tdep.c
index 065c52e6442..4d429ba0301 100644
--- a/gdb/s390-tdep.c
+++ b/gdb/s390-tdep.c
@@ -2645,7 +2645,7 @@ s390_frame_prev_register (const frame_info_ptr &this_frame,
/* Default S390 frame unwinder. */
-static const struct frame_unwind s390_frame_unwind = {
+static const struct frame_unwind_legacy s390_frame_unwind (
"s390 prologue",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -2654,7 +2654,7 @@ static const struct frame_unwind s390_frame_unwind = {
s390_frame_prev_register,
NULL,
default_frame_sniffer
-};
+);
/* Code stubs and their stack frames. For things like PLTs and NULL
function calls (where there is no true frame and the return address
@@ -2740,7 +2740,7 @@ s390_stub_frame_sniffer (const struct frame_unwind *self,
/* S390 stub frame unwinder. */
-static const struct frame_unwind s390_stub_frame_unwind = {
+static const struct frame_unwind_legacy s390_stub_frame_unwind (
"s390 stub",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -2749,7 +2749,7 @@ static const struct frame_unwind s390_stub_frame_unwind = {
s390_stub_frame_prev_register,
NULL,
s390_stub_frame_sniffer
-};
+);
/* Frame base handling. */
diff --git a/gdb/sentinel-frame.c b/gdb/sentinel-frame.c
index 9fe4036dbbe..c809259920d 100644
--- a/gdb/sentinel-frame.c
+++ b/gdb/sentinel-frame.c
@@ -78,8 +78,7 @@ sentinel_frame_prev_arch (const frame_info_ptr &this_frame,
return cache->regcache->arch ();
}
-const struct frame_unwind sentinel_frame_unwind =
-{
+const struct frame_unwind_legacy sentinel_frame_unwind (
"sentinel",
SENTINEL_FRAME,
FRAME_UNWIND_GDB,
@@ -89,5 +88,5 @@ const struct frame_unwind sentinel_frame_unwind =
NULL,
NULL,
NULL,
- sentinel_frame_prev_arch,
-};
+ sentinel_frame_prev_arch
+);
diff --git a/gdb/sentinel-frame.h b/gdb/sentinel-frame.h
index 1a37ff1f49a..4b498f18940 100644
--- a/gdb/sentinel-frame.h
+++ b/gdb/sentinel-frame.h
@@ -34,6 +34,6 @@ extern void *sentinel_frame_cache (struct regcache *regcache);
/* At present there is only one type of sentinel frame. */
-extern const struct frame_unwind sentinel_frame_unwind;
+extern const struct frame_unwind_legacy sentinel_frame_unwind;
#endif /* !defined (SENTINEL_FRAME_H) */
diff --git a/gdb/sh-tdep.c b/gdb/sh-tdep.c
index 8491adbb5c1..d3cb50fe352 100644
--- a/gdb/sh-tdep.c
+++ b/gdb/sh-tdep.c
@@ -1928,7 +1928,7 @@ sh_frame_this_id (const frame_info_ptr &this_frame, void **this_cache,
*this_id = frame_id_build (cache->saved_sp, cache->pc);
}
-static const struct frame_unwind sh_frame_unwind = {
+static const struct frame_unwind_legacy sh_frame_unwind (
"sh prologue",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -1937,7 +1937,7 @@ static const struct frame_unwind sh_frame_unwind = {
sh_frame_prev_register,
NULL,
default_frame_sniffer
-};
+);
static CORE_ADDR
sh_frame_base_address (const frame_info_ptr &this_frame, void **this_cache)
@@ -1995,8 +1995,7 @@ sh_stub_unwind_sniffer (const struct frame_unwind *self,
return 0;
}
-static const struct frame_unwind sh_stub_unwind =
-{
+static const struct frame_unwind_legacy sh_stub_unwind (
"sh stub",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -2005,7 +2004,7 @@ static const struct frame_unwind sh_stub_unwind =
sh_frame_prev_register,
NULL,
sh_stub_unwind_sniffer
-};
+);
/* Implement the stack_frame_destroyed_p gdbarch method.
diff --git a/gdb/sparc-netbsd-tdep.c b/gdb/sparc-netbsd-tdep.c
index 5b3dd067375..bc058dcbf63 100644
--- a/gdb/sparc-netbsd-tdep.c
+++ b/gdb/sparc-netbsd-tdep.c
@@ -248,8 +248,7 @@ sparc32nbsd_sigcontext_frame_sniffer (const struct frame_unwind *self,
return 0;
}
-static const struct frame_unwind sparc32nbsd_sigcontext_frame_unwind =
-{
+static const struct frame_unwind_legacy sparc32nbsd_sigcontext_frame_unwind (
"sparc32 netbsd sigcontext",
SIGTRAMP_FRAME,
FRAME_UNWIND_ARCH,
@@ -258,7 +257,7 @@ static const struct frame_unwind sparc32nbsd_sigcontext_frame_unwind =
sparc32nbsd_sigcontext_frame_prev_register,
NULL,
sparc32nbsd_sigcontext_frame_sniffer
-};
+);
\f
/* Return the address of a system call's alternative return
address. */
diff --git a/gdb/sparc-obsd-tdep.c b/gdb/sparc-obsd-tdep.c
index 5d42e4e6515..fe6a73909ae 100644
--- a/gdb/sparc-obsd-tdep.c
+++ b/gdb/sparc-obsd-tdep.c
@@ -133,8 +133,7 @@ sparc32obsd_sigtramp_frame_sniffer (const struct frame_unwind *self,
return 0;
}
-static const struct frame_unwind sparc32obsd_sigtramp_frame_unwind =
-{
+static const struct frame_unwind_legacy sparc32obsd_sigtramp_frame_unwind (
"sparc32 openbsd sigtramp",
SIGTRAMP_FRAME,
FRAME_UNWIND_ARCH,
@@ -143,7 +142,7 @@ static const struct frame_unwind sparc32obsd_sigtramp_frame_unwind =
sparc32obsd_sigtramp_frame_prev_register,
NULL,
sparc32obsd_sigtramp_frame_sniffer
-};
+);
\f
diff --git a/gdb/sparc-sol2-tdep.c b/gdb/sparc-sol2-tdep.c
index bb9c8a549b1..b6ac8011b7b 100644
--- a/gdb/sparc-sol2-tdep.c
+++ b/gdb/sparc-sol2-tdep.c
@@ -179,8 +179,7 @@ sparc32_sol2_sigtramp_frame_sniffer (const struct frame_unwind *self,
return sol2_sigtramp_p (this_frame);
}
-static const struct frame_unwind sparc32_sol2_sigtramp_frame_unwind =
-{
+static const struct frame_unwind_legacy sparc32_sol2_sigtramp_frame_unwind (
"sparc32 solaris sigtramp",
SIGTRAMP_FRAME,
FRAME_UNWIND_ARCH,
@@ -189,7 +188,7 @@ static const struct frame_unwind sparc32_sol2_sigtramp_frame_unwind =
sparc32_sol2_sigtramp_frame_prev_register,
NULL,
sparc32_sol2_sigtramp_frame_sniffer
-};
+);
\f
diff --git a/gdb/sparc-tdep.c b/gdb/sparc-tdep.c
index a40570d6894..e951e0b57a1 100644
--- a/gdb/sparc-tdep.c
+++ b/gdb/sparc-tdep.c
@@ -1345,8 +1345,7 @@ sparc32_frame_prev_register (const frame_info_ptr &this_frame,
return frame_unwind_got_register (this_frame, regnum, regnum);
}
-static const struct frame_unwind sparc32_frame_unwind =
-{
+static const struct frame_unwind_legacy sparc32_frame_unwind (
"sparc32 prologue",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -1355,7 +1354,7 @@ static const struct frame_unwind sparc32_frame_unwind =
sparc32_frame_prev_register,
NULL,
default_frame_sniffer
-};
+);
\f
static CORE_ADDR
diff --git a/gdb/sparc64-fbsd-tdep.c b/gdb/sparc64-fbsd-tdep.c
index 1d4c075a961..6630a9b51b0 100644
--- a/gdb/sparc64-fbsd-tdep.c
+++ b/gdb/sparc64-fbsd-tdep.c
@@ -196,8 +196,7 @@ sparc64fbsd_sigtramp_frame_sniffer (const struct frame_unwind *self,
return 0;
}
-static const struct frame_unwind sparc64fbsd_sigtramp_frame_unwind =
-{
+static const struct frame_unwind_legacy sparc64fbsd_sigtramp_frame_unwind (
"sparc64 freebsd sigtramp",
SIGTRAMP_FRAME,
FRAME_UNWIND_ARCH,
@@ -206,7 +205,7 @@ static const struct frame_unwind sparc64fbsd_sigtramp_frame_unwind =
sparc64fbsd_sigtramp_frame_prev_register,
NULL,
sparc64fbsd_sigtramp_frame_sniffer
-};
+);
\f
static const struct regset sparc64fbsd_gregset =
diff --git a/gdb/sparc64-netbsd-tdep.c b/gdb/sparc64-netbsd-tdep.c
index 82eb99f57c1..53c49fe1130 100644
--- a/gdb/sparc64-netbsd-tdep.c
+++ b/gdb/sparc64-netbsd-tdep.c
@@ -222,8 +222,7 @@ sparc64nbsd_sigtramp_frame_sniffer (const struct frame_unwind *self,
return 0;
}
-static const struct frame_unwind sparc64nbsd_sigcontext_frame_unwind =
-{
+static const struct frame_unwind_legacy sparc64nbsd_sigcontext_frame_unwind (
"sparc64 netbsd sigcontext",
SIGTRAMP_FRAME,
FRAME_UNWIND_ARCH,
@@ -232,7 +231,7 @@ static const struct frame_unwind sparc64nbsd_sigcontext_frame_unwind =
sparc64nbsd_sigcontext_frame_prev_register,
NULL,
sparc64nbsd_sigtramp_frame_sniffer
-};
+);
\f
static const struct regset sparc64nbsd_gregset =
diff --git a/gdb/sparc64-obsd-tdep.c b/gdb/sparc64-obsd-tdep.c
index ad69476dac4..92c7f311a0d 100644
--- a/gdb/sparc64-obsd-tdep.c
+++ b/gdb/sparc64-obsd-tdep.c
@@ -219,8 +219,7 @@ sparc64obsd_sigtramp_frame_sniffer (const struct frame_unwind *self,
return 0;
}
-static const struct frame_unwind sparc64obsd_frame_unwind =
-{
+static const struct frame_unwind_legacy sparc64obsd_frame_unwind (
"sparc64 openbsd sigtramp",
SIGTRAMP_FRAME,
FRAME_UNWIND_ARCH,
@@ -229,7 +228,7 @@ static const struct frame_unwind sparc64obsd_frame_unwind =
sparc64obsd_frame_prev_register,
NULL,
sparc64obsd_sigtramp_frame_sniffer
-};
+);
\f
/* Kernel debugging support. */
@@ -304,8 +303,7 @@ sparc64obsd_trapframe_sniffer (const struct frame_unwind *self,
return 0;
}
-static const struct frame_unwind sparc64obsd_trapframe_unwind =
-{
+static const struct frame_unwind_legacy sparc64obsd_trapframe_unwind (
"sparc64 openbsd trap",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -314,7 +312,7 @@ static const struct frame_unwind sparc64obsd_trapframe_unwind =
sparc64obsd_trapframe_prev_register,
NULL,
sparc64obsd_trapframe_sniffer
-};
+);
\f
/* Threads support. */
diff --git a/gdb/sparc64-sol2-tdep.c b/gdb/sparc64-sol2-tdep.c
index e8d09e2516e..cadbf49788c 100644
--- a/gdb/sparc64-sol2-tdep.c
+++ b/gdb/sparc64-sol2-tdep.c
@@ -182,8 +182,7 @@ sparc64_sol2_sigtramp_frame_sniffer (const struct frame_unwind *self,
return sol2_sigtramp_p (this_frame);
}
-static const struct frame_unwind sparc64_sol2_sigtramp_frame_unwind =
-{
+static const struct frame_unwind_legacy sparc64_sol2_sigtramp_frame_unwind (
"sparc64 solaris sigtramp",
SIGTRAMP_FRAME,
FRAME_UNWIND_ARCH,
@@ -192,7 +191,7 @@ static const struct frame_unwind sparc64_sol2_sigtramp_frame_unwind =
sparc64_sol2_sigtramp_frame_prev_register,
NULL,
sparc64_sol2_sigtramp_frame_sniffer
-};
+);
\f
diff --git a/gdb/sparc64-tdep.c b/gdb/sparc64-tdep.c
index 30ee241c5b6..43427ad1aba 100644
--- a/gdb/sparc64-tdep.c
+++ b/gdb/sparc64-tdep.c
@@ -1133,8 +1133,7 @@ sparc64_frame_prev_register (const frame_info_ptr &this_frame, void **this_cache
return frame_unwind_got_register (this_frame, regnum, regnum);
}
-static const struct frame_unwind sparc64_frame_unwind =
-{
+static const struct frame_unwind_legacy sparc64_frame_unwind (
"sparc64 prologue",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -1143,7 +1142,7 @@ static const struct frame_unwind sparc64_frame_unwind =
sparc64_frame_prev_register,
NULL,
default_frame_sniffer
-};
+);
\f
static CORE_ADDR
diff --git a/gdb/tic6x-tdep.c b/gdb/tic6x-tdep.c
index bc0465b4635..00192caf386 100644
--- a/gdb/tic6x-tdep.c
+++ b/gdb/tic6x-tdep.c
@@ -451,8 +451,7 @@ tic6x_frame_base_address (const frame_info_ptr &this_frame, void **this_cache)
return info->base;
}
-static const struct frame_unwind tic6x_frame_unwind =
-{
+static const struct frame_unwind_legacy tic6x_frame_unwind (
"tic6x prologue",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -461,7 +460,7 @@ static const struct frame_unwind tic6x_frame_unwind =
tic6x_frame_prev_register,
NULL,
default_frame_sniffer
-};
+);
static const struct frame_base tic6x_frame_base =
{
@@ -515,8 +514,7 @@ tic6x_stub_unwind_sniffer (const struct frame_unwind *self,
return 0;
}
-static const struct frame_unwind tic6x_stub_unwind =
-{
+static const struct frame_unwind_legacy tic6x_stub_unwind (
"tic6x stub",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -525,7 +523,7 @@ static const struct frame_unwind tic6x_stub_unwind =
tic6x_frame_prev_register,
NULL,
tic6x_stub_unwind_sniffer
-};
+);
/* Return the instruction on address PC. */
diff --git a/gdb/tilegx-tdep.c b/gdb/tilegx-tdep.c
index fc1c01c7ea4..18cb722b4a8 100644
--- a/gdb/tilegx-tdep.c
+++ b/gdb/tilegx-tdep.c
@@ -899,7 +899,7 @@ tilegx_frame_base_address (const frame_info_ptr &this_frame, void **this_cache)
return cache->base;
}
-static const struct frame_unwind tilegx_frame_unwind = {
+static const struct frame_unwind_legacy tilegx_frame_unwind (
"tilegx prologue",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -909,7 +909,7 @@ static const struct frame_unwind tilegx_frame_unwind = {
NULL, /* const struct frame_data *unwind_data */
default_frame_sniffer, /* frame_sniffer_ftype *sniffer */
NULL /* frame_prev_pc_ftype *prev_pc */
-};
+);
static const struct frame_base tilegx_frame_base = {
&tilegx_frame_unwind,
diff --git a/gdb/tramp-frame.c b/gdb/tramp-frame.c
index 2fcc3814e59..7fee4d5c71d 100644
--- a/gdb/tramp-frame.c
+++ b/gdb/tramp-frame.c
@@ -123,7 +123,7 @@ tramp_frame_sniffer (const struct frame_unwind *self,
const frame_info_ptr &this_frame,
void **this_cache)
{
- const struct tramp_frame *tramp = self->unwind_data->tramp_frame;
+ const struct tramp_frame *tramp = self->unwind_data ()->tramp_frame;
CORE_ADDR pc = get_frame_pc (this_frame);
CORE_ADDR func;
struct tramp_frame_cache *tramp_cache;
@@ -142,6 +142,46 @@ tramp_frame_sniffer (const struct frame_unwind *self,
return 1;
}
+class frame_unwind_trampoline : public frame_unwind
+{
+private:
+ frame_prev_arch_ftype *prev_arch_p;
+public:
+ frame_unwind_trampoline (enum frame_type t, const struct frame_data *d,
+ frame_prev_arch_ftype *pa)
+ : frame_unwind ("trampoline", t, FRAME_UNWIND_GDB, d), prev_arch_p (pa)
+ { }
+
+ int sniffer(const frame_unwind *self, const frame_info_ptr &this_frame,
+ void **this_prologue_cache) const override
+ {
+ return tramp_frame_sniffer (self, this_frame, this_prologue_cache);
+ }
+ void this_id (const frame_info_ptr &this_frame, void **this_prologue_cache,
+ struct frame_id *id) const override
+ {
+ tramp_frame_this_id (this_frame, this_prologue_cache, id);
+ }
+ struct value *prev_register (const frame_info_ptr &this_frame,
+ void **this_prologue_cache,
+ int regnum) const override
+ {
+ return tramp_frame_prev_register (this_frame, this_prologue_cache, regnum);
+ }
+
+ struct gdbarch *prev_arch (const frame_info_ptr &this_frame,
+ void **this_prologue_cache) const override
+ {
+ return prev_arch_p (this_frame, this_prologue_cache);
+ }
+
+ /* FIXME: This should have a proper algorithm to deallocate the cache,
+ otherwise memory is leaked. This method is empty here just so the
+ migration to c++ classes doesn't add regressions. */
+ void dealloc_cache (frame_info *self, void *this_cache) const override
+ { }
+};
+
void
tramp_frame_prepend_unwinder (struct gdbarch *gdbarch,
const struct tramp_frame *tramp_frame)
@@ -160,16 +200,11 @@ tramp_frame_prepend_unwinder (struct gdbarch *gdbarch,
gdb_assert (tramp_frame->insn_size <= sizeof (tramp_frame->insn[0].bytes));
data = GDBARCH_OBSTACK_ZALLOC (gdbarch, struct frame_data);
- unwinder = GDBARCH_OBSTACK_ZALLOC (gdbarch, struct frame_unwind);
-
data->tramp_frame = tramp_frame;
- unwinder->type = tramp_frame->frame_type;
- unwinder->unwind_data = data;
- unwinder->unwinder_class = FRAME_UNWIND_GDB;
- unwinder->sniffer = tramp_frame_sniffer;
- unwinder->stop_reason = default_frame_unwind_stop_reason;
- unwinder->this_id = tramp_frame_this_id;
- unwinder->prev_register = tramp_frame_prev_register;
- unwinder->prev_arch = tramp_frame->prev_arch;
+
+ unwinder = obstack_new <frame_unwind_trampoline> (gdbarch_obstack (gdbarch),
+ tramp_frame->frame_type,
+ data,
+ tramp_frame->prev_arch);
frame_unwind_prepend_unwinder (gdbarch, unwinder);
}
diff --git a/gdb/v850-tdep.c b/gdb/v850-tdep.c
index f875a351ac7..733e1985fa8 100644
--- a/gdb/v850-tdep.c
+++ b/gdb/v850-tdep.c
@@ -1319,7 +1319,7 @@ v850_frame_this_id (const frame_info_ptr &this_frame, void **this_cache,
*this_id = frame_id_build (cache->saved_regs[E_SP_REGNUM].addr (), cache->pc);
}
-static const struct frame_unwind v850_frame_unwind = {
+static const struct frame_unwind_legacy v850_frame_unwind (
"v850 prologue",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -1328,7 +1328,7 @@ static const struct frame_unwind v850_frame_unwind = {
v850_frame_prev_register,
NULL,
default_frame_sniffer
-};
+);
static CORE_ADDR
v850_frame_base_address (const frame_info_ptr &this_frame, void **this_cache)
diff --git a/gdb/vax-tdep.c b/gdb/vax-tdep.c
index 460a6058d0a..fea24fcf599 100644
--- a/gdb/vax-tdep.c
+++ b/gdb/vax-tdep.c
@@ -385,8 +385,7 @@ vax_frame_prev_register (const frame_info_ptr &this_frame,
return trad_frame_get_prev_register (this_frame, cache->saved_regs, regnum);
}
-static const struct frame_unwind vax_frame_unwind =
-{
+static const struct frame_unwind_legacy vax_frame_unwind (
"vax prologue",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -395,7 +394,7 @@ static const struct frame_unwind vax_frame_unwind =
vax_frame_prev_register,
NULL,
default_frame_sniffer
-};
+);
\f
static CORE_ADDR
diff --git a/gdb/windows-tdep.c b/gdb/windows-tdep.c
index f9585adf8fa..07b1e9b1e2c 100644
--- a/gdb/windows-tdep.c
+++ b/gdb/windows-tdep.c
@@ -1320,10 +1320,9 @@ cygwin_sigwrapper_frame_cache (frame_info_ptr this_frame, void **this_cache)
return cache;
}
-static struct value *
-cygwin_sigwrapper_frame_prev_register (const frame_info_ptr &this_frame,
- void **this_cache,
- int regnum)
+struct value *
+cygwin_sigwrapper_frame_unwind::prev_register
+ (const frame_info_ptr &this_frame, void **this_cache, int regnum) const
{
struct gdbarch *gdbarch = get_frame_arch (this_frame);
struct cygwin_sigwrapper_frame_cache *cache
@@ -1339,18 +1338,18 @@ cygwin_sigwrapper_frame_prev_register (const frame_info_ptr &this_frame,
return frame_unwind_got_register (this_frame, regnum, regnum);
}
-static void
-cygwin_sigwrapper_frame_this_id (const frame_info_ptr &this_frame,
- void **this_cache,
- struct frame_id *this_id)
+void
+cygwin_sigwrapper_frame_unwind::this_id (const frame_info_ptr &this_frame,
+ void **this_cache,
+ struct frame_id *this_id) const
{
*this_id = frame_id_build_unavailable_stack (get_frame_func (this_frame));
}
-static int
-cygwin_sigwrapper_frame_sniffer (const struct frame_unwind *self_,
- const frame_info_ptr &this_frame,
- void **this_cache)
+int
+cygwin_sigwrapper_frame_unwind::sniffer (const struct frame_unwind *self_,
+ const frame_info_ptr &this_frame,
+ void **this_cache) const
{
const auto *self = (const struct cygwin_sigwrapper_frame_unwind *) self_;
struct gdbarch *gdbarch = get_frame_arch (this_frame);
@@ -1395,13 +1394,7 @@ cygwin_sigwrapper_frame_sniffer (const struct frame_unwind *self_,
cygwin_sigwrapper_frame_unwind::cygwin_sigwrapper_frame_unwind
(gdb::array_view<const gdb::array_view<const gdb_byte>> patterns_list)
- : frame_unwind (),
- patterns_list (patterns_list)
+ : frame_unwind ("cygwin sigwrapper", NORMAL_FRAME, FRAME_UNWIND_GDB,
+ nullptr), patterns_list (patterns_list)
{
- name = "cygwin sigwrapper";
- type = NORMAL_FRAME;
- stop_reason = default_frame_unwind_stop_reason;
- this_id = cygwin_sigwrapper_frame_this_id;
- prev_register = cygwin_sigwrapper_frame_prev_register;
- sniffer = cygwin_sigwrapper_frame_sniffer;
}
diff --git a/gdb/windows-tdep.h b/gdb/windows-tdep.h
index f122f7aaa61..bdab0962ede 100644
--- a/gdb/windows-tdep.h
+++ b/gdb/windows-tdep.h
@@ -60,8 +60,9 @@ extern bool is_linked_with_cygwin_dll (bfd *abfd);
/* Cygwin sigwapper unwinder. Unwinds signal frames over
sigbe/sigdelayed. */
-struct cygwin_sigwrapper_frame_unwind : public frame_unwind
+class cygwin_sigwrapper_frame_unwind : public frame_unwind
{
+public:
explicit cygwin_sigwrapper_frame_unwind
(gdb::array_view<const gdb::array_view<const gdb_byte>> patterns_list);
@@ -73,6 +74,19 @@ struct cygwin_sigwrapper_frame_unwind : public frame_unwind
If any pattern in the list matches, then the frame is assumed to
be a sigwrapper frame. */
gdb::array_view<const gdb::array_view<const gdb_byte>> patterns_list;
+
+ /* Calculate the frame ID of a cygwin wrapper. */
+ void this_id (const frame_info_ptr &this_frame, void **this_prologue_cache,
+ struct frame_id *id) const override;
+
+ /* Sniff the frame to tell if this unwinder should be used. */
+ int sniffer (const frame_unwind *self, const frame_info_ptr &this_frame,
+ void **this_prologue_cache) const override;
+
+ /* Calculate the value of a given register in the previous frame. */
+ struct value *prev_register (const frame_info_ptr &this_frame,
+ void **this_cache,
+ int regnum) const override;
};
#endif
diff --git a/gdb/xstormy16-tdep.c b/gdb/xstormy16-tdep.c
index 73fa6ed9c0d..750c94a5701 100644
--- a/gdb/xstormy16-tdep.c
+++ b/gdb/xstormy16-tdep.c
@@ -727,7 +727,7 @@ xstormy16_frame_base_address (const frame_info_ptr &this_frame, void **this_cach
return cache->base;
}
-static const struct frame_unwind xstormy16_frame_unwind = {
+static const struct frame_unwind_legacy xstormy16_frame_unwind (
"xstormy16 prologue",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -736,7 +736,7 @@ static const struct frame_unwind xstormy16_frame_unwind = {
xstormy16_frame_prev_register,
NULL,
default_frame_sniffer
-};
+);
static const struct frame_base xstormy16_frame_base = {
&xstormy16_frame_unwind,
diff --git a/gdb/xtensa-tdep.c b/gdb/xtensa-tdep.c
index a0801466c42..1425b6029f3 100644
--- a/gdb/xtensa-tdep.c
+++ b/gdb/xtensa-tdep.c
@@ -1495,9 +1495,7 @@ xtensa_frame_prev_register (const frame_info_ptr &this_frame,
}
-static const struct frame_unwind
-xtensa_unwind =
-{
+static const struct frame_unwind_legacy xtensa_unwind (
"xtensa prologue",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -1506,7 +1504,7 @@ xtensa_unwind =
xtensa_frame_prev_register,
NULL,
default_frame_sniffer
-};
+);
static CORE_ADDR
xtensa_frame_base_address (const frame_info_ptr &this_frame, void **this_cache)
diff --git a/gdb/z80-tdep.c b/gdb/z80-tdep.c
index ea78a01cbfc..7b3d7f6b6b5 100644
--- a/gdb/z80-tdep.c
+++ b/gdb/z80-tdep.c
@@ -1062,9 +1062,7 @@ z80_insn_is_jump (struct gdbarch *gdbarch, CORE_ADDR addr)
return 0;
}
-static const struct frame_unwind
-z80_frame_unwind =
-{
+static const struct frame_unwind_legacy z80_frame_unwind (
"z80",
NORMAL_FRAME,
FRAME_UNWIND_ARCH,
@@ -1075,7 +1073,7 @@ z80_frame_unwind =
default_frame_sniffer
/*dealloc_cache*/
/*prev_arch*/
-};
+);
/* Initialize the gdbarch struct for the Z80 arch */
static struct gdbarch *
--
2.44.0
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v2 4/5] gdb: introduce ability to disable frame unwinders
2024-04-08 20:19 [PATCH v2 0/5] Modernize frame unwinders and add disable feature Guinevere Larsen
` (2 preceding siblings ...)
2024-04-08 20:19 ` [PATCH v2 3/5] gdb: Migrate frame unwinders to use C++ classes Guinevere Larsen
@ 2024-04-08 20:19 ` Guinevere Larsen
2024-04-09 2:47 ` Eli Zaretskii
2024-04-08 20:19 ` [PATCH v2 5/5] gdb/testsuite: Test for a backtrace through object without debuginfo Guinevere Larsen
` (2 subsequent siblings)
6 siblings, 1 reply; 12+ messages in thread
From: Guinevere Larsen @ 2024-04-08 20:19 UTC (permalink / raw)
To: gdb-patches; +Cc: Guinevere Larsen
Sometimes, in the GDB testsuite, we want to test the ability of specific
unwinders to handle some piece of code. Usually this is done by trying
to outsmart GDB, or by coercing the compiler to remove information that
GDB would rely on. Both approaches have problems as GDB gets smarter
with time, and that compilers might differ in version and behavior, or
simply introduce new useful information. This was requested back in 2003
in PR backtrace/8434.
To improve our ability to thoroughly test GDB, this patch introduces a
new maintenance command that allows a user to disable some unwinders,
based on either the name of the unwinder or on its class. With this
change, it will now be possible for GDB to not find any frame unwinders
for a given frame, which would previously cause GDB to assert. GDB will
now check if any frame unwinder has been disabled, and if some has, it
will just error out instead of asserting.
Unwinders can be disabled or re-enabled in 3 different ways:
* Disabling/enabling all at once (using '-all').
* By specifying an unwinder class to be disabled (option '-class').
* By specifying the name of an unwinder (option '-name').
If you give no options to the command, GDB assumes the input is an
unwinder class. '-class' would make no difference if used, is just here
for completeness.
This command is meant to be used once the inferior is already at the
desired location for the test. An example session would be:
(gdb) start
Temporary breakpoint 1, main () at omp.c:17
17 func();
(gdb) maint frame-unwinder disable ARCH
(gdb) bt
\#0 main () at omp.c:17
(gdb) maint frame-unwinder enable ARCH
(gdb) cont
Continuing.
Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=8434
---
gdb/NEWS | 7 +
gdb/doc/gdb.texinfo | 24 +++
gdb/frame-unwind.c | 154 +++++++++++++++++-
gdb/frame-unwind.h | 13 ++
gdb/testsuite/gdb.base/frame-unwind-disable.c | 21 +++
.../gdb.base/frame-unwind-disable.exp | 114 +++++++++++++
6 files changed, 329 insertions(+), 4 deletions(-)
create mode 100644 gdb/testsuite/gdb.base/frame-unwind-disable.c
create mode 100644 gdb/testsuite/gdb.base/frame-unwind-disable.exp
diff --git a/gdb/NEWS b/gdb/NEWS
index feb3a37393a..da83db81112 100644
--- a/gdb/NEWS
+++ b/gdb/NEWS
@@ -54,6 +54,13 @@ disable missing-debug-handler LOCUS HANDLER
maintenance info linux-lwps
List all LWPs under control of the linux-nat target.
+maintenance frame-unwinder disable [-all | -name NAME | [-class] CLASS]
+maintenance frame-unwinder enable [-all | -name NAME | [-class] CLASS]
+ Enable or disable frame unwinders. This is only meant to be used when
+ testing unwinders themselves, and you want to ensure that a fallback
+ algorithm won't obscure a regression. GDB is not expected to behave
+ well if you try to execute the inferior with unwinders disabled.
+
set remote thread-options-packet
show remote thread-options-packet
Set/show the use of the thread options packet.
diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
index 727f9275bfb..2921f2007ab 100644
--- a/gdb/doc/gdb.texinfo
+++ b/gdb/doc/gdb.texinfo
@@ -42022,6 +42022,30 @@ architecture, then enabling this flag does not cause them to be used.
@item maint info frame-unwinders
List the frame unwinders currently in effect, starting with the highest priority.
+@kindex maint frame-unwinder disable
+@kindex maint frame-unwinder enable
+@item maint frame-unwinder disable [@code{-all} | @code{-name} @var{NAME} | [@code{-class}] @var{CLASS}]
+@item maint frame-unwinder enable [@code{-all} | @code{-name} @var{NAME} | [@code{-class}] @var{CLASS}]
+Disable or enable frame unwinders. This is meant only as a testing tool, and
+@value{GDBN} is not guaranteed to work properly if it is unable to find
+valid frame unwinders.
+
+The meaning of each of the invocations are as follows:
+
+@table @samp
+@item @code{-all}
+Disable or enable all unwinders.
+@item @code{-name} @var{NAME}
+@var{NAME} is the exact name of the unwinder to be disabled or enabled.
+@item [@code{-class}] @var{CLASS}
+@var{CLASS} is the class of frame unwinders to be disabled or enabled.
+The class may include the prefix @code{FRAME_UNWINDER_}, but it is not
+required.
+@end table
+
+@var{NAME} and @var{CLASS} are always case insensitive. If no option
+starting wth @code{-} is given, @value{GDBN} assumes @code{-class}.
+
@kindex maint set worker-threads
@kindex maint show worker-threads
@item maint set worker-threads
diff --git a/gdb/frame-unwind.c b/gdb/frame-unwind.c
index fd3d3b378ab..0806770f5a3 100644
--- a/gdb/frame-unwind.c
+++ b/gdb/frame-unwind.c
@@ -87,6 +87,23 @@ frame_unwinder_class_str (frame_unwind_class uclass)
return location->second;
}
+/* Case insensitive search for a frame_unwind_class based on the given
+ string. */
+static enum frame_unwind_class
+str_to_frame_unwind_class (const char *class_str)
+{
+ const char *prefix = "FRAME_UNWIND_";
+ /* Skip the prefix if present. */
+ if (strncasecmp (class_str, prefix, strlen(prefix)) == 0)
+ class_str += strlen(prefix);
+ for (const auto& it : unwind_class_conversion)
+ {
+ if (strcasecmp(it.second, class_str) == 0)
+ return it.first;
+ }
+ error (_("Unknown frame unwind class: %s"), class_str);
+}
+
void
frame_unwind_prepend_unwinder (struct gdbarch *gdbarch,
const struct frame_unwind *unwinder)
@@ -184,25 +201,47 @@ frame_unwind_find_by_frame (const frame_info_ptr &this_frame, void **this_cache)
const struct frame_unwind *unwinder_from_target;
+ /* If we see a disabled unwinder, we assume some test is being run on
+ GDB, and we don't want to assert at the end of this function. */
+ bool seen_disabled_unwinder = false;
+
unwinder_from_target = target_get_unwinder ();
if (unwinder_from_target != NULL
+ && unwinder_from_target->enabled ()
&& frame_unwind_try_unwinder (this_frame, this_cache,
unwinder_from_target))
return;
+ else if (unwinder_from_target != nullptr
+ && !unwinder_from_target->enabled ())
+ seen_disabled_unwinder = true;
unwinder_from_target = target_get_tailcall_unwinder ();
if (unwinder_from_target != NULL
+ && unwinder_from_target->enabled ()
&& frame_unwind_try_unwinder (this_frame, this_cache,
unwinder_from_target))
return;
+ else if (unwinder_from_target != nullptr
+ && !unwinder_from_target->enabled ())
+ seen_disabled_unwinder |= true;
struct gdbarch *gdbarch = get_frame_arch (this_frame);
std::vector<const frame_unwind*> table = get_frame_unwind_table (gdbarch);
for (auto unwinder: table)
- if (frame_unwind_try_unwinder (this_frame, this_cache, unwinder))
- return;
+ {
+ if (!unwinder->enabled ())
+ {
+ seen_disabled_unwinder |= true;
+ continue;
+ }
+ if (frame_unwind_try_unwinder (this_frame, this_cache, unwinder))
+ return;
+ }
- internal_error (_("frame_unwind_find_by_frame failed"));
+ if (seen_disabled_unwinder)
+ error (_("frame_unwind_find_by_frame failed"));
+ else
+ internal_error (_("frame_unwind_find_by_frame failed"));
}
/* A default frame sniffer which always accepts the frame. Used by
@@ -396,10 +435,11 @@ maintenance_info_frame_unwinders (const char *args, int from_tty)
std::vector<const frame_unwind*> table = get_frame_unwind_table (gdbarch);
ui_out *uiout = current_uiout;
- ui_out_emit_table table_emitter (uiout, 3, -1, "FrameUnwinders");
+ ui_out_emit_table table_emitter (uiout, 4, -1, "FrameUnwinders");
uiout->table_header (27, ui_left, "name", "Name");
uiout->table_header (25, ui_left, "type", "Type");
uiout->table_header (9, ui_left, "class", "Class");
+ uiout->table_header (8, ui_left, "enabled", "Enabled");
uiout->table_body ();
for (const struct frame_unwind* unwinder: table)
@@ -407,15 +447,88 @@ maintenance_info_frame_unwinders (const char *args, int from_tty)
const char *name = unwinder->name ();
const char *type = frame_type_str (unwinder->type ());
const char *uclass = frame_unwinder_class_str (unwinder->unwinder_class ());
+ const char *enabled = (unwinder->enabled ()) ? "Y" : "N";
ui_out_emit_list tuple_emitter (uiout, nullptr);
uiout->field_string ("name", name);
uiout->field_string ("type", type);
uiout->field_string ("class", uclass);
+ uiout->field_string ("enabled", enabled);
uiout->text ("\n");
}
}
+/* Helper function to both enable and disable frame unwinders.
+ if ENABLE is true, this call will be enabling unwinders,
+ otherwise the unwinders will be disabled. */
+static void
+enable_disable_frame_unwinders (const char *args, int from_tty, bool enable)
+{
+ reinit_frame_cache ();
+ if (args == nullptr)
+ error (_("specify which frame unwinder(s) should be %s"),
+ (enable)? "enabled" : "disabled");
+ struct gdbarch* gdbarch = current_inferior ()->arch ();
+ std::vector<const frame_unwind *> unwinder_list
+ = gdbarch_get_unwinder_list (gdbarch);
+
+ /* First see if the user wants to change all unwinders. */
+ if (check_for_argument (&args, "-all"))
+ {
+ for (const frame_unwind *u : unwinder_list)
+ u->set_enabled (enable);
+ return;
+ }
+
+ /* If user entered a specific unwinder name, handle it here. If the
+ unwinder is already at the expected state, error out. */
+ if (check_for_argument (&args, "-name"))
+ {
+ bool did_something = false;
+ for (const frame_unwind *unwinder : unwinder_list)
+ {
+ if (strcasecmp (unwinder->name (), args) == 0)
+ {
+ if (unwinder->enabled () == enable)
+ error (_("unwinder %s is already %s"),
+ unwinder->name (),
+ (unwinder->enabled ()) ? ("enabled") : ("disabled"));
+ unwinder->set_enabled (enable);
+
+ did_something = true;
+ break;
+ }
+ }
+ if (!did_something)
+ error (_("couldn't find unwinder named %s"),args);
+ }
+ else
+ {
+ /* Discard '-class' argument, if provided. */
+ check_for_argument (&args, "-class");
+ enum frame_unwind_class dclass = str_to_frame_unwind_class (args);
+ for (auto unwinder: unwinder_list)
+ {
+ if (unwinder->unwinder_class () == dclass)
+ unwinder->set_enabled (enable);
+ }
+ }
+}
+
+/* Implement "maint frame-unwinders disable" command. */
+static void
+maintenance_disable_frame_unwinders (const char *args, int from_tty)
+{
+ enable_disable_frame_unwinders (args, from_tty, false);
+}
+
+/* Implement "maint frame-unwinders disable" command. */
+static void
+maintenance_enable_frame_unwinders (const char *args, int from_tty)
+{
+ enable_disable_frame_unwinders (args, from_tty, true);
+}
+
void _initialize_frame_unwind ();
void
_initialize_frame_unwind ()
@@ -427,4 +540,37 @@ _initialize_frame_unwind ()
_("List the frame unwinders currently in effect, "
"starting with the highest priority."),
&maintenanceinfolist);
+
+ /* Add "maint frame-unwinder disable/enable". */
+ static struct cmd_list_element *maint_frame_unwinder;
+
+ add_basic_prefix_cmd ("frame-unwinder", class_maintenance,
+ _("Commands handling frame unwinders."),
+ &maint_frame_unwinder, 0, &maintenancelist);
+
+ add_cmd ("disable", class_maintenance, maintenance_disable_frame_unwinders,
+ _("\
+Disable one or more frame unwinder(s).\n\
+Usage: maint frame-unwinder disable [-all | -name NAME | [-class] CLASS]\n\
+\n\
+These are the meanings of the options:\n\
+\t-all - All available unwinders will be disabled\n\
+\t-name - NAME is the exact name of the frame unwinder is to be disabled\n\
+\t-class - CLASS is the class of unwinders to be disabled.\n\
+\n\
+UNWINDER and NAME are case insensitive."),
+ & maint_frame_unwinder);
+
+ add_cmd ("enable", class_maintenance, maintenance_enable_frame_unwinders,
+ _("\
+Enable one or more frame unwinder(s).\n\
+Usage: maint frame-unwinder enable [-all | -name NAME | [-class] CLASS]\n\
+\n\
+These are the meanings of the options:\n\
+\t-all - All available unwinders will be enabled\n\
+\t-name - NAME is the exact name of the frame unwinder is to be enabled\n\
+\t-class - CLASS is the class of unwinders to be enabled.\n\
+\n\
+UNWINDER and NAME are case insensitive."),
+ & maint_frame_unwinder);
}
diff --git a/gdb/frame-unwind.h b/gdb/frame-unwind.h
index 62da34b6ee8..ffb131310dc 100644
--- a/gdb/frame-unwind.h
+++ b/gdb/frame-unwind.h
@@ -180,6 +180,9 @@ class frame_unwind
unwinding. */
enum frame_unwind_class m_unwinder_class;
const struct frame_data *m_unwind_data;
+
+ /* Whether this unwinder can be used when sniffing. */
+ mutable bool m_enabled = true;
public:
frame_unwind (const char *name, frame_type type, frame_unwind_class uclass,
const struct frame_data *data)
@@ -207,6 +210,16 @@ class frame_unwind
return m_unwind_data;
}
+ bool enabled () const
+ {
+ return m_enabled;
+ }
+
+ void set_enabled (bool state) const
+ {
+ m_enabled = state;
+ }
+
/* Default stop_reason function. It reports NO_REASON, unless the
frame is the outermost. */
virtual enum unwind_stop_reason stop_reason (const frame_info_ptr &this_frame,
diff --git a/gdb/testsuite/gdb.base/frame-unwind-disable.c b/gdb/testsuite/gdb.base/frame-unwind-disable.c
new file mode 100644
index 00000000000..078517c011e
--- /dev/null
+++ b/gdb/testsuite/gdb.base/frame-unwind-disable.c
@@ -0,0 +1,21 @@
+/* This testcase is part of GDB, the GNU debugger.
+
+ Copyright 2024 Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+int main ()
+{
+ return 0;
+}
diff --git a/gdb/testsuite/gdb.base/frame-unwind-disable.exp b/gdb/testsuite/gdb.base/frame-unwind-disable.exp
new file mode 100644
index 00000000000..4efc87ccfcf
--- /dev/null
+++ b/gdb/testsuite/gdb.base/frame-unwind-disable.exp
@@ -0,0 +1,114 @@
+# Copyright 2024 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Test multiple situations in which we may use the maintenance command to
+# disable and enable frame unwinders, and check that they really are
+# disabled when they say the are.
+
+standard_testfile .c
+
+# Proc to check if the unwinder of the given name is in the desired state.
+# STATE can be either Y or N.
+proc check_unwinder_state { unwinder_name state {testname ""} } {
+ if {${testname} == ""} {
+ set testname "checking state ${state} for ${unwinder_name}"
+ }
+ gdb_test "maint info frame-unwinders" \
+ ".*${unwinder_name}\\s+\\w+\\s+\\w+.+${state}.*" \
+ "${testname}"
+}
+
+proc check_unwinder_class { unwinder_class state {testname ""} } {
+ set should_pass true
+ if {$testname == ""} {
+ set testname "checking if $unwinder_class state is $state"
+ }
+ gdb_test_multiple "maint info frame-unwinders" "collect for $testname" -lbl {
+ -re "^\\w+\\s+\\w+\\s+${unwinder_class}\\s+\(.\)\\s+" {
+ set cur_state $expec_out(1, string)
+ if {$cur_state != $state} {
+ set should_pass false
+ }
+ exp_continue
+ }
+ -re "${::gdb_prompt} $" {
+ pass $gdb_test_name
+ }
+ }
+
+ gdb_assert {$should_pass == true} "$testname"
+}
+
+if {[prepare_for_testing "failed to prepare" ${testfile} ${srcfile} ]} {
+ return -1
+}
+
+if {![runto_main]} {
+ untested "couldn't run to main"
+ return
+}
+
+# Test disabling all unwinders
+check_unwinder_class "FRAME_UNWIND_\\w+" "Y" \
+ "Checking all unwinders before any changes"
+gdb_test_no_output "maint frame-unwinder disable -all"
+check_unwinder_class "FRAME_UNWIND_\\w+" "N" \
+ "Checking all unwinders were properly disabled"
+
+# Test if GDB can still make a backtrace once all unwinders are disabled.
+# It should be impossible.
+gdb_test "backtrace" ".*frame_unwind_find_by_frame failed.*" \
+ "confirm that no suitable unwinders are found"
+
+# Reenable all unwinders
+gdb_test_no_output "maint frame-unwinder enable -all"
+check_unwinder_class "FRAME_UNWIND_\\w+" "Y" \
+ "Checking all unwinders after re-enabling them all"
+
+# Check that we are able to get backtraces once again.
+gdb_test "backtrace" ".0\\s+main .. at.*" \
+ "confirm we now get usable backtraces"
+
+# Check if we can disable an unwinder based on the name.
+check_unwinder_state "dummy" "Y"
+gdb_test_no_output "maint frame-unwinder disable -name dummy"
+check_unwinder_state "dummy" "N"
+# And verify what happens if you try to disable it again.
+gdb_test "maint frame-unwinder disable -name dummy" \
+ "unwinder dummy is already disabled" \
+ "disable already disabled unwinder"
+check_unwinder_state "dummy" "N" "check if dummy continues disabled"
+
+foreach class {GDB ARCH DEBUGINFO EXTENSION} {
+ # Disable all unwinders of type CLASS, and check that the command worked.
+ gdb_test_no_output "maint frame-unwinder disable ${class}"
+ check_unwinder_class "FRAME_UNWINDER_${class}" "N"
+}
+
+# Now check if we are able to enable a single unwinder, and what happens if we
+# enable it twice.
+gdb_test_no_output "maint frame-unwinder enable -name dummy"
+check_unwinder_state "dummy" "Y" "successfully enabled dummy unwinder"
+gdb_test "maint frame-unwinder enable -name dummy" \
+ "unwinder dummy is already enabled" \
+ "enable already enabled unwinder"
+check_unwinder_state "dummy" "Y" "check if dummy continues enabled"
+
+foreach class {GDB ARCH DEBUGINFO EXTENSION} {
+ # Enable all unwinders of type CLASS, and check that the command worked.
+ # using "-class" option to ensure it works. Should make no difference.
+ gdb_test_no_output "maint frame-unwinder enable -class ${class}"
+ check_unwinder_class "FRAME_UNWINDER_${class}" "Y"
+}
--
2.44.0
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v2 5/5] gdb/testsuite: Test for a backtrace through object without debuginfo
2024-04-08 20:19 [PATCH v2 0/5] Modernize frame unwinders and add disable feature Guinevere Larsen
` (3 preceding siblings ...)
2024-04-08 20:19 ` [PATCH v2 4/5] gdb: introduce ability to disable frame unwinders Guinevere Larsen
@ 2024-04-08 20:19 ` Guinevere Larsen
2024-04-09 17:23 ` [PATCH v2 0/5] Modernize frame unwinders and add disable feature Guinevere Larsen
2024-04-24 12:47 ` [PING][PATCH " Guinevere Larsen
6 siblings, 0 replies; 12+ messages in thread
From: Guinevere Larsen @ 2024-04-08 20:19 UTC (permalink / raw)
To: gdb-patches; +Cc: Guinevere Larsen, Jan Kratochvil
Fedora has been carrying this test since back in the Project Archer
days. A change back then caused GDB to stop being able to backtrace when
only some of the object files had debug information. Even though the
changed code never seems to have made its way into the main GDB project,
I think it makes sense to bring the test along to ensure something like
this doesn't pass unnoticed.
Co-Authored-By: Jan Kratochvil <jan@jankratochvil.net>
---
.../backtrace-through-cu-nodebug-caller.c | 28 ++++++
.../backtrace-through-cu-nodebug-main.c | 32 +++++++
.../gdb.base/backtrace-through-cu-nodebug.exp | 87 +++++++++++++++++++
3 files changed, 147 insertions(+)
create mode 100644 gdb/testsuite/gdb.base/backtrace-through-cu-nodebug-caller.c
create mode 100644 gdb/testsuite/gdb.base/backtrace-through-cu-nodebug-main.c
create mode 100644 gdb/testsuite/gdb.base/backtrace-through-cu-nodebug.exp
diff --git a/gdb/testsuite/gdb.base/backtrace-through-cu-nodebug-caller.c b/gdb/testsuite/gdb.base/backtrace-through-cu-nodebug-caller.c
new file mode 100644
index 00000000000..a33f86d1ece
--- /dev/null
+++ b/gdb/testsuite/gdb.base/backtrace-through-cu-nodebug-caller.c
@@ -0,0 +1,28 @@
+/* This testcase is part of GDB, the GNU debugger.
+
+ Copyright 2005-2023 Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+typedef int (*callback_t) (void);
+
+int
+caller (callback_t callback)
+{
+ /* Ensure some frame content to push away the return address. */
+ volatile const long one = 1;
+
+ /* Modify the return value to prevent any tail-call optimization. */
+ return (*callback) () - one;
+}
diff --git a/gdb/testsuite/gdb.base/backtrace-through-cu-nodebug-main.c b/gdb/testsuite/gdb.base/backtrace-through-cu-nodebug-main.c
new file mode 100644
index 00000000000..f958c0200c7
--- /dev/null
+++ b/gdb/testsuite/gdb.base/backtrace-through-cu-nodebug-main.c
@@ -0,0 +1,32 @@
+/* This testcase is part of GDB, the GNU debugger.
+
+ Copyright 2005-2023 Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+typedef int (*callback_t) (void);
+
+extern int caller (callback_t callback);
+
+int
+callback (void)
+{
+ return 1;
+}
+
+int
+main (void)
+{
+ return caller (callback);
+}
diff --git a/gdb/testsuite/gdb.base/backtrace-through-cu-nodebug.exp b/gdb/testsuite/gdb.base/backtrace-through-cu-nodebug.exp
new file mode 100644
index 00000000000..89122c26138
--- /dev/null
+++ b/gdb/testsuite/gdb.base/backtrace-through-cu-nodebug.exp
@@ -0,0 +1,87 @@
+# Copyright 2010-2023 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Test that GDB can generate accurate backtraces even if some of the stack
+# trace goes through a function with no debug information.
+
+standard_testfile -caller.c -main.c
+set objmainfile ${testfile}-main.o
+set objcallerfile ${testfile}-caller.o
+
+# recompile the inferior with or without CFI information, then run the
+# inferior until the point where the important test starts
+# returns TRUE on an ERROR.
+proc prepare_test {has_cfi} {
+ global srcdir subdir srcfile srcfile2 objmainfile objcallerfile binfile
+ if {$has_cfi} {
+ set extension "cfi"
+ if {[gdb_compile "${srcdir}/${subdir}/${srcfile}" ${objcallerfile} \
+ object [list {additional_flags=-fomit-frame-pointer \
+ -funwind-tables -fasynchronous-unwind-tables}]] != "" } {
+ untested "couldn't compile without cfi"
+ return true
+ }
+ } else {
+ set extension "no-cfi"
+ if {[gdb_compile "${srcdir}/${subdir}/${srcfile}" ${objcallerfile} \
+ object [list {additional_flags=-fomit-frame-pointer \
+ -fno-unwind-tables \
+ -fno-asynchronous-unwind-tables}]] != "" } {
+ untested "couldn't compile with cfi"
+ return true
+ }
+ }
+ if {[gdb_compile "${objmainfile} ${objcallerfile}" \
+ "${binfile}-${extension}" binfile {}] != ""} {
+ untested "couldn't link object files"
+ return true
+ }
+
+ clean_restart "$binfile-${extension}"
+
+ with_test_prefix "${extension}" {
+
+ if ![runto callback] then {
+ fail "has_cfi=$has_cfi: Can't run to callback"
+ return true
+ }
+ gdb_test_no_output "main frame-unwinder disable ARCH"
+ return false
+ }
+}
+
+if {[gdb_compile "${srcdir}/${subdir}/${srcfile2}" ${objmainfile} \
+ object {debug}] != "" } {
+ untested "couldn't compile main file"
+ return
+}
+
+if { [prepare_test false] } {
+ untested ${testfile}.exp
+} else {
+ gdb_test "bt" "frame_unwind_find_by_frame failed.*" \
+ "verify unwind fail without CFI"
+}
+
+if { [prepare_test true] } {
+ untested ${testfile}.exp
+} else {
+ # #0 callback () at ...
+ # #1 0x00000000004004e9 in caller ()
+ # #2 0x00000000004004cd in main () at ...
+ gdb_test "bt" \
+ "#0 +callback \[^\r\n\]+\r\n#1 \[^\r\n\]+ in caller \[^\r\n\]+\r\n#2 \[^\r\n\]+ in main \[^\r\n\]+" \
+ "verify unwinding works for CFI without DIEs"
+}
--
2.44.0
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v2 4/5] gdb: introduce ability to disable frame unwinders
2024-04-08 20:19 ` [PATCH v2 4/5] gdb: introduce ability to disable frame unwinders Guinevere Larsen
@ 2024-04-09 2:47 ` Eli Zaretskii
2024-04-09 13:33 ` Guinevere Larsen
0 siblings, 1 reply; 12+ messages in thread
From: Eli Zaretskii @ 2024-04-09 2:47 UTC (permalink / raw)
To: Guinevere Larsen; +Cc: gdb-patches
> From: Guinevere Larsen <blarsen@redhat.com>
> Cc: Guinevere Larsen <blarsen@redhat.com>
> Date: Mon, 8 Apr 2024 17:19:14 -0300
>
> Sometimes, in the GDB testsuite, we want to test the ability of specific
> unwinders to handle some piece of code. Usually this is done by trying
> to outsmart GDB, or by coercing the compiler to remove information that
> GDB would rely on. Both approaches have problems as GDB gets smarter
> with time, and that compilers might differ in version and behavior, or
> simply introduce new useful information. This was requested back in 2003
> in PR backtrace/8434.
>
> To improve our ability to thoroughly test GDB, this patch introduces a
> new maintenance command that allows a user to disable some unwinders,
> based on either the name of the unwinder or on its class. With this
> change, it will now be possible for GDB to not find any frame unwinders
> for a given frame, which would previously cause GDB to assert. GDB will
> now check if any frame unwinder has been disabled, and if some has, it
> will just error out instead of asserting.
>
> Unwinders can be disabled or re-enabled in 3 different ways:
> * Disabling/enabling all at once (using '-all').
> * By specifying an unwinder class to be disabled (option '-class').
> * By specifying the name of an unwinder (option '-name').
>
> If you give no options to the command, GDB assumes the input is an
> unwinder class. '-class' would make no difference if used, is just here
> for completeness.
>
> This command is meant to be used once the inferior is already at the
> desired location for the test. An example session would be:
>
> (gdb) start
> Temporary breakpoint 1, main () at omp.c:17
> 17 func();
> (gdb) maint frame-unwinder disable ARCH
> (gdb) bt
> \#0 main () at omp.c:17
> (gdb) maint frame-unwinder enable ARCH
> (gdb) cont
> Continuing.
>
> Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=8434
> ---
> gdb/NEWS | 7 +
> gdb/doc/gdb.texinfo | 24 +++
> gdb/frame-unwind.c | 154 +++++++++++++++++-
> gdb/frame-unwind.h | 13 ++
> gdb/testsuite/gdb.base/frame-unwind-disable.c | 21 +++
> .../gdb.base/frame-unwind-disable.exp | 114 +++++++++++++
> 6 files changed, 329 insertions(+), 4 deletions(-)
> create mode 100644 gdb/testsuite/gdb.base/frame-unwind-disable.c
> create mode 100644 gdb/testsuite/gdb.base/frame-unwind-disable.exp
Thanks.
> --- a/gdb/NEWS
> +++ b/gdb/NEWS
> @@ -54,6 +54,13 @@ disable missing-debug-handler LOCUS HANDLER
> maintenance info linux-lwps
> List all LWPs under control of the linux-nat target.
>
> +maintenance frame-unwinder disable [-all | -name NAME | [-class] CLASS]
> +maintenance frame-unwinder enable [-all | -name NAME | [-class] CLASS]
> + Enable or disable frame unwinders. This is only meant to be used when
> + testing unwinders themselves, and you want to ensure that a fallback
> + algorithm won't obscure a regression. GDB is not expected to behave
> + well if you try to execute the inferior with unwinders disabled.
This part is OK.
> --- a/gdb/doc/gdb.texinfo
> +++ b/gdb/doc/gdb.texinfo
> @@ -42022,6 +42022,30 @@ architecture, then enabling this flag does not cause them to be used.
> @item maint info frame-unwinders
> List the frame unwinders currently in effect, starting with the highest priority.
>
> +@kindex maint frame-unwinder disable
> +@kindex maint frame-unwinder enable
> +@item maint frame-unwinder disable [@code{-all} | @code{-name} @var{NAME} | [@code{-class}] @var{CLASS}]
> +@item maint frame-unwinder enable [@code{-all} | @code{-name} @var{NAME} | [@code{-class}] @var{CLASS}]
The symbols in @var should be in lower-case (they will be up-cased in
the Info output, but in HTML and printed output they will be in
italics instead).
> +Disable or enable frame unwinders. This is meant only as a testing tool, and
> +@value{GDBN} is not guaranteed to work properly if it is unable to find
> +valid frame unwinders.
> +
> +The meaning of each of the invocations are as follows:
> +
> +@table @samp
> +@item @code{-all}
> +Disable or enable all unwinders.
> +@item @code{-name} @var{NAME}
> +@var{NAME} is the exact name of the unwinder to be disabled or enabled.
> +@item [@code{-class}] @var{CLASS}
> +@var{CLASS} is the class of frame unwinders to be disabled or enabled.
> +The class may include the prefix @code{FRAME_UNWINDER_}, but it is not
> +required.
> +@end table
> +
> +@var{NAME} and @var{CLASS} are always case insensitive. If no option
> +starting wth @code{-} is given, @value{GDBN} assumes @code{-class}.
I think this command should be moved to after "maint info
frame-unwinders", and it should say that the list of available
unwinders is shown by that command. Also, I suppose what you call
"class" is what "maint info frame-unwinders" displays as "Type"? Or
is it something else? If the latter, the manual should tell how to
know which classes are available.
> + add_cmd ("disable", class_maintenance, maintenance_disable_frame_unwinders,
> + _("\
> +Disable one or more frame unwinder(s).\n\
> +Usage: maint frame-unwinder disable [-all | -name NAME | [-class] CLASS]\n\
> +\n\
> +These are the meanings of the options:\n\
> +\t-all - All available unwinders will be disabled\n\
> +\t-name - NAME is the exact name of the frame unwinder is to be disabled\n\
^^
That "is" should be removed.
> + add_cmd ("enable", class_maintenance, maintenance_enable_frame_unwinders,
> + _("\
> +Enable one or more frame unwinder(s).\n\
> +Usage: maint frame-unwinder enable [-all | -name NAME | [-class] CLASS]\n\
> +\n\
> +These are the meanings of the options:\n\
> +\t-all - All available unwinders will be enabled\n\
> +\t-name - NAME is the exact name of the frame unwinder is to be enabled\n\
Likewise here.
Reviewed-By: Eli Zaretskii <eliz@gnu.org>
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v2 4/5] gdb: introduce ability to disable frame unwinders
2024-04-09 2:47 ` Eli Zaretskii
@ 2024-04-09 13:33 ` Guinevere Larsen
2024-04-09 14:08 ` Eli Zaretskii
0 siblings, 1 reply; 12+ messages in thread
From: Guinevere Larsen @ 2024-04-09 13:33 UTC (permalink / raw)
To: Eli Zaretskii; +Cc: gdb-patches
[-- Attachment #1: Type: text/plain, Size: 1515 bytes --]
Thanks for the review. I'll fix everything else you mentioned.
On 4/8/24 23:47, Eli Zaretskii wrote:
>> +Disable or enable frame unwinders. This is meant only as a testing tool, and
>> +@value{GDBN} is not guaranteed to work properly if it is unable to find
>> +valid frame unwinders.
>> +
>> +The meaning of each of the invocations are as follows:
>> +
>> +@table @samp
>> +@item @code{-all}
>> +Disable or enable all unwinders.
>> +@item @code{-name} @var{NAME}
>> +@var{NAME} is the exact name of the unwinder to be disabled or enabled.
>> +@item [@code{-class}] @var{CLASS}
>> +@var{CLASS} is the class of frame unwinders to be disabled or enabled.
>> +The class may include the prefix @code{FRAME_UNWINDER_}, but it is not
>> +required.
>> +@end table
>> +
>> +@var{NAME} and @var{CLASS} are always case insensitive. If no option
>> +starting wth @code{-} is given, @value{GDBN} assumes @code{-class}.
> I think this command should be moved to after "maint info
> frame-unwinders", and it should say that the list of available
> unwinders is shown by that command. Also, I suppose what you call
> "class" is what "maint info frame-unwinders" displays as "Type"? Or
> is it something else? If the latter, the manual should tell how to
> know which classes are available.
The unwinder class was introduced by patch 2 of this series (which I now
realize I forgot to add NEWS and doc changes). Where would I add base
information about frame unwinders like this?
--
Cheers,
Guinevere Larsen
She/Her/Hers
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v2 4/5] gdb: introduce ability to disable frame unwinders
2024-04-09 13:33 ` Guinevere Larsen
@ 2024-04-09 14:08 ` Eli Zaretskii
0 siblings, 0 replies; 12+ messages in thread
From: Eli Zaretskii @ 2024-04-09 14:08 UTC (permalink / raw)
To: Guinevere Larsen; +Cc: gdb-patches
> Date: Tue, 9 Apr 2024 10:33:50 -0300
> Cc: gdb-patches@sourceware.org
> From: Guinevere Larsen <blarsen@redhat.com>
>
> I think this command should be moved to after "maint info
> frame-unwinders", and it should say that the list of available
> unwinders is shown by that command. Also, I suppose what you call
> "class" is what "maint info frame-unwinders" displays as "Type"? Or
> is it something else? If the latter, the manual should tell how to
> know which classes are available.
>
> The unwinder class was introduced by patch 2 of this series (which I now realize I forgot to add NEWS and doc
> changes). Where would I add base information about frame unwinders like this?
I think right before the description of the command itself.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v2 0/5] Modernize frame unwinders and add disable feature
2024-04-08 20:19 [PATCH v2 0/5] Modernize frame unwinders and add disable feature Guinevere Larsen
` (4 preceding siblings ...)
2024-04-08 20:19 ` [PATCH v2 5/5] gdb/testsuite: Test for a backtrace through object without debuginfo Guinevere Larsen
@ 2024-04-09 17:23 ` Guinevere Larsen
2024-04-24 12:47 ` [PING][PATCH " Guinevere Larsen
6 siblings, 0 replies; 12+ messages in thread
From: Guinevere Larsen @ 2024-04-09 17:23 UTC (permalink / raw)
To: Guinevere Larsen, gdb-patches
For anyone reviewing this, I'm aware of the arm regressions (thanks
again, linaro CI). I'm looking into them, but other reviews are still
welcome!
--
Cheers,
Guinevere Larsen
She/Her/Hers
On 4/8/24 17:19, Guinevere Larsen wrote:
> This patch series started with me trying to make it easier to test GDB's
> ability to unwind using CFI data, to improve a previous patch I sent to
> the list.
>
> The first patch is just a minor change, storing frame unwinders in a
> vector instead of through an unwinder table accessible using the
> registry system. This isn't required (like I originally thought it was),
> but it does make the whole system more readable in my opinion.
>
> Patch 3 has the real meat of the modernization, making GDB use
> polymorphism to handle frame unwinders. This is slightly slower than
> using function pointers, but much more readable in my opinion.
>
> As for the unwinder classes, they were chosen somewhat arbitrarily,
> mostly based on where I found an unwinder and its name. I almost expect
> some unwinders to be mis-categorized, but that should be easy to fix.
>
> The changes up to patch 3 have been tested with a try-branch, no
> regressions as far as I could see.
>
> Changes for v2:
> * Added back the test that checks if GDB can handle a mix of CUs with
> and without debuginfo in a single backtrace.
> * Fixed all the nitpicks for style.
> * Removed FRAME_UNWIND_ prefix when talking about classes
> * Thoroughly changed the documentation, to be more readable
>
> Guinevere Larsen (5):
> gdb: make gdbarch store a vector of frame unwinders
> gdb: add "unwinder class" to frame unwinders
> gdb: Migrate frame unwinders to use C++ classes
> gdb: introduce ability to disable frame unwinders
> gdb/testsuite: Test for a backtrace through object without debuginfo
>
> gdb/NEWS | 7 +
> gdb/aarch64-tdep.c | 12 +-
> gdb/alpha-mdebug-tdep.c | 6 +-
> gdb/alpha-tdep.c | 12 +-
> gdb/amd64-obsd-tdep.c | 6 +-
> gdb/amd64-tdep.c | 24 +-
> gdb/amd64-windows-tdep.c | 6 +-
> gdb/amdgpu-tdep.c | 7 +-
> gdb/arc-tdep.c | 10 +-
> gdb/arch-utils.c | 8 +
> gdb/arm-tdep.c | 29 +-
> gdb/avr-tdep.c | 5 +-
> gdb/bfin-tdep.c | 6 +-
> gdb/bpf-tdep.c | 6 +-
> gdb/cris-tdep.c | 12 +-
> gdb/csky-tdep.c | 10 +-
> gdb/doc/gdb.texinfo | 24 ++
> gdb/dummy-frame.c | 8 +-
> gdb/dummy-frame.h | 2 +-
> gdb/dwarf2/frame-tailcall.c | 6 +-
> gdb/dwarf2/frame-tailcall.h | 2 +-
> gdb/dwarf2/frame.c | 16 +-
> gdb/frame-unwind.c | 335 ++++++++++++++----
> gdb/frame-unwind.h | 178 +++++++++-
> gdb/frame.c | 28 +-
> gdb/frv-linux-tdep.c | 6 +-
> gdb/frv-tdep.c | 5 +-
> gdb/ft32-tdep.c | 6 +-
> gdb/gdbarch.c | 3 +
> gdb/gdbarch.h | 5 +
> gdb/gdbarch.py | 3 +
> gdb/h8300-tdep.c | 5 +-
> gdb/hppa-linux-tdep.c | 5 +-
> gdb/hppa-tdep.c | 17 +-
> gdb/i386-obsd-tdep.c | 5 +-
> gdb/i386-tdep.c | 30 +-
> gdb/ia64-tdep.c | 24 +-
> gdb/inline-frame.c | 5 +-
> gdb/inline-frame.h | 2 +-
> gdb/iq2000-tdep.c | 5 +-
> gdb/jit.c | 6 +-
> gdb/lm32-tdep.c | 5 +-
> gdb/loongarch-tdep.c | 7 +-
> gdb/m32c-tdep.c | 5 +-
> gdb/m32r-linux-tdep.c | 5 +-
> gdb/m32r-tdep.c | 5 +-
> gdb/m68hc11-tdep.c | 5 +-
> gdb/m68k-linux-tdep.c | 6 +-
> gdb/m68k-tdep.c | 6 +-
> gdb/mep-tdep.c | 5 +-
> gdb/microblaze-tdep.c | 6 +-
> gdb/mips-sde-tdep.c | 6 +-
> gdb/mips-tdep.c | 24 +-
> gdb/mn10300-tdep.c | 5 +-
> gdb/moxie-tdep.c | 5 +-
> gdb/msp430-tdep.c | 5 +-
> gdb/nds32-tdep.c | 14 +-
> gdb/nios2-tdep.c | 12 +-
> gdb/or1k-tdep.c | 7 +-
> gdb/ppc-fbsd-tdep.c | 5 +-
> gdb/ppc-obsd-tdep.c | 5 +-
> gdb/python/py-unwind.c | 50 ++-
> gdb/record-btrace.c | 12 +-
> gdb/record.h | 4 +-
> gdb/riscv-tdep.c | 8 +-
> gdb/rl78-tdep.c | 6 +-
> gdb/rs6000-aix-tdep.c | 5 +-
> gdb/rs6000-tdep.c | 12 +-
> gdb/rx-tdep.c | 10 +-
> gdb/s12z-tdep.c | 7 +-
> gdb/s390-linux-tdep.c | 5 +-
> gdb/s390-tdep.c | 10 +-
> gdb/sentinel-frame.c | 8 +-
> gdb/sentinel-frame.h | 2 +-
> gdb/sh-tdep.c | 11 +-
> gdb/sparc-netbsd-tdep.c | 6 +-
> gdb/sparc-obsd-tdep.c | 6 +-
> gdb/sparc-sol2-tdep.c | 6 +-
> gdb/sparc-tdep.c | 6 +-
> gdb/sparc64-fbsd-tdep.c | 6 +-
> gdb/sparc64-netbsd-tdep.c | 6 +-
> gdb/sparc64-obsd-tdep.c | 12 +-
> gdb/sparc64-sol2-tdep.c | 6 +-
> gdb/sparc64-tdep.c | 6 +-
> .../backtrace-through-cu-nodebug-caller.c | 28 ++
> .../backtrace-through-cu-nodebug-main.c | 32 ++
> .../gdb.base/backtrace-through-cu-nodebug.exp | 87 +++++
> gdb/testsuite/gdb.base/frame-unwind-disable.c | 21 ++
> .../gdb.base/frame-unwind-disable.exp | 114 ++++++
> gdb/tic6x-tdep.c | 12 +-
> gdb/tilegx-tdep.c | 5 +-
> gdb/tramp-frame.c | 56 ++-
> gdb/v850-tdep.c | 5 +-
> gdb/vax-tdep.c | 6 +-
> gdb/windows-tdep.c | 33 +-
> gdb/windows-tdep.h | 16 +-
> gdb/xstormy16-tdep.c | 5 +-
> gdb/xtensa-tdep.c | 7 +-
> gdb/z80-tdep.c | 7 +-
> 99 files changed, 1240 insertions(+), 444 deletions(-)
> create mode 100644 gdb/testsuite/gdb.base/backtrace-through-cu-nodebug-caller.c
> create mode 100644 gdb/testsuite/gdb.base/backtrace-through-cu-nodebug-main.c
> create mode 100644 gdb/testsuite/gdb.base/backtrace-through-cu-nodebug.exp
> create mode 100644 gdb/testsuite/gdb.base/frame-unwind-disable.c
> create mode 100644 gdb/testsuite/gdb.base/frame-unwind-disable.exp
>
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v2 3/5] gdb: Migrate frame unwinders to use C++ classes
2024-04-08 20:19 ` [PATCH v2 3/5] gdb: Migrate frame unwinders to use C++ classes Guinevere Larsen
@ 2024-04-12 14:40 ` Guinevere Larsen
0 siblings, 0 replies; 12+ messages in thread
From: Guinevere Larsen @ 2024-04-12 14:40 UTC (permalink / raw)
To: Guinevere Larsen, gdb-patches
[-- Attachment #1: Type: text/plain, Size: 3770 bytes --]
I mentioned as a reply to the cover letter that this patch series had a
crash in arm32 bit. This patch had the problem and a quick fix I inlined.
Trimming the diff for readability.
On 4/8/24 17:19, Guinevere Larsen wrote:
> diff --git a/gdb/tramp-frame.c b/gdb/tramp-frame.c
> index 2fcc3814e59..7fee4d5c71d 100644
> --- a/gdb/tramp-frame.c
> +++ b/gdb/tramp-frame.c
> @@ -123,7 +123,7 @@ tramp_frame_sniffer (const struct frame_unwind *self,
> const frame_info_ptr &this_frame,
> void **this_cache)
> {
> - const struct tramp_frame *tramp = self->unwind_data->tramp_frame;
> + const struct tramp_frame *tramp = self->unwind_data ()->tramp_frame;
> CORE_ADDR pc = get_frame_pc (this_frame);
> CORE_ADDR func;
> struct tramp_frame_cache *tramp_cache;
> @@ -142,6 +142,46 @@ tramp_frame_sniffer (const struct frame_unwind *self,
> return 1;
> }
>
> +class frame_unwind_trampoline : public frame_unwind
> +{
> +private:
> + frame_prev_arch_ftype *prev_arch_p;
> +public:
> + frame_unwind_trampoline (enum frame_type t, const struct frame_data *d,
> + frame_prev_arch_ftype *pa)
> + : frame_unwind ("trampoline", t, FRAME_UNWIND_GDB, d), prev_arch_p (pa)
> + { }
> +
> + int sniffer(const frame_unwind *self, const frame_info_ptr &this_frame,
> + void **this_prologue_cache) const override
> + {
> + return tramp_frame_sniffer (self, this_frame, this_prologue_cache);
> + }
> + void this_id (const frame_info_ptr &this_frame, void **this_prologue_cache,
> + struct frame_id *id) const override
> + {
> + tramp_frame_this_id (this_frame, this_prologue_cache, id);
> + }
> + struct value *prev_register (const frame_info_ptr &this_frame,
> + void **this_prologue_cache,
> + int regnum) const override
> + {
> + return tramp_frame_prev_register (this_frame, this_prologue_cache, regnum);
> + }
> +
> + struct gdbarch *prev_arch (const frame_info_ptr &this_frame,
> + void **this_prologue_cache) const override
> + {
This place should have:
if (prev_arch_p == nullptr)
error (_("No prev_arch callback installed"));
I've fixed this locally, but since this patch is over 100Kb, I would
prefer to not spam the list :)
--
Cheers,
Guinevere Larsen
She/Her/Hers
> + return prev_arch_p (this_frame, this_prologue_cache);
> + }
> +
> + /* FIXME: This should have a proper algorithm to deallocate the cache,
> + otherwise memory is leaked. This method is empty here just so the
> + migration to c++ classes doesn't add regressions. */
> + void dealloc_cache (frame_info *self, void *this_cache) const override
> + { }
> +};
> +
> void
> tramp_frame_prepend_unwinder (struct gdbarch *gdbarch,
> const struct tramp_frame *tramp_frame)
> @@ -160,16 +200,11 @@ tramp_frame_prepend_unwinder (struct gdbarch *gdbarch,
> gdb_assert (tramp_frame->insn_size <= sizeof (tramp_frame->insn[0].bytes));
>
> data = GDBARCH_OBSTACK_ZALLOC (gdbarch, struct frame_data);
> - unwinder = GDBARCH_OBSTACK_ZALLOC (gdbarch, struct frame_unwind);
> -
> data->tramp_frame = tramp_frame;
> - unwinder->type = tramp_frame->frame_type;
> - unwinder->unwind_data = data;
> - unwinder->unwinder_class = FRAME_UNWIND_GDB;
> - unwinder->sniffer = tramp_frame_sniffer;
> - unwinder->stop_reason = default_frame_unwind_stop_reason;
> - unwinder->this_id = tramp_frame_this_id;
> - unwinder->prev_register = tramp_frame_prev_register;
> - unwinder->prev_arch = tramp_frame->prev_arch;
> +
> + unwinder = obstack_new <frame_unwind_trampoline> (gdbarch_obstack (gdbarch),
> + tramp_frame->frame_type,
> + data,
> + tramp_frame->prev_arch);
> frame_unwind_prepend_unwinder (gdbarch, unwinder);
> }
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PING][PATCH v2 0/5] Modernize frame unwinders and add disable feature
2024-04-08 20:19 [PATCH v2 0/5] Modernize frame unwinders and add disable feature Guinevere Larsen
` (5 preceding siblings ...)
2024-04-09 17:23 ` [PATCH v2 0/5] Modernize frame unwinders and add disable feature Guinevere Larsen
@ 2024-04-24 12:47 ` Guinevere Larsen
6 siblings, 0 replies; 12+ messages in thread
From: Guinevere Larsen @ 2024-04-24 12:47 UTC (permalink / raw)
To: Guinevere Larsen, gdb-patches
Ping! The arm regressions were fixed, everything should be good!
--
Cheers,
Guinevere Larsen
She/Her/Hers
On 4/8/24 17:19, Guinevere Larsen wrote:
> This patch series started with me trying to make it easier to test GDB's
> ability to unwind using CFI data, to improve a previous patch I sent to
> the list.
>
> The first patch is just a minor change, storing frame unwinders in a
> vector instead of through an unwinder table accessible using the
> registry system. This isn't required (like I originally thought it was),
> but it does make the whole system more readable in my opinion.
>
> Patch 3 has the real meat of the modernization, making GDB use
> polymorphism to handle frame unwinders. This is slightly slower than
> using function pointers, but much more readable in my opinion.
>
> As for the unwinder classes, they were chosen somewhat arbitrarily,
> mostly based on where I found an unwinder and its name. I almost expect
> some unwinders to be mis-categorized, but that should be easy to fix.
>
> The changes up to patch 3 have been tested with a try-branch, no
> regressions as far as I could see.
>
> Changes for v2:
> * Added back the test that checks if GDB can handle a mix of CUs with
> and without debuginfo in a single backtrace.
> * Fixed all the nitpicks for style.
> * Removed FRAME_UNWIND_ prefix when talking about classes
> * Thoroughly changed the documentation, to be more readable
>
> Guinevere Larsen (5):
> gdb: make gdbarch store a vector of frame unwinders
> gdb: add "unwinder class" to frame unwinders
> gdb: Migrate frame unwinders to use C++ classes
> gdb: introduce ability to disable frame unwinders
> gdb/testsuite: Test for a backtrace through object without debuginfo
>
> gdb/NEWS | 7 +
> gdb/aarch64-tdep.c | 12 +-
> gdb/alpha-mdebug-tdep.c | 6 +-
> gdb/alpha-tdep.c | 12 +-
> gdb/amd64-obsd-tdep.c | 6 +-
> gdb/amd64-tdep.c | 24 +-
> gdb/amd64-windows-tdep.c | 6 +-
> gdb/amdgpu-tdep.c | 7 +-
> gdb/arc-tdep.c | 10 +-
> gdb/arch-utils.c | 8 +
> gdb/arm-tdep.c | 29 +-
> gdb/avr-tdep.c | 5 +-
> gdb/bfin-tdep.c | 6 +-
> gdb/bpf-tdep.c | 6 +-
> gdb/cris-tdep.c | 12 +-
> gdb/csky-tdep.c | 10 +-
> gdb/doc/gdb.texinfo | 24 ++
> gdb/dummy-frame.c | 8 +-
> gdb/dummy-frame.h | 2 +-
> gdb/dwarf2/frame-tailcall.c | 6 +-
> gdb/dwarf2/frame-tailcall.h | 2 +-
> gdb/dwarf2/frame.c | 16 +-
> gdb/frame-unwind.c | 335 ++++++++++++++----
> gdb/frame-unwind.h | 178 +++++++++-
> gdb/frame.c | 28 +-
> gdb/frv-linux-tdep.c | 6 +-
> gdb/frv-tdep.c | 5 +-
> gdb/ft32-tdep.c | 6 +-
> gdb/gdbarch.c | 3 +
> gdb/gdbarch.h | 5 +
> gdb/gdbarch.py | 3 +
> gdb/h8300-tdep.c | 5 +-
> gdb/hppa-linux-tdep.c | 5 +-
> gdb/hppa-tdep.c | 17 +-
> gdb/i386-obsd-tdep.c | 5 +-
> gdb/i386-tdep.c | 30 +-
> gdb/ia64-tdep.c | 24 +-
> gdb/inline-frame.c | 5 +-
> gdb/inline-frame.h | 2 +-
> gdb/iq2000-tdep.c | 5 +-
> gdb/jit.c | 6 +-
> gdb/lm32-tdep.c | 5 +-
> gdb/loongarch-tdep.c | 7 +-
> gdb/m32c-tdep.c | 5 +-
> gdb/m32r-linux-tdep.c | 5 +-
> gdb/m32r-tdep.c | 5 +-
> gdb/m68hc11-tdep.c | 5 +-
> gdb/m68k-linux-tdep.c | 6 +-
> gdb/m68k-tdep.c | 6 +-
> gdb/mep-tdep.c | 5 +-
> gdb/microblaze-tdep.c | 6 +-
> gdb/mips-sde-tdep.c | 6 +-
> gdb/mips-tdep.c | 24 +-
> gdb/mn10300-tdep.c | 5 +-
> gdb/moxie-tdep.c | 5 +-
> gdb/msp430-tdep.c | 5 +-
> gdb/nds32-tdep.c | 14 +-
> gdb/nios2-tdep.c | 12 +-
> gdb/or1k-tdep.c | 7 +-
> gdb/ppc-fbsd-tdep.c | 5 +-
> gdb/ppc-obsd-tdep.c | 5 +-
> gdb/python/py-unwind.c | 50 ++-
> gdb/record-btrace.c | 12 +-
> gdb/record.h | 4 +-
> gdb/riscv-tdep.c | 8 +-
> gdb/rl78-tdep.c | 6 +-
> gdb/rs6000-aix-tdep.c | 5 +-
> gdb/rs6000-tdep.c | 12 +-
> gdb/rx-tdep.c | 10 +-
> gdb/s12z-tdep.c | 7 +-
> gdb/s390-linux-tdep.c | 5 +-
> gdb/s390-tdep.c | 10 +-
> gdb/sentinel-frame.c | 8 +-
> gdb/sentinel-frame.h | 2 +-
> gdb/sh-tdep.c | 11 +-
> gdb/sparc-netbsd-tdep.c | 6 +-
> gdb/sparc-obsd-tdep.c | 6 +-
> gdb/sparc-sol2-tdep.c | 6 +-
> gdb/sparc-tdep.c | 6 +-
> gdb/sparc64-fbsd-tdep.c | 6 +-
> gdb/sparc64-netbsd-tdep.c | 6 +-
> gdb/sparc64-obsd-tdep.c | 12 +-
> gdb/sparc64-sol2-tdep.c | 6 +-
> gdb/sparc64-tdep.c | 6 +-
> .../backtrace-through-cu-nodebug-caller.c | 28 ++
> .../backtrace-through-cu-nodebug-main.c | 32 ++
> .../gdb.base/backtrace-through-cu-nodebug.exp | 87 +++++
> gdb/testsuite/gdb.base/frame-unwind-disable.c | 21 ++
> .../gdb.base/frame-unwind-disable.exp | 114 ++++++
> gdb/tic6x-tdep.c | 12 +-
> gdb/tilegx-tdep.c | 5 +-
> gdb/tramp-frame.c | 56 ++-
> gdb/v850-tdep.c | 5 +-
> gdb/vax-tdep.c | 6 +-
> gdb/windows-tdep.c | 33 +-
> gdb/windows-tdep.h | 16 +-
> gdb/xstormy16-tdep.c | 5 +-
> gdb/xtensa-tdep.c | 7 +-
> gdb/z80-tdep.c | 7 +-
> 99 files changed, 1240 insertions(+), 444 deletions(-)
> create mode 100644 gdb/testsuite/gdb.base/backtrace-through-cu-nodebug-caller.c
> create mode 100644 gdb/testsuite/gdb.base/backtrace-through-cu-nodebug-main.c
> create mode 100644 gdb/testsuite/gdb.base/backtrace-through-cu-nodebug.exp
> create mode 100644 gdb/testsuite/gdb.base/frame-unwind-disable.c
> create mode 100644 gdb/testsuite/gdb.base/frame-unwind-disable.exp
>
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2024-04-24 12:47 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-04-08 20:19 [PATCH v2 0/5] Modernize frame unwinders and add disable feature Guinevere Larsen
2024-04-08 20:19 ` [PATCH v2 1/5] gdb: make gdbarch store a vector of frame unwinders Guinevere Larsen
2024-04-08 20:19 ` [PATCH v2 2/5] gdb: add "unwinder class" to " Guinevere Larsen
2024-04-08 20:19 ` [PATCH v2 3/5] gdb: Migrate frame unwinders to use C++ classes Guinevere Larsen
2024-04-12 14:40 ` Guinevere Larsen
2024-04-08 20:19 ` [PATCH v2 4/5] gdb: introduce ability to disable frame unwinders Guinevere Larsen
2024-04-09 2:47 ` Eli Zaretskii
2024-04-09 13:33 ` Guinevere Larsen
2024-04-09 14:08 ` Eli Zaretskii
2024-04-08 20:19 ` [PATCH v2 5/5] gdb/testsuite: Test for a backtrace through object without debuginfo Guinevere Larsen
2024-04-09 17:23 ` [PATCH v2 0/5] Modernize frame unwinders and add disable feature Guinevere Larsen
2024-04-24 12:47 ` [PING][PATCH " Guinevere Larsen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).