public inbox for gdb-cvs@sourceware.org
help / color / mirror / Atom feed
* [binutils-gdb] Add move operators for addrmap
@ 2024-04-16 17:55 Tom Tromey
0 siblings, 0 replies; only message in thread
From: Tom Tromey @ 2024-04-16 17:55 UTC (permalink / raw)
To: gdb-cvs
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=79ddf4a51a789c823d024409aec8712595701a23
commit 79ddf4a51a789c823d024409aec8712595701a23
Author: Tom Tromey <tom@tromey.com>
Date: Sun Jan 14 11:51:38 2024 -0700
Add move operators for addrmap
A subsequent patch needs to move an addrmap. This patch adds the
necessary support. It also changes addrmap_fixed to take a 'const'
addrmap_mutable. This is fine according to the contract of
addrmap_mutable; but it did require a compensating const_cast in the
implementation.
Diff:
---
gdb/addrmap.c | 12 +++++++-----
gdb/addrmap.h | 19 ++++++++++++++++++-
2 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/gdb/addrmap.c b/gdb/addrmap.c
index 0c60c0c2ceb..c6e037330ec 100644
--- a/gdb/addrmap.c
+++ b/gdb/addrmap.c
@@ -250,12 +250,13 @@ addrmap_mutable::do_find (CORE_ADDR addr) const
}
-addrmap_fixed::addrmap_fixed (struct obstack *obstack, addrmap_mutable *mut)
+addrmap_fixed::addrmap_fixed (struct obstack *obstack,
+ const addrmap_mutable *mut)
{
size_t transition_count = 0;
/* Count the number of transitions in the tree. */
- mut->foreach ([&] (CORE_ADDR start, void *obj)
+ mut->foreach ([&] (CORE_ADDR start, const void *obj)
{
++transition_count;
return 0;
@@ -273,10 +274,10 @@ addrmap_fixed::addrmap_fixed (struct obstack *obstack, addrmap_mutable *mut)
/* Copy all entries from the splay tree to the array, in order
of increasing address. */
- mut->foreach ([&] (CORE_ADDR start, void *obj)
+ mut->foreach ([&] (CORE_ADDR start, const void *obj)
{
transitions[num_transitions].addr = start;
- transitions[num_transitions].value = obj;
+ transitions[num_transitions].value = const_cast<void *> (obj);
++num_transitions;
return 0;
});
@@ -344,7 +345,8 @@ addrmap_mutable::addrmap_mutable ()
addrmap_mutable::~addrmap_mutable ()
{
- splay_tree_delete (tree);
+ if (tree != nullptr)
+ splay_tree_delete (tree);
}
diff --git a/gdb/addrmap.h b/gdb/addrmap.h
index ed52e3cd990..5378b753760 100644
--- a/gdb/addrmap.h
+++ b/gdb/addrmap.h
@@ -85,9 +85,14 @@ struct addrmap_fixed final : public addrmap,
{
public:
- addrmap_fixed (struct obstack *obstack, addrmap_mutable *mut);
+ addrmap_fixed (struct obstack *obstack, const addrmap_mutable *mut);
DISABLE_COPY_AND_ASSIGN (addrmap_fixed);
+ /* It's fine to use the default move operators, because this addrmap
+ does not own the storage for the elements. */
+ addrmap_fixed (addrmap_fixed &&other) = default;
+ addrmap_fixed &operator= (addrmap_fixed &&) = default;
+
void relocate (CORE_ADDR offset) override;
private:
@@ -124,6 +129,18 @@ public:
~addrmap_mutable ();
DISABLE_COPY_AND_ASSIGN (addrmap_mutable);
+ addrmap_mutable (addrmap_mutable &&other)
+ : tree (other.tree)
+ {
+ other.tree = nullptr;
+ }
+
+ addrmap_mutable &operator= (addrmap_mutable &&other)
+ {
+ std::swap (tree, other.tree);
+ return *this;
+ }
+
/* In the mutable address map MAP, associate the addresses from START
to END_INCLUSIVE that are currently associated with NULL with OBJ
instead. Addresses mapped to an object other than NULL are left
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2024-04-16 17:55 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-04-16 17:55 [binutils-gdb] Add move operators for addrmap Tom Tromey
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).