/* Exception (throw catch) mechanism, for GDB, the GNU debugger.
- Copyright (C) 1986, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996,
- 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
- 2009, 2010, 2011 Free Software Foundation, Inc.
+ Copyright (C) 1986, 1988-2012 Free Software Foundation, Inc.
This file is part of GDB.
volatile struct gdb_exception *exception;
/* Saved/current state. */
int mask;
- struct ui_out *saved_uiout;
struct cleanup *saved_cleanup_chain;
/* Back link. */
struct catcher *prev;
/* Where to go for throw_exception(). */
static struct catcher *current_catcher;
+/* Return length of current_catcher list. */
+
+static int
+catcher_list_size (void)
+{
+ int size;
+ struct catcher *catcher;
+
+ for (size = 0, catcher = current_catcher;
+ catcher != NULL;
+ catcher = catcher->prev)
+ ++size;
+
+ return size;
+}
+
EXCEPTIONS_SIGJMP_BUF *
-exceptions_state_mc_init (struct ui_out *func_uiout,
- volatile struct gdb_exception *exception,
+exceptions_state_mc_init (volatile struct gdb_exception *exception,
return_mask mask)
{
struct catcher *new_catcher = XZALLOC (struct catcher);
new_catcher->mask = mask;
- /* Override the global ``struct ui_out'' builder. */
- new_catcher->saved_uiout = uiout;
- uiout = func_uiout;
-
/* Prevent error/quit during FUNC from calling cleanups established
prior to here. */
new_catcher->saved_cleanup_chain = save_cleanups ();
restore_cleanups (old_catcher->saved_cleanup_chain);
- uiout = old_catcher->saved_uiout;
-
xfree (old_catcher);
}
void
throw_exception (struct gdb_exception exception)
{
- struct thread_info *tp = NULL;
-
- quit_flag = 0;
+ clear_quit_flag ();
immediate_quit = 0;
- if (!ptid_equal (inferior_ptid, null_ptid))
- tp = find_thread_ptid (inferior_ptid);
-
- /* Perhaps it would be cleaner to do this via the cleanup chain (not sure
- I can think of a reason why that is vital, though). */
- if (tp != NULL)
- {
- /* Clear queued breakpoint commands. */
- bpstat_clear_actions (tp->control.stop_bpstat);
- }
-
- disable_current_display ();
- do_cleanups (ALL_CLEANUPS);
+ do_cleanups (all_cleanups ());
/* Jump to the containing catch_errors() call, communicating REASON
to that call via setjmp's return value. Note that REASON can't
EXCEPTIONS_SIGLONGJMP (current_catcher->buf, exception.reason);
}
-static char *last_message;
-
void
deprecated_throw_reason (enum return_reason reason)
{
}
}
+/* A stack of exception messages.
+ This is needed to handle nested calls to throw_it: we don't want to
+ xfree space for a message before it's used.
+ This can happen if we throw an exception during a cleanup:
+ An outer TRY_CATCH may have an exception message it wants to print,
+ but while doing cleanups further calls to throw_it are made.
+
+ This is indexed by the size of the current_catcher list.
+ It is a dynamically allocated array so that we don't care how deeply
+ GDB nests its TRY_CATCHs. */
+static char **exception_messages;
+
+/* The number of currently allocated entries in exception_messages. */
+static int exception_messages_size;
+
static void ATTRIBUTE_NORETURN ATTRIBUTE_PRINTF (3, 0)
throw_it (enum return_reason reason, enum errors error, const char *fmt,
va_list ap)
{
struct gdb_exception e;
char *new_message;
+ int depth = catcher_list_size ();
- /* Save the message. Create the new message before deleting the
- old, the new message may include the old message text. */
+ gdb_assert (depth > 0);
+
+ /* Note: The new message may use an old message's text. */
new_message = xstrvprintf (fmt, ap);
- xfree (last_message);
- last_message = new_message;
+
+ if (depth > exception_messages_size)
+ {
+ int old_size = exception_messages_size;
+
+ exception_messages_size = depth + 10;
+ exception_messages = (char **) xrealloc (exception_messages,
+ exception_messages_size
+ * sizeof (char *));
+ memset (exception_messages + old_size, 0,
+ (exception_messages_size - old_size) * sizeof (char *));
+ }
+
+ xfree (exception_messages[depth - 1]);
+ exception_messages[depth - 1] = new_message;
/* Create the exception. */
e.reason = reason;
e.error = error;
- e.message = last_message;
+ e.message = new_message;
/* Throw the exception. */
throw_exception (e);
be replaced by judicious use of QUIT. */
/* MAYBE: cagney/1999-11-05: catch_errors() in conjunction with
- error() et al. could maintain a set of flags that indicate the the
+ error() et al. could maintain a set of flags that indicate the
current state of each of the longjmp buffers. This would give the
longjmp code the chance to detect a longjmp botch (before it gets
to longjmperror()). Prior to 1999-11-05 this wasn't possible as
}
int
-catch_exceptions_with_msg (struct ui_out *uiout,
+catch_exceptions_with_msg (struct ui_out *func_uiout,
catch_exceptions_ftype *func,
void *func_args,
char **gdberrmsg,
{
volatile struct gdb_exception exception;
volatile int val = 0;
+ struct ui_out *saved_uiout;
+
+ /* Save and override the global ``struct ui_out'' builder. */
+ saved_uiout = current_uiout;
+ current_uiout = func_uiout;
- TRY_CATCH (exception, mask)
+ TRY_CATCH (exception, RETURN_MASK_ALL)
{
- val = (*func) (uiout, func_args);
+ val = (*func) (current_uiout, func_args);
}
+
+ /* Restore the global builder. */
+ current_uiout = saved_uiout;
+
+ if (exception.reason < 0 && (mask & RETURN_MASK (exception.reason)) == 0)
+ {
+ /* The caller didn't request that the event be caught.
+ Rethrow. */
+ throw_exception (exception);
+ }
+
print_any_exception (gdb_stderr, NULL, exception);
gdb_assert (val >= 0);
gdb_assert (exception.reason <= 0);
{
volatile int val = 0;
volatile struct gdb_exception exception;
+ struct ui_out *saved_uiout;
- TRY_CATCH (exception, mask)
+ /* Save the global ``struct ui_out'' builder. */
+ saved_uiout = current_uiout;
+
+ TRY_CATCH (exception, RETURN_MASK_ALL)
{
val = func (func_args);
}
+
+ /* Restore the global builder. */
+ current_uiout = saved_uiout;
+
+ if (exception.reason < 0 && (mask & RETURN_MASK (exception.reason)) == 0)
+ {
+ /* The caller didn't request that the event be caught.
+ Rethrow. */
+ throw_exception (exception);
+ }
+
print_any_exception (gdb_stderr, errstring, exception);
if (exception.reason != 0)
return 0;
projects / deliverable / binutils-gdb.git / blobdiff