FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gdb/

Browse source 
* exceptions.c (throw_exception): Don't disable the current
	display.
	* printcmd.c (disable_current_display_cleanup): New function.
	(do_one_display): Install a cleanup to disable the current display
	if doing the display throws.

	gdb/testsuite/
	* gdb.trace/unavailable.exp (test_maybe_regvar_display): New
	procedure.
	(gdb_collect_args_test, gdb_collect_locals_test): Use it.
This commit is contained in:
Pedro Alves 2011-08-05 15:17:59 +00:00
parent d989b28323
commit af6e93b2d1
5 changed files with 59 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
gdb/printcmd.c
View file

@ -1656,6 +1656,14 @@ undisplay_command (char *args, int from_tty)
dont_repeat ();
}
/* Cleanup that just disables the current display. */
static void
disable_current_display_cleanup (void *arg)
{
disable_current_display ();
}
/* Display a single auto-display.
Do nothing if the display cannot be printed in the current context,
or if the display is disabled. */
@ -1663,6 +1671,7 @@ undisplay_command (char *args, int from_tty)
static void
do_one_display (struct display *d)
{
struct cleanup *old_chain;
int within_current_scope;
if (d->enabled_p == 0)
@ -1715,6 +1724,7 @@ do_one_display (struct display *d)
return;
current_display_number = d->number;
old_chain = make_cleanup (disable_current_display_cleanup, NULL);
annotate_display_begin ();
printf_filtered ("%d", d->number);
@ -1782,6 +1792,7 @@ do_one_display (struct display *d)
annotate_display_end ();
gdb_flush (gdb_stdout);
discard_cleanups (old_chain);
current_display_number = -1;
}