From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [PATCH v2 04/31] Convert target dcache to type-safe registry API
Date: Fri, 03 May 2019 23:12:00 -0000 [thread overview]
Message-ID: <20190503231231.8954-5-tom@tromey.com> (raw)
In-Reply-To: <20190503231231.8954-1-tom@tromey.com>
This changes the target dcache to use the type-safe registry API.
2019-04-22 Tom Tromey <tom@tromey.com>
* target-dcache.c (target_dcache_cleanup): Remove.
(target_dcache_aspace_key): Change type.
(target_dcache_init_p, target_dcache_invalidate)
(target_dcache_get, target_dcache_get_or_init)
(_initialize_target_dcache): Update.
* dcache.h (struct dcache_deleter): New.
---
gdb/ChangeLog | 9 +++++++++
gdb/dcache.h | 9 +++++++++
gdb/target-dcache.c | 34 +++++++---------------------------
3 files changed, 25 insertions(+), 27 deletions(-)
diff --git a/gdb/dcache.h b/gdb/dcache.h
index 9c29074c919..a58ac840d12 100644
--- a/gdb/dcache.h
+++ b/gdb/dcache.h
@@ -34,6 +34,15 @@ DCACHE *dcache_init (void);
/* Free a DCACHE. */
void dcache_free (DCACHE *);
+/* A deletion adapter that calls dcache_free. */
+struct dcache_deleter
+{
+ void operator() (DCACHE *d) const
+ {
+ dcache_free (d);
+ }
+};
+
enum target_xfer_status
dcache_read_memory_partial (struct target_ops *ops, DCACHE *dcache,
CORE_ADDR memaddr, gdb_byte *myaddr,
diff --git a/gdb/target-dcache.c b/gdb/target-dcache.c
index 3fab9845bc3..98d5c1f83b6 100644
--- a/gdb/target-dcache.c
+++ b/gdb/target-dcache.c
@@ -23,16 +23,8 @@
/* The target dcache is kept per-address-space. This key lets us
associate the cache with the address space. */
-static const struct address_space_data *target_dcache_aspace_key;
-
-/* Clean up dcache, represented by ARG, which is associated with
- ASPACE. */
-
-static void
-target_dcache_cleanup (struct address_space *aspace, void *arg)
-{
- dcache_free ((DCACHE *) arg);
-}
+static const struct address_space_key<DCACHE, dcache_deleter>
+ target_dcache_aspace_key;
/* Target dcache is initialized or not. */
@@ -40,8 +32,7 @@ int
target_dcache_init_p (void)
{
DCACHE *dcache
- = (DCACHE *) address_space_data (current_program_space->aspace,
- target_dcache_aspace_key);
+ = target_dcache_aspace_key.get (current_program_space->aspace);
return (dcache != NULL);
}
@@ -52,8 +43,7 @@ void
target_dcache_invalidate (void)
{
DCACHE *dcache
- = (DCACHE *) address_space_data (current_program_space->aspace,
- target_dcache_aspace_key);
+ = target_dcache_aspace_key.get (current_program_space->aspace);
if (dcache != NULL)
dcache_invalidate (dcache);
@@ -65,11 +55,7 @@ target_dcache_invalidate (void)
DCACHE *
target_dcache_get (void)
{
- DCACHE *dcache
- = (DCACHE *) address_space_data (current_program_space->aspace,
- target_dcache_aspace_key);
-
- return dcache;
+ return target_dcache_aspace_key.get (current_program_space->aspace);
}
/* Return the target dcache. If it is not initialized yet, initialize
@@ -79,14 +65,12 @@ DCACHE *
target_dcache_get_or_init (void)
{
DCACHE *dcache
- = (DCACHE *) address_space_data (current_program_space->aspace,
- target_dcache_aspace_key);
+ = target_dcache_aspace_key.get (current_program_space->aspace);
if (dcache == NULL)
{
dcache = dcache_init ();
- set_address_space_data (current_program_space->aspace,
- target_dcache_aspace_key, dcache);
+ target_dcache_aspace_key.set (current_program_space->aspace, dcache);
}
return dcache;
@@ -193,8 +177,4 @@ access is on."),
set_code_cache,
show_code_cache,
&setlist, &showlist);
-
- target_dcache_aspace_key
- = register_address_space_data_with_cleanup (NULL,
- target_dcache_cleanup);
}
--
2.17.2
next prev parent reply other threads:[~2019-05-03 23:12 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-03 23:12 [PATCH v2 00/31] Add a type-safe API to registries Tom Tromey
2019-05-03 23:12 ` [PATCH v2 13/31] Convert breakpoint.c to type-safe registry API Tom Tromey
2019-05-03 23:12 ` [PATCH v2 18/31] Convert ada-tasks.c " Tom Tromey
2019-05-03 23:12 ` [PATCH v2 25/31] Convert elfread.c " Tom Tromey
2019-05-03 23:12 ` [PATCH v2 20/31] Convert coffread.c " Tom Tromey
2019-05-03 23:12 ` [PATCH v2 07/31] Convert objfiles.c " Tom Tromey
2019-05-03 23:12 ` [PATCH v2 17/31] Convert probes " Tom Tromey
2019-05-03 23:12 ` [PATCH v2 19/31] Convert fbsd-tdep.c " Tom Tromey
2019-05-06 20:56 ` John Baldwin
2019-05-08 17:58 ` Tom Tromey
2019-05-08 22:06 ` Tom Tromey
2019-05-03 23:12 ` [PATCH v2 05/31] Convert inflow " Tom Tromey
2019-05-03 23:12 ` [PATCH v2 24/31] Convert mdebugread.c " Tom Tromey
2019-05-03 23:12 ` [PATCH v2 12/31] Convert linux-tdep.c " Tom Tromey
2019-05-03 23:12 ` [PATCH v2 23/31] Add a noop deleter Tom Tromey
2019-05-03 23:12 ` [PATCH v2 01/31] Add a type-safe C++ interface to a registry Tom Tromey
2019-05-03 23:12 ` [PATCH v2 15/31] Convert solib-svr4.c to type-safe registry API Tom Tromey
2019-05-03 23:12 ` Tom Tromey [this message]
2019-05-03 23:12 ` [PATCH v2 21/31] Convert ada-lang.c " Tom Tromey
2019-05-03 23:12 ` [PATCH v2 10/31] Convert symfile-debug.c " Tom Tromey
2019-05-03 23:12 ` [PATCH v2 16/31] Convert xcoffread.c " Tom Tromey
2019-05-03 23:12 ` [PATCH v2 03/31] Convert symbol_cache " Tom Tromey
2019-05-03 23:12 ` [PATCH v2 08/31] Convert auto-load.c " Tom Tromey
2019-05-03 23:12 ` [PATCH v2 06/31] Convert break-catch-syscall.c " Tom Tromey
2019-05-03 23:13 ` [PATCH v2 27/31] Remove mips_pdr_data Tom Tromey
2019-05-03 23:13 ` [PATCH v2 28/31] Convert stabsread.c to type-safe registry API Tom Tromey
2019-05-03 23:13 ` [PATCH v2 09/31] Convert dwarf2_per_objfile " Tom Tromey
2019-05-03 23:13 ` [PATCH v2 26/31] Convert hppa-tdep.c " Tom Tromey
2019-05-03 23:13 ` [PATCH v2 02/31] Convert main_info " Tom Tromey
2019-05-03 23:13 ` [PATCH v2 14/31] Convert remote.c " Tom Tromey
2019-05-03 23:13 ` [PATCH v2 11/31] Convert auxv.c " Tom Tromey
2019-05-03 23:13 ` [PATCH v2 22/31] Convert nto-tdep.c " Tom Tromey
2019-05-03 23:13 ` [PATCH v2 29/31] Convert objc-lang.c " Tom Tromey
2019-05-03 23:31 ` [PATCH v2 30/31] Convert dwarf2-frame.c " Tom Tromey
2019-05-03 23:31 ` [PATCH v2 31/31] Convert gdbtypes.c " Tom Tromey
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190503231231.8954-5-tom@tromey.com \
--to=tom@tromey.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).