From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [PATCH 12/12] Use cleanup_function in regcache.c
Date: Wed, 09 Jan 2019 03:34:00 -0000 [thread overview]
Message-ID: <20190109033426.16062-13-tom@tromey.com> (raw)
In-Reply-To: <20190109033426.16062-1-tom@tromey.com>
This removes the regcache_invalidator class in favor of a
cleanup_function. This seems like an improvement (albeit a minor one)
because regcache_invalidator is only used in a single spot.
gdb/ChangeLog
2019-01-08 Tom Tromey <tom@tromey.com>
* regcache.c (class regcache_invalidator): Remove.
(regcache::raw_write): Use cleanup_function.
---
gdb/ChangeLog | 5 +++++
gdb/regcache.c | 41 ++++++++---------------------------------
2 files changed, 13 insertions(+), 33 deletions(-)
diff --git a/gdb/regcache.c b/gdb/regcache.c
index c51ef771be..47339a0bce 100644
--- a/gdb/regcache.c
+++ b/gdb/regcache.c
@@ -28,6 +28,7 @@
#include "reggroups.h"
#include "observable.h"
#include "regset.h"
+#include "common/cleanup-function.h"
#include <forward_list>
/*
@@ -219,37 +220,6 @@ reg_buffer::arch () const
return m_descr->gdbarch;
}
-/* Cleanup class for invalidating a register. */
-
-class regcache_invalidator
-{
-public:
-
- regcache_invalidator (struct regcache *regcache, int regnum)
- : m_regcache (regcache),
- m_regnum (regnum)
- {
- }
-
- ~regcache_invalidator ()
- {
- if (m_regcache != nullptr)
- m_regcache->invalidate (m_regnum);
- }
-
- DISABLE_COPY_AND_ASSIGN (regcache_invalidator);
-
- void release ()
- {
- m_regcache = nullptr;
- }
-
-private:
-
- struct regcache *m_regcache;
- int m_regnum;
-};
-
/* Return a pointer to register REGNUM's buffer cache. */
gdb_byte *
@@ -769,13 +739,18 @@ regcache::raw_write (int regnum, const gdb_byte *buf)
/* Invalidate the register after it is written, in case of a
failure. */
- regcache_invalidator invalidator (this, regnum);
+ auto do_invalidate
+ = [=] ()
+ {
+ this->invalidate (regnum);
+ };
+ cleanup_function invalidator (do_invalidate);
target_store_registers (this, regnum);
/* The target did not throw an error so we can discard invalidating
the register. */
- invalidator.release ();
+ invalidator.cancel ();
}
void
--
2.17.2
next prev parent reply other threads:[~2019-01-09 3:34 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-12 11:50 [PATCH 00/12] remove some cleanups using a cleanup function Andrew Burgess
2019-01-09 3:34 ` Tom Tromey
2019-01-09 3:34 ` [PATCH 03/12] Remove make_bpstat_clear_actions_cleanup Tom Tromey
2019-01-09 3:34 ` [PATCH 07/12] Remove delete_just_stopped_threads_infrun_breakpoints_cleanup Tom Tromey
2019-01-09 3:34 ` [PATCH 05/12] Remove cleanup from linux-nat.c Tom Tromey
2019-01-09 3:34 ` [PATCH 04/12] Remove cleanup_delete_std_terminate_breakpoint Tom Tromey
2019-01-09 3:34 ` [PATCH 09/12] Remove remaining cleanup from fetch_inferior_event Tom Tromey
2019-01-09 3:34 ` Tom Tromey [this message]
2019-01-09 3:34 ` [PATCH 06/12] Remove clear_symtab_users_cleanup Tom Tromey
2019-01-09 3:34 ` [PATCH 08/12] Remove cleanup from stop_all_threads Tom Tromey
2019-01-09 3:34 ` [PATCH 10/12] Update an obsolete cleanup comment Tom Tromey
2019-01-09 3:34 ` [PATCH 01/12] Remove delete_longjmp_breakpoint_cleanup Tom Tromey
2019-01-09 3:34 ` [PATCH 11/12] Update cleanup comment in ui-out.h Tom Tromey
2019-01-09 3:36 ` [PATCH 02/12] Remove remaining cleanup from breakpoint.c Tom Tromey
2019-01-11 6:56 ` [PATCH 00/12] remove some cleanups using a cleanup function Joel Brobecker
2019-01-12 11:50 ` [PATCH 4/4] gdb/testsuite: Don't allow paths to appear in test name Andrew Burgess
2019-01-12 11:50 ` [PATCH 2/4] gdb: Remove remaining cleanup from breakpoint.c Andrew Burgess
2019-01-12 11:50 ` [PATCH 1/4] gdb: Remove delete_longjmp_breakpoint_cleanup Andrew Burgess
2019-01-12 11:50 ` [PATCH 3/4] gdb: Remove make_bpstat_clear_actions_cleanup Andrew Burgess
2019-01-12 15:54 ` [PATCH 00/12] remove some cleanups using a cleanup function Tom Tromey
2019-01-12 22:41 ` Tom Tromey
2019-01-14 11:06 ` Andrew Burgess
2019-01-14 15:39 ` Pedro Alves
2019-01-14 20:37 ` Pedro Alves
2019-01-15 9:42 ` Andrew Burgess
[not found] ` <87ef9dttfl.fsf@tromey.com>
2019-01-15 23:43 ` Pedro Alves
2019-01-16 11:19 ` Andrew Burgess
2019-01-16 23:10 ` Pedro Alves
2019-01-17 21:39 ` Tom Tromey
2019-01-21 20:12 ` Pedro Alves
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=20190109033426.16062-13-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