From d4e05d2fea956e65618fc12c57fb81e8788ef07d Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 1 May 2019 15:05:58 -0600 Subject: [PATCH] Convert fbsd-tdep.c to type-safe registry API This changes fbsd-tdep.c to use the type-safe registry API. gdb/ChangeLog 2019-05-08 Tom Tromey * fbsd-tdep.c (struct fbsd_pspace_data): Add initializers. (fbsd_pspace_data_handle): Move lower. Change type. (get_fbsd_pspace_data): Update. (fbsd_pspace_data_cleanup): Remove. (_initialize_fbsd_tdep): Update. --- gdb/ChangeLog | 8 ++++++++ gdb/fbsd-tdep.c | 31 +++++++++---------------------- 2 files changed, 17 insertions(+), 22 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index f19cb888326..9bc8f996fd4 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2019-05-08 Tom Tromey + + * fbsd-tdep.c (struct fbsd_pspace_data): Add initializers. + (fbsd_pspace_data_handle): Move lower. Change type. + (get_fbsd_pspace_data): Update. + (fbsd_pspace_data_cleanup): Remove. + (_initialize_fbsd_tdep): Update. + 2019-05-08 Tom Tromey * ada-tasks.c (ada_tasks_pspace_data_handle): Change type. diff --git a/gdb/fbsd-tdep.c b/gdb/fbsd-tdep.c index 4efa0f7ae11..cc7c2b7ab2f 100644 --- a/gdb/fbsd-tdep.c +++ b/gdb/fbsd-tdep.c @@ -445,41 +445,30 @@ get_fbsd_gdbarch_data (struct gdbarch *gdbarch) gdbarch_data (gdbarch, fbsd_gdbarch_data_handle)); } -/* Per-program-space data for FreeBSD architectures. */ -static const struct program_space_data *fbsd_pspace_data_handle; - struct fbsd_pspace_data { /* Offsets in the runtime linker's 'Obj_Entry' structure. */ - LONGEST off_linkmap; - LONGEST off_tlsindex; - bool rtld_offsets_valid; + LONGEST off_linkmap = 0; + LONGEST off_tlsindex = 0; + bool rtld_offsets_valid = false; }; +/* Per-program-space data for FreeBSD architectures. */ +static const struct program_space_key + fbsd_pspace_data_handle; + static struct fbsd_pspace_data * get_fbsd_pspace_data (struct program_space *pspace) { struct fbsd_pspace_data *data; - data = ((struct fbsd_pspace_data *) - program_space_data (pspace, fbsd_pspace_data_handle)); + data = fbsd_pspace_data_handle.get (pspace); if (data == NULL) - { - data = XCNEW (struct fbsd_pspace_data); - set_program_space_data (pspace, fbsd_pspace_data_handle, data); - } + data = fbsd_pspace_data_handle.emplace (pspace); return data; } -/* The cleanup callback for FreeBSD architecture per-program-space data. */ - -static void -fbsd_pspace_data_cleanup (struct program_space *pspace, void *data) -{ - xfree (data); -} - /* This is how we want PTIDs from core files to be printed. */ static std::string @@ -2100,6 +2089,4 @@ _initialize_fbsd_tdep (void) { fbsd_gdbarch_data_handle = gdbarch_data_register_post_init (init_fbsd_gdbarch_data); - fbsd_pspace_data_handle - = register_program_space_data_with_cleanup (NULL, fbsd_pspace_data_cleanup); } -- 2.30.2