aboutsummaryrefslogtreecommitdiff
path: root/gdb/progspace.h
diff options
context:
space:
mode:
authorTom Tromey <tom@tromey.com>2020-10-18 11:38:10 -0600
committerTom Tromey <tom@tromey.com>2022-07-28 14:16:50 -0600
commit08b8a139c9e8adcb4ec12a8a17e5836b8b5acb63 (patch)
treee1050b58dcebee1150881f43f64c1c186955d240 /gdb/progspace.h
parent8f83e7b9262e08fa43ca6e645337511c68ddc52a (diff)
downloadgdb-08b8a139c9e8adcb4ec12a8a17e5836b8b5acb63.zip
gdb-08b8a139c9e8adcb4ec12a8a17e5836b8b5acb63.tar.gz
gdb-08b8a139c9e8adcb4ec12a8a17e5836b8b5acb63.tar.bz2
Rewrite registry.h
This rewrites registry.h, removing all the macros and replacing it with relatively ordinary template classes. The result is less code than the previous setup. It replaces large macros with a relatively straightforward C++ class, and now manages its own cleanup. The existing type-safe "key" class is replaced with the equivalent template class. This approach ended up requiring relatively few changes to the users of the registry code in gdb -- code using the key system just required a small change to the key's declaration. All existing users of the old C-like API are now converted to use the type-safe API. This mostly involved changing explicit deletion functions to be an operator() in a deleter class. The old "save/free" two-phase process is removed, and replaced with a single "free" phase. No existing code used both phases. The old "free" callbacks took a parameter for the enclosing container object. However, this wasn't truly needed and is removed here as well.
Diffstat (limited to 'gdb/progspace.h')
-rw-r--r--gdb/progspace.h18
1 files changed, 3 insertions, 15 deletions
diff --git a/gdb/progspace.h b/gdb/progspace.h
index 8531da4..febdcef 100644
--- a/gdb/progspace.h
+++ b/gdb/progspace.h
@@ -37,8 +37,7 @@ struct objfile;
struct inferior;
struct exec;
struct address_space;
-struct program_space_data;
-struct address_space_data;
+struct program_space;
struct so_list;
typedef std::list<std::unique_ptr<objfile>> objfile_list;
@@ -372,7 +371,7 @@ struct program_space
std::vector<std::string> deleted_solibs;
/* Per pspace data-pointers required by other GDB modules. */
- REGISTRY_FIELDS {};
+ registry<program_space> registry_fields;
private:
/* The set of target sections matching the sections mapped into
@@ -387,7 +386,6 @@ struct address_space
{
/* Create a new address space object, and add it to the list. */
address_space ();
- ~address_space ();
DISABLE_COPY_AND_ASSIGN (address_space);
/* Returns the integer address space id of this address space. */
@@ -397,7 +395,7 @@ struct address_space
}
/* Per aspace data-pointers required by other GDB modules. */
- REGISTRY_FIELDS {};
+ registry<address_space> registry_fields;
private:
int m_num;
@@ -457,14 +455,4 @@ extern struct address_space *maybe_new_address_space (void);
mappings. */
extern void update_address_spaces (void);
-/* Keep a registry of per-pspace data-pointers required by other GDB
- modules. */
-
-DECLARE_REGISTRY (program_space);
-
-/* Keep a registry of per-aspace data-pointers required by other GDB
- modules. */
-
-DECLARE_REGISTRY (address_space);
-
#endif