diff options
| author | Tom Tromey <tom@tromey.com> | 2017-09-09 10:47:10 -0600 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2017-09-11 16:15:14 -0600 |
| commit | cb85b21ba1c0014787129d3f53cb8755aba64930 (patch) | |
| tree | 6a8abb868ad2332627b6fb86e7c28d2683692b9b /gdb/breakpoint.c | |
| parent | 8fbc99ef16dfb49981e275f735cb591e68983d08 (diff) | |
| download | fsf-binutils-gdb-cb85b21ba1c0014787129d3f53cb8755aba64930.zip fsf-binutils-gdb-cb85b21ba1c0014787129d3f53cb8755aba64930.tar.gz fsf-binutils-gdb-cb85b21ba1c0014787129d3f53cb8755aba64930.tar.bz2 | |
Remove make_show_memory_breakpoints_cleanup
This removes make_show_memory_breakpoints_cleanup, replacing it with
make_scoped_restore_show_memory_breakpoints and updating all callers.
ChangeLog
2017-09-11 Tom Tromey <tom@tromey.com>
* breakpoint.c (program_breakpoint_here_p): Update.
* target.c (make_scoped_restore_show_memory_breakpoints): Rename
from make_show_memory_breakpoints_cleanup. Return a
scoped_restore_tmpl<int>.
(restore_show_memory_breakpoints): Remove.
* ppc-linux-tdep.c (ppc_linux_memory_remove_breakpoint): Update.
* mem-break.c (memory_validate_breakpoint): Update.
* ia64-tdep.c (ia64_memory_insert_breakpoint): Update.
(ia64_memory_remove_breakpoint): Update.
(ia64_breakpoint_from_pc): Update.
* target.h (make_scoped_restore_show_memory_breakpoints): Rename
from make_show_memory_breakpoints_cleanup.
Diffstat (limited to 'gdb/breakpoint.c')
| -rw-r--r-- | gdb/breakpoint.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 79543fe..235dab4 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -8994,8 +8994,6 @@ program_breakpoint_here_p (struct gdbarch *gdbarch, CORE_ADDR address) CORE_ADDR addr; const gdb_byte *bpoint; gdb_byte *target_mem; - struct cleanup *cleanup; - int retval = 0; addr = address; bpoint = gdbarch_breakpoint_from_pc (gdbarch, &addr, &len); @@ -9009,15 +9007,14 @@ program_breakpoint_here_p (struct gdbarch *gdbarch, CORE_ADDR address) /* Enable the automatic memory restoration from breakpoints while we read the memory. Otherwise we could say about our temporary breakpoints they are permanent. */ - cleanup = make_show_memory_breakpoints_cleanup (0); + scoped_restore restore_memory + = make_scoped_restore_show_memory_breakpoints (0); if (target_read_memory (address, target_mem, len) == 0 && memcmp (target_mem, bpoint, len) == 0) - retval = 1; - - do_cleanups (cleanup); + return 1; - return retval; + return 0; } /* Return 1 if LOC is pointing to a permanent breakpoint, |