X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gdb%2Fexceptions.c;h=28b8dd1bce65e6181e93feca5005b4b543227cd4;hb=55a2906a4104af66db515294b18fca1fe63ea060;hp=7db9df9eb805662f3c342bac53d0de56f5984f3a;hpb=6328eb3805da75d26e17c13c7be09123d2ce9dc1;p=platform%2Fupstream%2Fbinutils.git diff --git a/gdb/exceptions.c b/gdb/exceptions.c index 7db9df9..28b8dd1 100644 --- a/gdb/exceptions.c +++ b/gdb/exceptions.c @@ -1,6 +1,6 @@ /* Exception (throw catch) mechanism, for GDB, the GNU debugger. - Copyright (C) 1986, 1988-2012 Free Software Foundation, Inc. + Copyright (C) 1986-2014 Free Software Foundation, Inc. This file is part of GDB. @@ -24,236 +24,16 @@ #include "inferior.h" #include "annotate.h" #include "ui-out.h" -#include "gdb_assert.h" -#include "gdb_string.h" #include "serial.h" #include "gdbthread.h" const struct gdb_exception exception_none = { 0, GDB_NO_ERROR, NULL }; -/* Possible catcher states. */ -enum catcher_state { - /* Initial state, a new catcher has just been created. */ - CATCHER_CREATED, - /* The catch code is running. */ - CATCHER_RUNNING, - CATCHER_RUNNING_1, - /* The catch code threw an exception. */ - CATCHER_ABORTING -}; - -/* Possible catcher actions. */ -enum catcher_action { - CATCH_ITER, - CATCH_ITER_1, - CATCH_THROWING -}; - -struct catcher -{ - enum catcher_state state; - /* Jump buffer pointing back at the exception handler. */ - EXCEPTIONS_SIGJMP_BUF buf; - /* Status buffer belonging to the exception handler. */ - volatile struct gdb_exception *exception; - /* Saved/current state. */ - int mask; - 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 (volatile struct gdb_exception *exception, - return_mask mask) -{ - struct catcher *new_catcher = XZALLOC (struct catcher); - - /* Start with no exception, save it's address. */ - exception->reason = 0; - exception->error = GDB_NO_ERROR; - exception->message = NULL; - new_catcher->exception = exception; - - new_catcher->mask = mask; - - /* Prevent error/quit during FUNC from calling cleanups established - prior to here. */ - new_catcher->saved_cleanup_chain = save_cleanups (); - - /* Push this new catcher on the top. */ - new_catcher->prev = current_catcher; - current_catcher = new_catcher; - new_catcher->state = CATCHER_CREATED; - - return &new_catcher->buf; -} - -static void -catcher_pop (void) -{ - struct catcher *old_catcher = current_catcher; - - current_catcher = old_catcher->prev; - - /* Restore the cleanup chain, the error/quit messages, and the uiout - builder, to their original states. */ - - restore_cleanups (old_catcher->saved_cleanup_chain); - - xfree (old_catcher); -} - -/* Catcher state machine. Returns non-zero if the m/c should be run - again, zero if it should abort. */ - -static int -exceptions_state_mc (enum catcher_action action) -{ - switch (current_catcher->state) - { - case CATCHER_CREATED: - switch (action) - { - case CATCH_ITER: - /* Allow the code to run the catcher. */ - current_catcher->state = CATCHER_RUNNING; - return 1; - default: - internal_error (__FILE__, __LINE__, _("bad state")); - } - case CATCHER_RUNNING: - switch (action) - { - case CATCH_ITER: - /* No error/quit has occured. Just clean up. */ - catcher_pop (); - return 0; - case CATCH_ITER_1: - current_catcher->state = CATCHER_RUNNING_1; - return 1; - case CATCH_THROWING: - current_catcher->state = CATCHER_ABORTING; - /* See also throw_exception. */ - return 1; - default: - internal_error (__FILE__, __LINE__, _("bad switch")); - } - case CATCHER_RUNNING_1: - switch (action) - { - case CATCH_ITER: - /* The did a "break" from the inner while loop. */ - catcher_pop (); - return 0; - case CATCH_ITER_1: - current_catcher->state = CATCHER_RUNNING; - return 0; - case CATCH_THROWING: - current_catcher->state = CATCHER_ABORTING; - /* See also throw_exception. */ - return 1; - default: - internal_error (__FILE__, __LINE__, _("bad switch")); - } - case CATCHER_ABORTING: - switch (action) - { - case CATCH_ITER: - { - struct gdb_exception exception = *current_catcher->exception; - - if (current_catcher->mask & RETURN_MASK (exception.reason)) - { - /* Exit normally if this catcher can handle this - exception. The caller analyses the func return - values. */ - catcher_pop (); - return 0; - } - /* The caller didn't request that the event be caught, - relay the event to the next containing - catch_errors(). */ - catcher_pop (); - throw_exception (exception); - } - default: - internal_error (__FILE__, __LINE__, _("bad state")); - } - default: - internal_error (__FILE__, __LINE__, _("bad switch")); - } -} - -int -exceptions_state_mc_action_iter (void) -{ - return exceptions_state_mc (CATCH_ITER); -} - -int -exceptions_state_mc_action_iter_1 (void) -{ - return exceptions_state_mc (CATCH_ITER_1); -} - -/* Return EXCEPTION to the nearest containing catch_errors(). */ - void -throw_exception (struct gdb_exception exception) +prepare_to_throw_exception (void) { - quit_flag = 0; + clear_quit_flag (); immediate_quit = 0; - - 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 - be zero, by definition in defs.h. */ - exceptions_state_mc (CATCH_THROWING); - *current_catcher->exception = exception; - EXCEPTIONS_SIGLONGJMP (current_catcher->buf, exception.reason); -} - -void -deprecated_throw_reason (enum return_reason reason) -{ - struct gdb_exception exception; - - memset (&exception, 0, sizeof exception); - - exception.reason = reason; - switch (reason) - { - case RETURN_QUIT: - break; - case RETURN_ERROR: - exception.error = GENERIC_ERROR; - break; - default: - internal_error (__FILE__, __LINE__, _("bad switch")); - } - - throw_exception (exception); } static void @@ -263,7 +43,9 @@ print_flush (void) if (deprecated_error_begin_hook) deprecated_error_begin_hook (); - target_terminal_ours (); + + if (target_supports_terminal_ours ()) + target_terminal_ours (); /* We want all output to appear now, before we print the error. We have 3 levels of buffering we have to flush (it's possible that @@ -271,7 +53,8 @@ print_flush (void) too): */ /* 1. The _filtered buffer. */ - wrap_here (""); + if (filtered_printing_initialized ()) + wrap_here (""); /* 2. The stdio buffer. */ gdb_flush (gdb_stdout); @@ -353,98 +136,6 @@ exception_fprintf (struct ui_file *file, struct gdb_exception e, } } -static void -print_any_exception (struct ui_file *file, const char *prefix, - struct gdb_exception e) -{ - if (e.reason < 0 && e.message != NULL) - { - target_terminal_ours (); - wrap_here (""); /* Force out any buffered output. */ - gdb_flush (gdb_stdout); - annotate_error_begin (); - - /* Print the prefix. */ - if (prefix != NULL && prefix[0] != '\0') - fputs_filtered (prefix, file); - print_exception (file, e); - } -} - -/* 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 (); - - gdb_assert (depth > 0); - - /* Note: The new message may use an old message's text. */ - new_message = xstrvprintf (fmt, ap); - - 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 = new_message; - - /* Throw the exception. */ - throw_exception (e); -} - -void -throw_verror (enum errors error, const char *fmt, va_list ap) -{ - throw_it (RETURN_ERROR, error, fmt, ap); -} - -void -throw_vfatal (const char *fmt, va_list ap) -{ - throw_it (RETURN_QUIT, GDB_NO_ERROR, fmt, ap); -} - -void -throw_error (enum errors error, const char *fmt, ...) -{ - va_list args; - - va_start (args, fmt); - throw_it (RETURN_ERROR, error, fmt, args); - va_end (args); -} - /* Call FUNC(UIOUT, FUNC_ARGS) but wrapped within an exception handler. If an exception (enum return_reason) is thrown using throw_exception() than all cleanups installed since @@ -508,7 +199,7 @@ catch_exceptions_with_msg (struct ui_out *func_uiout, throw_exception (exception); } - print_any_exception (gdb_stderr, NULL, exception); + exception_print (gdb_stderr, exception); gdb_assert (val >= 0); gdb_assert (exception.reason <= 0); if (exception.reason < 0) @@ -556,24 +247,8 @@ catch_errors (catch_errors_ftype *func, void *func_args, char *errstring, throw_exception (exception); } - print_any_exception (gdb_stderr, errstring, exception); + exception_fprintf (gdb_stderr, exception, "%s", errstring); if (exception.reason != 0) return 0; return val; } - -int -catch_command_errors (catch_command_errors_ftype * command, - char *arg, int from_tty, return_mask mask) -{ - volatile struct gdb_exception e; - - TRY_CATCH (e, mask) - { - command (arg, from_tty); - } - print_any_exception (gdb_stderr, NULL, e); - if (e.reason < 0) - return 0; - return 1; -}