+2005-01-12 Andrew Cagney <cagney@gnu.org>
+
+ * exceptions.h (throw_reason): Rename throw_exception.
+ (enum errors, struct exception): Define.
+ (catch_exception_ftype): Define.
+ (catch_exception, throw_exception): Declare.
+ * exceptions.c (throw_exception): Rewrite.
+ (throw_reason): New function.
+ (struct catcher, catcher_state_machine): Replace "reason" with
+ "exception", delete "gdberrmsg".
+ (catch_exception): New function.
+ (catcher_init): Replace "gdberrmsg" parameter with "exception".
+ (catch_errors, catch_exceptions_with_msg): Re-implement passing
+ exception to catcher_init.
+ * utils.c (error_silent, error_stream_1): Use throw_reason.
+ (internal_verror, quit): Ditto.
+ * breakpoint.c (insert_catchpoint, break_command_1): Ditto.
+ * remote-fileio.c (remote_fileio_ctrl_c_signal_handler): Ditto.
+ * remote.c (remote_open_1, interrupt_query): Ditto.
+
2005-01-12 Mark Kettenis <kettenis@gnu.org>
* i386fbsd-tdep.c: Update copyright year. Include "gdbcore.h",
struct catcher
{
enum catcher_state state;
- /* Scratch variables used when transitioning a state. */
+ /* Jump buffer pointing back at the exception handler. */
SIGJMP_BUF buf;
- int reason;
- int val;
+ /* Status buffer belonging to that exception handler. */
+ volatile struct exception *exception;
/* Saved/current state. */
int mask;
char *saved_error_pre_print;
char *saved_quit_pre_print;
struct ui_out *saved_uiout;
struct cleanup *saved_cleanup_chain;
- char **gdberrmsg;
/* Back link. */
struct catcher *prev;
};
static SIGJMP_BUF *
catcher_init (struct ui_out *func_uiout,
char *errstring,
- char **gdberrmsg,
+ volatile struct exception *exception,
return_mask mask)
{
struct catcher *new_catcher = XZALLOC (struct catcher);
- new_catcher->gdberrmsg = gdberrmsg;
+ /* Start with no exception, save it's address. */
+ exception->reason = 0;
+ exception->error = NO_ERROR;
+ exception->message = NULL;
+ new_catcher->exception = exception;
+
new_catcher->mask = mask;
/* Override error/quit messages during FUNC. */
{
case CATCH_ITER:
{
- int reason = current_catcher->reason;
- /* If caller wants a copy of the low-level error message,
- make one. This is used in the case of a silent error
- whereby the caller may optionally want to issue the
- message. */
- if (current_catcher->gdberrmsg != NULL)
- *(current_catcher->gdberrmsg) = error_last_message ();
- if (current_catcher->mask & RETURN_MASK (reason))
+ struct 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
relay the event to the next containing
catch_errors(). */
catcher_pop ();
- throw_exception (reason);
+ throw_exception (exception);
}
default:
internal_error (__FILE__, __LINE__, "bad state");
}
}
-/* Return for reason REASON to the nearest containing catch_errors(). */
+/* Return EXCEPTION to the nearest containing catch_errors(). */
NORETURN void
-throw_exception (enum return_reason reason)
+throw_exception (struct exception exception)
{
quit_flag = 0;
immediate_quit = 0;
do_exec_error_cleanups (ALL_CLEANUPS);
if (annotation_level > 1)
- switch (reason)
+ switch (exception.reason)
{
case RETURN_QUIT:
annotate_quit ();
break;
case RETURN_ERROR:
+ /* Assume that these are all errors. */
annotate_error ();
break;
+ default:
+ internal_error (__FILE__, __LINE__, "Bad switch.");
}
/* 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. */
catcher_state_machine (CATCH_THROWING);
- current_catcher->reason = reason;
- SIGLONGJMP (current_catcher->buf, current_catcher->reason);
+ *current_catcher->exception = exception;
+ SIGLONGJMP (current_catcher->buf, exception.reason);
+}
+
+NORETURN void
+throw_reason (enum return_reason reason)
+{
+ struct exception exception;
+ memset (&exception, 0, sizeof exception);
+
+ exception.reason = reason;
+ switch (reason)
+ {
+ case RETURN_QUIT:
+ break;
+ case RETURN_ERROR:
+ exception.error = GENERIC_ERROR;
+ exception.message = error_last_message ();
+ break;
+ default:
+ internal_error (__FILE__, __LINE__, "bad switch");
+ }
+
+ throw_exception (exception);
}
/* Call FUNC() with args FUNC_UIOUT and FUNC_ARGS, catching any
NULL, mask);
}
+struct exception
+catch_exception (struct ui_out *uiout,
+ catch_exception_ftype *func,
+ void *func_args,
+ return_mask mask)
+{
+ volatile struct exception exception;
+ SIGJMP_BUF *catch;
+ catch = catcher_init (uiout, NULL, &exception, mask);
+ for (SIGSETJMP ((*catch));
+ catcher_state_machine (CATCH_ITER);)
+ (*func) (uiout, func_args);
+ return exception;
+}
+
int
catch_exceptions_with_msg (struct ui_out *uiout,
catch_exceptions_ftype *func,
char **gdberrmsg,
return_mask mask)
{
- int val = 0;
- enum return_reason caught;
- SIGJMP_BUF *catch;
- catch = catcher_init (uiout, errstring, gdberrmsg, mask);
- for (caught = SIGSETJMP ((*catch));
- catcher_state_machine (CATCH_ITER);)
+ volatile struct exception exception;
+ volatile int val = 0;
+ SIGJMP_BUF *catch = catcher_init (uiout, errstring, &exception, mask);
+ for (SIGSETJMP ((*catch)); catcher_state_machine (CATCH_ITER);)
val = (*func) (uiout, func_args);
gdb_assert (val >= 0);
- gdb_assert (caught <= 0);
- if (caught < 0)
- return caught;
+ gdb_assert (exception.reason <= 0);
+ if (exception.reason < 0)
+ {
+ /* If caller wants a copy of the low-level error message, make
+ one. This is used in the case of a silent error whereby the
+ caller may optionally want to issue the message. */
+ if (gdberrmsg != NULL)
+ *gdberrmsg = exception.message;
+ return exception.reason;
+ }
return val;
}
catch_errors (catch_errors_ftype *func, void *func_args, char *errstring,
return_mask mask)
{
- int val = 0;
- enum return_reason caught;
- SIGJMP_BUF *catch;
- catch = catcher_init (uiout, errstring, NULL, mask);
+ volatile int val = 0;
+ volatile struct exception exception;
+ SIGJMP_BUF *catch = catcher_init (uiout, errstring, &exception, mask);
/* This illustrates how it is possible to nest the mechanism and
hence catch "break". Of course this doesn't address the need to
also catch "return". */
- for (caught = SIGSETJMP ((*catch)); catcher_state_machine (CATCH_ITER);)
- for (; catcher_state_machine (CATCH_ITER_1);)
- {
- val = func (func_args);
- break;
- }
- if (caught != 0)
+ for (SIGSETJMP ((*catch)); catcher_state_machine (CATCH_ITER);)
+ val = func (func_args);
+ if (exception.reason != 0)
return 0;
return val;
}
#ifndef EXCEPTIONS_H
#define EXCEPTIONS_H
-/* Reasons for calling throw_exception(). NOTE: all reason values
+/* Reasons for calling throw_exceptions(). NOTE: all reason values
must be less than zero. enum value 0 is reserved for internal use
as the return value from an initial setjmp(). The function
catch_exceptions() reserves values >= 0 as legal results from its
#define RETURN_MASK_ALL (RETURN_MASK_QUIT | RETURN_MASK_ERROR)
typedef int return_mask;
-/* Throw an exception of type RETURN_REASON. Will execute a LONG JUMP
- to the inner most containing exception handler established using
- catch_exceptions() (or the legacy catch_errors()).
+/* Describe all exceptions. */
+
+enum errors {
+ NO_ERROR,
+ /* Any generic error, the corresponding text is in
+ exception.message. */
+ GENERIC_ERROR,
+ /* Add more errors here. */
+ NR_ERRORS
+};
+
+struct exception
+{
+ enum return_reason reason;
+ enum errors error;
+ char *message;
+};
+
+/* Throw an exception (as described by "struct exception"). Will
+ execute a LONG JUMP to the inner most containing exception handler
+ established using catch_exceptions() (or similar).
Code normally throws an exception using error() et.al. For various
reaons, GDB also contains code that throws an exception directly.
For instance, the remote*.c targets contain CNTRL-C signal handlers
that propogate the QUIT event up the exception chain. ``This could
- be a good thing or a dangerous thing.'' -- the Existential Wombat. */
+ be a good thing or a dangerous thing.'' -- the Existential
+ Wombat. */
+
+extern NORETURN void throw_exception (struct exception exception) ATTR_NORETURN;
+extern NORETURN void throw_reason (enum return_reason reason) ATTR_NORETURN;
-extern NORETURN void throw_exception (enum return_reason) ATTR_NORETURN;
/* Call FUNC(UIOUT, FUNC_ARGS) but wrapped within an exception
handler. If an exception (enum return_reason) is thrown using
extern int catch_exceptions (struct ui_out *uiout,
catch_exceptions_ftype *func, void *func_args,
char *errstring, return_mask mask);
+typedef void (catch_exception_ftype) (struct ui_out *ui_out, void *args);
extern int catch_exceptions_with_msg (struct ui_out *uiout,
catch_exceptions_ftype *func,
void *func_args,
char *errstring, char **gdberrmsg,
return_mask mask);
+extern struct exception catch_exception (struct ui_out *uiout,
+ catch_exception_ftype *func,
+ void *func_args,
+ return_mask mask);
/* If CATCH_ERRORS_FTYPE throws an error, catch_errors() returns zero
otherwize the result from CATCH_ERRORS_FTYPE is returned. It is
projects / binutils-gdb.git / commitdiff