diff options
| -rw-r--r-- | gdb/ChangeLog | 12 | ||||
| -rw-r--r-- | gdb/breakpoint.c | 2 | ||||
| -rw-r--r-- | gdb/exceptions.c | 2 | ||||
| -rw-r--r-- | gdb/exceptions.h | 5 | ||||
| -rw-r--r-- | gdb/monitor.c | 2 | ||||
| -rw-r--r-- | gdb/nto-procfs.c | 2 | ||||
| -rw-r--r-- | gdb/ocd.c | 2 | ||||
| -rw-r--r-- | gdb/remote-fileio.c | 2 | ||||
| -rw-r--r-- | gdb/remote-mips.c | 4 | ||||
| -rw-r--r-- | gdb/remote-sds.c | 2 | ||||
| -rw-r--r-- | gdb/remote.c | 2 | ||||
| -rw-r--r-- | gdb/utils.c | 4 |
12 files changed, 28 insertions, 13 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index e5b3585..1c63d23 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,17 @@ 2005-01-19 Andrew Cagney <cagney@gnu.org> + * exceptions.h (deprecated_throw_reason): Rename throw_reason. + * exceptions.c (deprecated_throw_reason): Rename throw_reason. + * utils.c (internal_verror, quit): Update. + * remote-sds.c (interrupt_query): Update. + * remote-mips.c (mips_error, mips_kill): Update. + * remote-fileio.c (remote_fileio_ctrl_c_signal_handler): Update. + * remote.c (interrupt_query): Update. + * ocd.c (interrupt_query): Update. + * nto-procfs.c (interrupt_query): Update. + * monitor.c (monitor_interrupt_query): Update. + * breakpoint.c (break_command_1): Update. + * infrun.c: (resume, proceed, wait_for_inferior) (handle_inferior_event, stop_stepping) (prepare_to_wait): Write debug output to gdb_stdlog. diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 3c0e885..d92dbeb 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -5144,7 +5144,7 @@ break_command_1 (char *arg, int flag, int from_tty, struct breakpoint *pending_b error. */ if (pending_break_support == AUTO_BOOLEAN_FALSE) - throw_reason (RETURN_ERROR); + deprecated_throw_reason (RETURN_ERROR); /* If pending breakpoint support is auto query and the user selects no, then simply return the error code. */ diff --git a/gdb/exceptions.c b/gdb/exceptions.c index e640b5f..9219462 100644 --- a/gdb/exceptions.c +++ b/gdb/exceptions.c @@ -239,7 +239,7 @@ throw_exception (struct exception exception) static char *last_message; NORETURN void -throw_reason (enum return_reason reason) +deprecated_throw_reason (enum return_reason reason) { struct exception exception; memset (&exception, 0, sizeof exception); diff --git a/gdb/exceptions.h b/gdb/exceptions.h index fddaf37..fe19ecd 100644 --- a/gdb/exceptions.h +++ b/gdb/exceptions.h @@ -85,13 +85,16 @@ extern void exception_fprintf (struct ui_file *file, struct exception e, 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_verror (enum errors, const char *fmt, va_list ap) ATTR_NORETURN; extern NORETURN void throw_vfatal (const char *fmt, va_list ap) ATTR_NORETURN; extern NORETURN void throw_error (enum errors error, const char *fmt, ...) ATTR_NORETURN ATTR_FORMAT (printf, 2, 3); +/* Instead of deprecated_throw_reason, code should use catch_exception + and throw_exception. */ +extern NORETURN void deprecated_throw_reason (enum return_reason reason) ATTR_NORETURN; + /* 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 diff --git a/gdb/monitor.c b/gdb/monitor.c index 0e90fcd..a468e3c 100644 --- a/gdb/monitor.c +++ b/gdb/monitor.c @@ -1030,7 +1030,7 @@ monitor_interrupt_query (void) Give up (and stop debugging it)? ")) { target_mourn_inferior (); - throw_reason (RETURN_QUIT); + deprecated_throw_reason (RETURN_QUIT); } target_terminal_inferior (); diff --git a/gdb/nto-procfs.c b/gdb/nto-procfs.c index b88c53f..ad1bea0 100644 --- a/gdb/nto-procfs.c +++ b/gdb/nto-procfs.c @@ -592,7 +592,7 @@ interrupt_query (void) Give up (and stop debugging it)? ")) { target_mourn_inferior (); - throw_reason (RETURN_QUIT); + deprecated_throw_reason (RETURN_QUIT); } target_terminal_inferior (); @@ -397,7 +397,7 @@ interrupt_query (void) Give up (and stop debugging it)? ")) { target_mourn_inferior (); - throw_reason (RETURN_QUIT); + deprecated_throw_reason (RETURN_QUIT); } target_terminal_inferior (); diff --git a/gdb/remote-fileio.c b/gdb/remote-fileio.c index 9e6cc3f..2ffc803 100644 --- a/gdb/remote-fileio.c +++ b/gdb/remote-fileio.c @@ -480,7 +480,7 @@ remote_fileio_ctrl_c_signal_handler (int signo) remote_fileio_sig_set (SIG_IGN); remote_fio_ctrl_c_flag = 1; if (!remote_fio_no_longjmp) - throw_reason (RETURN_QUIT); + deprecated_throw_reason (RETURN_QUIT); remote_fileio_sig_set (remote_fileio_ctrl_c_signal_handler); } diff --git a/gdb/remote-mips.c b/gdb/remote-mips.c index 60f4546..aa14c19 100644 --- a/gdb/remote-mips.c +++ b/gdb/remote-mips.c @@ -497,7 +497,7 @@ mips_error (char *string,...) printf_unfiltered ("Ending remote MIPS debugging.\n"); target_mourn_inferior (); - throw_reason (RETURN_ERROR); + deprecated_throw_reason (RETURN_ERROR); } /* putc_readable - print a character, displaying non-printable chars in @@ -2148,7 +2148,7 @@ Give up (and stop debugging it)? ")) printf_unfiltered ("Ending remote MIPS debugging.\n"); target_mourn_inferior (); - throw_reason (RETURN_QUIT); + deprecated_throw_reason (RETURN_QUIT); } target_terminal_inferior (); diff --git a/gdb/remote-sds.c b/gdb/remote-sds.c index 1c62821..06763fa 100644 --- a/gdb/remote-sds.c +++ b/gdb/remote-sds.c @@ -386,7 +386,7 @@ interrupt_query (void) Give up (and stop debugging it)? ")) { target_mourn_inferior (); - throw_reason (RETURN_QUIT); + deprecated_throw_reason (RETURN_QUIT); } target_terminal_inferior (); diff --git a/gdb/remote.c b/gdb/remote.c index 7f1aa49..4cd4c44 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -2730,7 +2730,7 @@ interrupt_query (void) Give up (and stop debugging it)? ")) { target_mourn_inferior (); - throw_reason (RETURN_QUIT); + deprecated_throw_reason (RETURN_QUIT); } target_terminal_inferior (); diff --git a/gdb/utils.c b/gdb/utils.c index 08dfdd4..243fc75 100644 --- a/gdb/utils.c +++ b/gdb/utils.c @@ -779,7 +779,7 @@ NORETURN void internal_verror (const char *file, int line, const char *fmt, va_list ap) { internal_vproblem (&internal_error_problem, file, line, fmt, ap); - throw_reason (RETURN_ERROR); + deprecated_throw_reason (RETURN_ERROR); } NORETURN void @@ -920,7 +920,7 @@ quit (void) fprintf_unfiltered (gdb_stderr, "Quit (expect signal SIGINT when the program is resumed)\n"); #endif - throw_reason (RETURN_QUIT); + deprecated_throw_reason (RETURN_QUIT); } /* Control C comes here */ |