Imagelibrary/binutils-gdb
1
0
Fork 1
mirror of https://github.com/bminor/binutils-gdb.git synced 2025-12-22 07:17:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

2012-06-12 Pedro Alves <palves@redhat.com>

Browse Source 
* infrun.c (infrun_thread_stop_requested_callback): Don't switch
	threads here.
	(prepare_for_detach): No longer context switch here in non-stop
	mode.
	(fetch_inferior_event): Ditto.
	(handle_inferior_event) <STOP_QUIETLY || NO_STOP_QUIETLY>: Switch
	to the event thread before removing breakpoints.  Switch to the
	event thread before inserting breakpoints and resuming.
	(handle_inferior_event) <TARGET_WAITKIND_SPURIOUS>: Switch to the
	event thread before resuming.
	(handle_inferior_event) <stepping_past_singlestep_breakpoint>:
	Switch to the event thread before removing breakpoints.
This commit is contained in:
Pedro Alves
2012-06-12 18:30:26 +00:00
parent 5d60742e2d
commit 8b3ee56d30
2 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
gdb/ChangeLog
View File

@@ -1,3 +1,18 @@
2012-06-12 Pedro Alves <palves@redhat.com>
* infrun.c (infrun_thread_stop_requested_callback): Don't switch
threads here.
(prepare_for_detach): No longer context switch here in non-stop
mode.
(fetch_inferior_event): Ditto.
(handle_inferior_event) <STOP_QUIETLY || NO_STOP_QUIETLY>: Switch
to the event thread before removing breakpoints. Switch to the
event thread before inserting breakpoints and resuming.
(handle_inferior_event) <TARGET_WAITKIND_SPURIOUS>: Switch to the
event thread before resuming.
(handle_inferior_event) <stepping_past_singlestep_breakpoint>:
Switch to the event thread before removing breakpoints.
2012-06-12 Eli Zaretskii <eliz@gnu.org> 2012-06-12 Eli Zaretskii <eliz@gnu.org>
* infcmd.c (construct_inferior_arguments) [__MINGW32__]: Quote * infcmd.c (construct_inferior_arguments) [__MINGW32__]: Quote

30
gdb/infrun.c
View File

@@ -2437,8 +2437,6 @@ infrun_thread_stop_requested_callback (struct thread_info *info, void *arg)
old_chain = make_cleanup_restore_current_thread (); old_chain = make_cleanup_restore_current_thread ();
switch_to_thread (info->ptid);
/* Go through handle_inferior_event/normal_stop, so we always /* Go through handle_inferior_event/normal_stop, so we always
have consistent output as if the stop event had been have consistent output as if the stop event had been
reported. */ reported. */
@@ -2655,14 +2653,6 @@ prepare_for_detach (void)
old_chain_2 = make_cleanup (finish_thread_state_cleanup, old_chain_2 = make_cleanup (finish_thread_state_cleanup,
&minus_one_ptid); &minus_one_ptid);
/* In non-stop mode, each thread is handled individually.
Switch early, so the global state is set correctly for this
thread. */
if (non_stop
&& ecs->ws.kind != TARGET_WAITKIND_EXITED
&& ecs->ws.kind != TARGET_WAITKIND_SIGNALLED)
context_switch (ecs->ptid);
/* Now figure out what to do with the result of the result. */ /* Now figure out what to do with the result of the result. */
handle_inferior_event (ecs); handle_inferior_event (ecs);
@@ -2789,16 +2779,6 @@ fetch_inferior_event (void *client_data)
if (debug_infrun) if (debug_infrun)
print_target_wait_results (waiton_ptid, ecs->ptid, &ecs->ws); print_target_wait_results (waiton_ptid, ecs->ptid, &ecs->ws);
if (non_stop
&& ecs->ws.kind != TARGET_WAITKIND_IGNORE
&& ecs->ws.kind != TARGET_WAITKIND_NO_RESUMED
&& ecs->ws.kind != TARGET_WAITKIND_EXITED
&& ecs->ws.kind != TARGET_WAITKIND_SIGNALLED)
/* In non-stop mode, each thread is handled individually. Switch
early, so the global state is set correctly for this
thread. */
context_switch (ecs->ptid);
/* If an error happens while handling the event, propagate GDB's /* If an error happens while handling the event, propagate GDB's
knowledge of the executing state to the frontend/user running knowledge of the executing state to the frontend/user running
state. */ state. */
@@ -3380,6 +3360,9 @@ handle_inferior_event (struct execution_control_state *ecs)
we're attaching or setting up a remote connection. */ we're attaching or setting up a remote connection. */
if (stop_soon == STOP_QUIETLY || stop_soon == NO_STOP_QUIETLY) if (stop_soon == STOP_QUIETLY || stop_soon == NO_STOP_QUIETLY)
{ {
if (!ptid_equal (ecs->ptid, inferior_ptid))
context_switch (ecs->ptid);
/* Loading of shared libraries might have changed breakpoint /* Loading of shared libraries might have changed breakpoint
addresses. Make sure new breakpoints are inserted. */ addresses. Make sure new breakpoints are inserted. */
if (stop_soon == NO_STOP_QUIETLY if (stop_soon == NO_STOP_QUIETLY
@@ -3395,6 +3378,9 @@ handle_inferior_event (struct execution_control_state *ecs)
case TARGET_WAITKIND_SPURIOUS: case TARGET_WAITKIND_SPURIOUS:
if (debug_infrun) if (debug_infrun)
fprintf_unfiltered (gdb_stdlog, "infrun: TARGET_WAITKIND_SPURIOUS\n"); fprintf_unfiltered (gdb_stdlog, "infrun: TARGET_WAITKIND_SPURIOUS\n");
if (!ptid_equal (ecs->ptid, inferior_ptid)
&& !ptid_equal (ecs->ptid, minus_one_ptid))
context_switch (ecs->ptid);
resume (0, GDB_SIGNAL_0); resume (0, GDB_SIGNAL_0);
prepare_to_wait (ecs); prepare_to_wait (ecs);
return; return;
@@ -3769,6 +3755,8 @@ handle_inferior_event (struct execution_control_state *ecs)
"infrun: stepping_past_" "infrun: stepping_past_"
"singlestep_breakpoint\n"); "singlestep_breakpoint\n");
/* Pull the single step breakpoints out of the target. */ /* Pull the single step breakpoints out of the target. */
if (!ptid_equal (ecs->ptid, inferior_ptid))
context_switch (ecs->ptid);
remove_single_step_breakpoints (); remove_single_step_breakpoints ();
singlestep_breakpoints_inserted_p = 0; singlestep_breakpoints_inserted_p = 0;
@@ -3801,6 +3789,8 @@ handle_inferior_event (struct execution_control_state *ecs)
/* Pull the single step breakpoints out of the target. */ /* Pull the single step breakpoints out of the target. */
if (singlestep_breakpoints_inserted_p) if (singlestep_breakpoints_inserted_p)
{ {
if (!ptid_equal (ecs->ptid, inferior_ptid))
context_switch (ecs->ptid);
remove_single_step_breakpoints (); remove_single_step_breakpoints ();
singlestep_breakpoints_inserted_p = 0; singlestep_breakpoints_inserted_p = 0;
} }