aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Tromey <tom@tromey.com>2019-04-21 09:29:13 -0600
committerTom Tromey <tom@tromey.com>2019-05-08 16:01:47 -0600
commitf6aa7436201194e80e8d7761e6d88ecf0ec1e327 (patch)
tree9a747fecb5fee40026adab6124838f1de46a696e
parent6ae614f66a0a86c9e83b9f40ee1f4e105b681f7b (diff)
downloadgdb-f6aa7436201194e80e8d7761e6d88ecf0ec1e327.zip
gdb-f6aa7436201194e80e8d7761e6d88ecf0ec1e327.tar.gz
gdb-f6aa7436201194e80e8d7761e6d88ecf0ec1e327.tar.bz2
Convert objfiles.c to type-safe registry API
This changes objfiles.c to use the type-safe registry API. gdb/ChangeLog 2019-05-08 Tom Tromey <tom@tromey.com> * objfiles.c (objfile_pspace_info): Add destructor and initializers. (objfiles_pspace_data): Change type. (~objfile_pspace_info): Rename from objfiles_pspace_data_cleanup. (get_objfile_pspace_data): Update. (objfiles_bfd_data): Change type. (get_objfile_bfd_data): Update. (objfile_bfd_data_free, _initialize_objfiles): Remove.
-rw-r--r--gdb/ChangeLog11
-rw-r--r--gdb/objfiles.c59
2 files changed, 28 insertions, 42 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0c5fe7c..f57dc4f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,16 @@
2019-05-08 Tom Tromey <tom@tromey.com>
+ * objfiles.c (objfile_pspace_info): Add destructor and
+ initializers.
+ (objfiles_pspace_data): Change type.
+ (~objfile_pspace_info): Rename from objfiles_pspace_data_cleanup.
+ (get_objfile_pspace_data): Update.
+ (objfiles_bfd_data): Change type.
+ (get_objfile_bfd_data): Update.
+ (objfile_bfd_data_free, _initialize_objfiles): Remove.
+
+2019-05-08 Tom Tromey <tom@tromey.com>
+
* break-catch-syscall.c (catch_syscall_inferior_data): Move.
Change type.
(get_catch_syscall_inferior_data): Update.
diff --git a/gdb/objfiles.c b/gdb/objfiles.c
index 30823c2..b59db59 100644
--- a/gdb/objfiles.c
+++ b/gdb/objfiles.c
@@ -66,30 +66,30 @@ DEFINE_REGISTRY (objfile, REGISTRY_ACCESS_FIELD)
struct objfile_pspace_info
{
- struct obj_section **sections;
- int num_sections;
+ objfile_pspace_info () = default;
+ ~objfile_pspace_info ();
+
+ struct obj_section **sections = nullptr;
+ int num_sections = 0;
/* Nonzero if object files have been added since the section map
was last updated. */
- int new_objfiles_available;
+ int new_objfiles_available = 0;
/* Nonzero if the section map MUST be updated before use. */
- int section_map_dirty;
+ int section_map_dirty = 0;
/* Nonzero if section map updates should be inhibited if possible. */
- int inhibit_updates;
+ int inhibit_updates = 0;
};
/* Per-program-space data key. */
-static const struct program_space_data *objfiles_pspace_data;
+static const struct program_space_key<objfile_pspace_info>
+ objfiles_pspace_data;
-static void
-objfiles_pspace_data_cleanup (struct program_space *pspace, void *arg)
+objfile_pspace_info::~objfile_pspace_info ()
{
- struct objfile_pspace_info *info = (struct objfile_pspace_info *) arg;
-
- xfree (info->sections);
- xfree (info);
+ xfree (sections);
}
/* Get the current svr4 data. If none is found yet, add it now. This
@@ -100,13 +100,9 @@ get_objfile_pspace_data (struct program_space *pspace)
{
struct objfile_pspace_info *info;
- info = ((struct objfile_pspace_info *)
- program_space_data (pspace, objfiles_pspace_data));
+ info = objfiles_pspace_data.get (pspace);
if (info == NULL)
- {
- info = XCNEW (struct objfile_pspace_info);
- set_program_space_data (pspace, objfiles_pspace_data, info);
- }
+ info = objfiles_pspace_data.emplace (pspace);
return info;
}
@@ -115,7 +111,7 @@ get_objfile_pspace_data (struct program_space *pspace)
/* Per-BFD data key. */
-static const struct bfd_data *objfiles_bfd_data;
+static const struct bfd_key<objfile_per_bfd_storage> objfiles_bfd_data;
objfile_per_bfd_storage::~objfile_per_bfd_storage ()
{
@@ -133,8 +129,7 @@ get_objfile_bfd_data (struct objfile *objfile, struct bfd *abfd)
struct objfile_per_bfd_storage *storage = NULL;
if (abfd != NULL)
- storage = ((struct objfile_per_bfd_storage *)
- bfd_data (abfd, objfiles_bfd_data));
+ storage = objfiles_bfd_data.get (abfd);
if (storage == NULL)
{
@@ -143,7 +138,7 @@ get_objfile_bfd_data (struct objfile *objfile, struct bfd *abfd)
back to not sharing data across users. These cases are rare
enough that this seems reasonable. */
if (abfd != NULL && !gdb_bfd_requires_relocations (abfd))
- set_bfd_data (abfd, objfiles_bfd_data, storage);
+ objfiles_bfd_data.set (abfd, storage);
/* Look up the gdbarch associated with the BFD. */
if (abfd != NULL)
@@ -153,15 +148,6 @@ get_objfile_bfd_data (struct objfile *objfile, struct bfd *abfd)
return storage;
}
-/* A deleter for objfile_per_bfd_storage that can be passed as a
- cleanup function to the BFD registry. */
-
-static void
-objfile_bfd_data_free (struct bfd *unused, void *d)
-{
- delete (struct objfile_per_bfd_storage *) d;
-}
-
/* See objfiles.h. */
void
@@ -1511,14 +1497,3 @@ objfile_flavour_name (struct objfile *objfile)
return bfd_flavour_name (bfd_get_flavour (objfile->obfd));
return NULL;
}
-
-void
-_initialize_objfiles (void)
-{
- objfiles_pspace_data
- = register_program_space_data_with_cleanup (NULL,
- objfiles_pspace_data_cleanup);
-
- objfiles_bfd_data = register_bfd_data_with_cleanup (NULL,
- objfile_bfd_data_free);
-}