OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove make_cleanup_restore_current_thread from gdbserver 

This removes make_cleanup_restore_current_thread from gdbserver,
replacing it with a use of scoped_restore.

2018-02-08  Tom Tromey  <tom@tromey.com>

	* linux-low.c (install_software_single_step_breakpoints): Use
	make_scoped_restore.
	* inferiors.c (make_cleanup_restore_current_thread): Remove.
	(do_restore_current_thread_cleanup): Remove.
	* gdbthread.h (make_cleanup_restore_current_thread): Don't
	declare.
This commit is contained in:
Tom Tromey 2018-02-05 10:59:52 +01:00
parent 45dd3607e2
commit 8ce47547b3
4 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gdb/gdbserver/ChangeLog
View File

@ -1,3 +1,12 @@
2018-02-08 Tom Tromey <tom@tromey.com>
* linux-low.c (install_software_single_step_breakpoints): Use
make_scoped_restore.
* inferiors.c (make_cleanup_restore_current_thread): Remove.
(do_restore_current_thread_cleanup): Remove.
* gdbthread.h (make_cleanup_restore_current_thread): Don't
declare.
2018-02-08 Tom Tromey <tom@tromey.com>
* mem-break.c (set_raw_breakpoint_at): Use

3
gdb/gdbserver/gdbthread.h
View File

@ -224,7 +224,4 @@ lwpid_of (const thread_info *thread)
return thread->id.lwp ();
}
/* Create a cleanup to restore current_thread. */
struct cleanup *make_cleanup_restore_current_thread (void);
#endif /* GDB_THREAD_H */

12
gdb/gdbserver/inferiors.c
View File

@ -213,18 +213,6 @@ current_process (void)
return get_thread_process (current_thread);
}
static void
do_restore_current_thread_cleanup (void *arg)
{
current_thread = (struct thread_info *) arg;
}
struct cleanup *
make_cleanup_restore_current_thread (void)
{
return make_cleanup (do_restore_current_thread_cleanup, current_thread);
}
/* See common/common-gdbthread.h. */
void

6
gdb/gdbserver/linux-low.c
View File

@ -50,6 +50,7 @@
#include "common-inferior.h"
#include "nat/fork-inferior.h"
#include "environ.h"
#include "common/scoped_restore.h"
#ifndef ELFMAG0
/* Don't include <linux/elf.h> here. If it got included by gdb_proc_service.h
then ELFMAG0 will have been defined. If it didn't get included by
@ -4207,15 +4208,14 @@ install_software_single_step_breakpoints (struct lwp_info *lwp)
{
struct thread_info *thread = get_lwp_thread (lwp);
struct regcache *regcache = get_thread_regcache (thread, 1);
struct cleanup *old_chain = make_cleanup_restore_current_thread ();
scoped_restore save_current_thread = make_scoped_restore (&current_thread);
current_thread = thread;
std::vector<CORE_ADDR> next_pcs = the_low_target.get_next_pcs (regcache);
for (CORE_ADDR pc : next_pcs)
set_single_step_breakpoint (pc, current_ptid);
do_cleanups (old_chain);
}
/* Single step via hardware or software single step.