From cb275538dbddfbb3c2c372a665ac48e6f617ea33 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 1 Jun 2022 15:31:15 -0600 Subject: Use registry in gdbarch gdbarch implements its own registry-like approach. This patch changes it to instead use registry.h. It's a rather large patch but largely uninteresting -- it's mostly a straightforward conversion from the old approach to the new one. The main benefit of this change is that it introduces type safety to the gdbarch registry. It also removes a bunch of code. One possible drawback is that, previously, the gdbarch registry differentiated between pre- and post-initialization setup. This doesn't seem very important to me, though. --- gdb/python/py-unwind.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) (limited to 'gdb/python/py-unwind.c') diff --git a/gdb/python/py-unwind.c b/gdb/python/py-unwind.c index b2fd140..fb94661 100644 --- a/gdb/python/py-unwind.c +++ b/gdb/python/py-unwind.c @@ -117,8 +117,6 @@ extern PyTypeObject pending_frame_object_type extern PyTypeObject unwind_info_object_type CPYCHECKER_TYPE_OBJECT_FOR_TYPEDEF ("unwind_info_object"); -static struct gdbarch_data *pyuw_gdbarch_data; - /* Convert gdb.Value instance to inferior's pointer. Return 1 on success, 0 on failure. */ @@ -657,14 +655,10 @@ pyuw_dealloc_cache (struct frame_info *this_frame, void *cache) struct pyuw_gdbarch_data_type { /* Has the unwinder shim been prepended? */ - int unwinder_registered; + int unwinder_registered = 0; }; -static void * -pyuw_gdbarch_data_init (struct gdbarch *gdbarch) -{ - return GDBARCH_OBSTACK_ZALLOC (gdbarch, struct pyuw_gdbarch_data_type); -} +static const registry::key pyuw_gdbarch_data; /* New inferior architecture callback: register the Python unwinders intermediary. */ @@ -672,9 +666,9 @@ pyuw_gdbarch_data_init (struct gdbarch *gdbarch) static void pyuw_on_new_gdbarch (struct gdbarch *newarch) { - struct pyuw_gdbarch_data_type *data - = (struct pyuw_gdbarch_data_type *) gdbarch_data (newarch, - pyuw_gdbarch_data); + struct pyuw_gdbarch_data_type *data = pyuw_gdbarch_data.get (newarch); + if (data == nullptr) + data= pyuw_gdbarch_data.emplace (newarch); if (!data->unwinder_registered) { @@ -706,8 +700,6 @@ _initialize_py_unwind () NULL, show_pyuw_debug, &setdebuglist, &showdebuglist); - pyuw_gdbarch_data - = gdbarch_data_register_post_init (pyuw_gdbarch_data_init); } /* Initialize unwind machinery. */ -- cgit v1.1