darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Switch current_thread to lwp's thread in install_software_single_step_breakpoints

Browse source 
install_software_single_step_breakpoints has parameter lwp, but still
need to switch to current_thread.  In order to simplify its caller,
we do the current_thread save/restore inside install_software_single_step_breakpoints.

gdb/gdbserver:

2016-07-21  Yao Qi  <yao.qi@linaro.org>

	* gdbthread.h (make_cleanup_restore_current_thread): Declare.
	* inferiors.c (do_restore_current_thread_cleanup): New function.
	(make_cleanup_restore_current_thread): Likewise.
	* linux-low.c (install_software_single_step_breakpoints): Call
	make_cleanup_restore_current_thread.  Switch current_thread to
	thread.
This commit is contained in:
Yao Qi 2016-07-21 12:12:18 +01:00
parent bec903c96b
commit 984a2c042e
4 changed files with 30 additions and 2 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 @@
2016-07-21 Yao Qi <yao.qi@linaro.org>
* gdbthread.h (make_cleanup_restore_current_thread): Declare.
* inferiors.c (do_restore_current_thread_cleanup): New function.
(make_cleanup_restore_current_thread): Likewise.
* linux-low.c (install_software_single_step_breakpoints): Call
make_cleanup_restore_current_thread. Switch current_thread to
thread.
2016-07-21 Yao Qi <yao.qi@linaro.org>
* mem-break.c (struct reinsert_breakpoint) <ptid>: New field.

3
gdb/gdbserver/gdbthread.h
View file

@ -87,4 +87,7 @@ struct thread_info *find_any_thread_of_pid (int pid);
/* Get current thread ID (Linux task ID). */
#define current_ptid (current_thread->entry.id)
/* 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

@ -411,3 +411,15 @@ current_process (void)
gdb_assert (current_thread != NULL);
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);
}

8
gdb/gdbserver/linux-low.c
View file

@ -4202,10 +4202,14 @@ install_software_single_step_breakpoints (struct lwp_info *lwp)
{
int i;
CORE_ADDR pc;
struct regcache *regcache = get_thread_regcache (current_thread, 1);
struct thread_info *thread = get_lwp_thread (lwp);
struct regcache *regcache = get_thread_regcache (thread, 1);
VEC (CORE_ADDR) *next_pcs = NULL;
struct cleanup *old_chain = make_cleanup (VEC_cleanup (CORE_ADDR), &next_pcs);
struct cleanup *old_chain = make_cleanup_restore_current_thread ();
make_cleanup (VEC_cleanup (CORE_ADDR), &next_pcs);
current_thread = thread;
next_pcs = (*the_low_target.get_next_pcs) (regcache);
for (i = 0; VEC_iterate (CORE_ADDR, next_pcs, i, pc); ++i)