From cb85b21ba1c0014787129d3f53cb8755aba64930 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sat, 9 Sep 2017 10:47:10 -0600 Subject: 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 * 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. (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. --- gdb/mem-break.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'gdb/mem-break.c') diff --git a/gdb/mem-break.c b/gdb/mem-break.c index e35d0a50716..8e2debfba38 100644 --- a/gdb/mem-break.c +++ b/gdb/mem-break.c @@ -107,8 +107,6 @@ memory_validate_breakpoint (struct gdbarch *gdbarch, int val; int bplen; gdb_byte cur_contents[BREAKPOINT_MAX]; - struct cleanup *cleanup; - int ret; /* Determine appropriate breakpoint contents and size for this address. */ @@ -118,14 +116,12 @@ memory_validate_breakpoint (struct gdbarch *gdbarch, return 0; /* Make sure we see the memory breakpoints. */ - cleanup = make_show_memory_breakpoints_cleanup (1); + scoped_restore restore_memory + = make_scoped_restore_show_memory_breakpoints (1); val = target_read_memory (addr, cur_contents, bplen); /* If our breakpoint is no longer at the address, this means that the program modified the code on us, so it is wrong to put back the old value. */ - ret = (val == 0 && memcmp (bp, cur_contents, bplen) == 0); - - do_cleanups (cleanup); - return ret; + return (val == 0 && memcmp (bp, cur_contents, bplen) == 0); } -- cgit v1.2.1