Imagelibrary/binutils-gdb
1
0
Fork 1
mirror of https://github.com/bminor/binutils-gdb.git synced 2025-12-26 09:08:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

* infcall.c (run_inferior_call): Remove references to

Browse Source 
suppress_stop_observer.
	* infcmd.c (suppress_stop_observer): Delete.
	(finish_command_continuation): Remove NOTE.  Don't clear
	suppress_stop_observer anymore.
	(finish_command_continuation_free_arg): Likewise.
	(finish_forward): Remove references to suppress_stop_observer.
	Call normal_stop observer if we haven't already.
	* inferior.h (suppress_stop_observer): Delete.
	* infrun.c (normal_stop): When deciding to suppress the
	normal_stop observer, check for proceed_to_finish instead of
	suppress_stop_observer.
This commit is contained in:
Pedro Alves
2009-03-22 17:57:11 +00:00
parent 065a2c74b5
commit 41d2bdb467
5 changed files with 42 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
gdb/infcmd.c
View File

@@ -169,8 +169,6 @@ struct gdb_environ *inferior_environ;
/* When set, no calls to target_resumed observer will be made. */
int suppress_resume_observer = 0;
/* When set, normal_stop will not call the normal_stop observer. */
int suppress_stop_observer = 0;
/* Accessor routines. */
@@ -1346,13 +1344,16 @@ static void
finish_command_continuation (void *arg)
{
struct finish_command_continuation_args *a = arg;
struct thread_info *tp = NULL;
bpstat bs = NULL;
if (!ptid_equal (inferior_ptid, null_ptid)
&& target_has_execution
&& is_stopped (inferior_ptid))
bs = inferior_thread ()->stop_bpstat;
{
tp = inferior_thread ();
bs = tp->stop_bpstat;
}
if (bpstat_find_breakpoint (bs, a->breakpoint) != NULL
&& a->function != NULL)
@@ -1369,22 +1370,15 @@ finish_command_continuation (void *arg)
}
/* We suppress normal call of normal_stop observer and do it here so
that that *stopped notification includes the return value. */
/* NOTE: This is broken in non-stop mode. There is no guarantee the
next stop will be in the same thread that we started doing a
finish on. This suppressing (or some other replacement means)
should be a thread property. */
observer_notify_normal_stop (bs, 1 /* print frame */);
suppress_stop_observer = 0;
that the *stopped notification includes the return value. */
if (bs != NULL && tp->proceed_to_finish)
observer_notify_normal_stop (bs, 1 /* print frame */);
delete_breakpoint (a->breakpoint);
}
static void
finish_command_continuation_free_arg (void *arg)
{
/* NOTE: See finish_command_continuation. This would go away, if
this suppressing is made a thread property. */
suppress_stop_observer = 0;
xfree (arg);
}
@@ -1469,8 +1463,6 @@ finish_forward (struct symbol *function, struct frame_info *frame)
old_chain = make_cleanup_delete_breakpoint (breakpoint);
tp->proceed_to_finish = 1; /* We want stop_registers, please... */
make_cleanup_restore_integer (&suppress_stop_observer);
suppress_stop_observer = 1;
proceed ((CORE_ADDR) -1, TARGET_SIGNAL_DEFAULT, 0);
cargs = xmalloc (sizeof (*cargs));