2011-08-04 Pedro Alves <pedro@codesourcery.com>

* exceptions.c (struct catcher): Remove saved_uiout field.
	(exceptions_state_mc_init): Remove the `func_uiout' parameter, and
	no longer save/resvore the global ui_out builder.
	(catch_exceptions_with_msg): Save/override/restore the global
	ui_out builder manually instead of relying on TRY_CATCH to do it.
	(catch_errors): Save/restore the global ui_out builder manually
	instead of relying on TRY_CATCH to do it.
	* exceptions.h (exceptions_state_mc_init): Remove the `func_uiout'
	parameter.
	(TRY_CATCH): Adjust.
	* cli/cli-interp.c (safe_execute_command): Save/override/restore
	the global ui_out builder manually instead of relying on TRY_CATCH
	to do it.
This commit is contained in:
Pedro Alves
2011-08-04 18:19:27 +00:00
parent a1e28cb2af
commit f9679975a3
4 changed files with 63 additions and 16 deletions

View File

@ -114,8 +114,7 @@ extern const struct gdb_exception exception_none;
/* Functions to drive the exceptions state m/c (internal to
exceptions). */
EXCEPTIONS_SIGJMP_BUF *exceptions_state_mc_init (struct ui_out *func_uiout,
volatile struct
EXCEPTIONS_SIGJMP_BUF *exceptions_state_mc_init (volatile struct
gdb_exception *exception,
return_mask mask);
int exceptions_state_mc_action_iter (void);
@ -146,7 +145,7 @@ int exceptions_state_mc_action_iter_1 (void);
#define TRY_CATCH(EXCEPTION,MASK) \
{ \
EXCEPTIONS_SIGJMP_BUF *buf = \
exceptions_state_mc_init (uiout, &(EXCEPTION), (MASK)); \
exceptions_state_mc_init (&(EXCEPTION), (MASK)); \
EXCEPTIONS_SIGSETJMP (*buf); \
} \
while (exceptions_state_mc_action_iter ()) \