From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [PATCH 03/20] Change displaced_step_clear_cleanup with a forward_scope_exit
Date: Wed, 13 Feb 2019 21:29:00 -0000 [thread overview]
Message-ID: <20190213212927.9474-4-tom@tromey.com> (raw)
In-Reply-To: <20190213212927.9474-1-tom@tromey.com>
This changes displaced_step_clear_cleanup to be a forward_scope_exit
and updates the callers.
gdb/ChangeLog
2019-02-13 Tom Tromey <tom@tromey.com>
* infrun.c (displaced_step_clear_cleanup): Now a
forward_scope_exit type.
(displaced_step_prepare_throw): Update.
(displaced_step_fixup): Update.
---
gdb/ChangeLog | 7 +++++++
gdb/infrun.c | 30 +++++++++++-------------------
2 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/gdb/infrun.c b/gdb/infrun.c
index b32635fc422..582c1f77008 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -68,6 +68,7 @@
#include "common/gdb_optional.h"
#include "arch-utils.h"
#include "common/scope-exit.h"
+#include "common/forward-scope-exit.h"
/* Prototypes for local functions */
@@ -1598,14 +1599,9 @@ displaced_step_clear (struct displaced_step_inferior_state *displaced)
displaced->step_closure = NULL;
}
-static void
-displaced_step_clear_cleanup (void *arg)
-{
- struct displaced_step_inferior_state *state
- = (struct displaced_step_inferior_state *) arg;
-
- displaced_step_clear (state);
-}
+/* A cleanup that wraps displaced_step_clear. */
+using displaced_step_clear_cleanup
+ = FORWARD_SCOPE_EXIT (displaced_step_clear);
/* Dump LEN bytes at BUF in hex to FILE, followed by a newline. */
void
@@ -1754,13 +1750,14 @@ displaced_step_prepare_throw (thread_info *tp)
displaced->step_original = original;
displaced->step_copy = copy;
- cleanup *ignore_cleanups
- = make_cleanup (displaced_step_clear_cleanup, displaced);
+ {
+ displaced_step_clear_cleanup cleanup (displaced);
- /* Resume execution at the copy. */
- regcache_write_pc (regcache, copy);
+ /* Resume execution at the copy. */
+ regcache_write_pc (regcache, copy);
- discard_cleanups (ignore_cleanups);
+ cleanup.release ();
+ }
if (debug_displaced)
fprintf_unfiltered (gdb_stdlog, "displaced: displaced pc to %s\n",
@@ -1850,7 +1847,6 @@ displaced_step_restore (struct displaced_step_inferior_state *displaced,
static int
displaced_step_fixup (thread_info *event_thread, enum gdb_signal signal)
{
- struct cleanup *old_cleanups;
struct displaced_step_inferior_state *displaced
= get_displaced_stepping_state (event_thread->inf);
int ret;
@@ -1859,7 +1855,7 @@ displaced_step_fixup (thread_info *event_thread, enum gdb_signal signal)
if (displaced->step_thread != event_thread)
return 0;
- old_cleanups = make_cleanup (displaced_step_clear_cleanup, displaced);
+ displaced_step_clear_cleanup cleanup (displaced);
displaced_step_restore (displaced, displaced->step_thread->ptid);
@@ -1894,10 +1890,6 @@ displaced_step_fixup (thread_info *event_thread, enum gdb_signal signal)
ret = -1;
}
- do_cleanups (old_cleanups);
-
- displaced->step_thread = nullptr;
-
return ret;
}
--
2.17.2
next prev parent reply other threads:[~2019-02-13 21:29 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-13 21:29 [PATCH 00/20] Remove cleanups Tom Tromey
2019-02-13 21:29 ` [PATCH 12/20] Remove free_current_contents Tom Tromey
2019-02-13 21:29 ` Tom Tromey [this message]
2019-02-13 21:29 ` [PATCH 06/20] Remove cleanup from solib-svr4.c Tom Tromey
2019-02-13 21:29 ` [PATCH 17/20] Make exception throwing a bit more efficient Tom Tromey
2019-02-13 21:29 ` [PATCH 20/20] Introduce and use bcache_up Tom Tromey
2019-02-13 21:29 ` [PATCH 11/20] Remove basic cleanup code Tom Tromey
2019-02-13 21:29 ` [PATCH 01/20] Remove cleanups from coffread.c Tom Tromey
2019-02-13 21:29 ` [PATCH 05/20] Remove last cleanup from gdbserver Tom Tromey
2019-02-13 21:29 ` [PATCH 07/20] Remove last cleanups from solib-svr4.c Tom Tromey
2019-02-13 21:29 ` [PATCH 14/20] Make exceptions use std::string and be self-managing Tom Tromey
2019-02-13 21:29 ` [PATCH 16/20] Remove some now-dead exception code Tom Tromey
2019-02-13 21:30 ` [PATCH 13/20] Simplify exception handling Tom Tromey
2019-02-13 21:30 ` [PATCH 15/20] Rewrite TRY/CATCH Tom Tromey
2019-02-13 21:30 ` [PATCH 09/20] Remove last cleanup from linux-namespaces.c Tom Tromey
2019-02-13 21:30 ` [PATCH 18/20] Replace throw_exception with throw in some cases Tom Tromey
2019-02-13 21:30 ` [PATCH 04/20] C++ify remote notification code Tom Tromey
2019-02-13 21:30 ` [PATCH 02/20] Update two cleanup comments Tom Tromey
2019-02-13 21:30 ` [PATCH 08/20] Remove last cleanup solib-aix.c Tom Tromey
2019-02-13 21:30 ` [PATCH 10/20] Remove last cleanups from stabsread.c Tom Tromey
2019-02-13 21:49 ` [PATCH 00/20] Remove cleanups John Baldwin
2019-02-14 14:48 ` Tom Tromey
2019-02-14 20:38 ` John Baldwin
2019-02-14 22:49 ` Tom Tromey
2019-02-14 22:55 ` John Baldwin
2019-02-14 15:34 ` Pedro Alves
2019-02-14 16:35 ` Tom Tromey
2019-02-13 21:53 ` [PATCH 19/20] Use SCOPE_EXIT in write_gcore_file 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=20190213212927.9474-4-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