From: Joel Brobecker Date: Tue, 17 May 2011 21:25:57 +0000 (+0000) Subject: improve Ada exception catchpoint MI notification X-Git-Tag: gdb_7_3-2011-07-26-release~124 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b9768a4faacbeee5d95a7ef8a93220ed658887d;p=thirdparty%2Fbinutils-gdb.git improve Ada exception catchpoint MI notification This rewrites the code generating the Ada exception catchpoint hit notification for both the GDB/MI case as well as the non-MI case, by using the relevant ui_out_* functions to generate the output. the MI notifications for Ada exception catchpoints now include the stop reason, and the breakpoint "disp", much like other breakpoint events do. It also introduces a new field "exception-name" for exception catchpoints (excluding "failed assertion catchpoints, where we just want to know that it was a failed assertion). gdb/ChangeLog: * breakpoint.h (bpdisp_text): Add declaration. * breakpoint.c (bpdisp_text): Make non-static. * ada-lang.c: #include "mi/mi-common.h". (print_it_exception): Rewrite to improve GDB/MI output. gdb/doc/ChangeLog: * gdb.texinfo (GDB/MI Ada Exception Information): Document the "exception-name" field in the *stopped async record. gdb/testsuite/ChangeLog: * gdb.ada/mi_catch_ex: New testcase. --- diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 336a47ea462..94e14bd71bb 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2011-04-01 Joel Brobecker + + * breakpoint.h (bpdisp_text): Add declaration. + * breakpoint.c (bpdisp_text): Make non-static. + * ada-lang.c: #include "mi/mi-common.h". + (print_it_exception): Rewrite to improve GDB/MI output. + 2011-04-01 Pedro Alves * arm-tdep.h (struct address_space): Add forward declaration. diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 8fc8b159135..dee69052a50 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -60,6 +60,7 @@ #include "psymtab.h" #include "value.h" +#include "mi/mi-common.h" /* Define whether or not the C operator '/' truncates towards zero for differently signed operands (truncation direction is undefined in C). @@ -10744,40 +10745,63 @@ ada_exception_name_addr (enum exception_catchpoint_kind ex, static enum print_stop_action print_it_exception (enum exception_catchpoint_kind ex, struct breakpoint *b) { - const CORE_ADDR addr = ada_exception_name_addr (ex, b); - char exception_name[256]; + annotate_catchpoint (b->number); - if (addr != 0) + if (ui_out_is_mi_like_p (uiout)) { - read_memory (addr, exception_name, sizeof (exception_name) - 1); - exception_name [sizeof (exception_name) - 1] = '\0'; + ui_out_field_string (uiout, "reason", + async_reason_lookup (EXEC_ASYNC_BREAKPOINT_HIT)); + ui_out_field_string (uiout, "disp", bpdisp_text (b->disposition)); } - ada_find_printable_frame (get_current_frame ()); + ui_out_text (uiout, "\nCatchpoint "); + ui_out_field_int (uiout, "bkptno", b->number); + ui_out_text (uiout, ", "); - annotate_catchpoint (b->number); switch (ex) { case ex_catch_exception: - if (addr != 0) - printf_filtered (_("\nCatchpoint %d, %s at "), - b->number, exception_name); - else - printf_filtered (_("\nCatchpoint %d, exception at "), b->number); - break; case ex_catch_exception_unhandled: - if (addr != 0) - printf_filtered (_("\nCatchpoint %d, unhandled %s at "), - b->number, exception_name); - else - printf_filtered (_("\nCatchpoint %d, unhandled exception at "), - b->number); - break; + { + const CORE_ADDR addr = ada_exception_name_addr (ex, b); + char exception_name[256]; + + if (addr != 0) + { + read_memory (addr, exception_name, sizeof (exception_name) - 1); + exception_name [sizeof (exception_name) - 1] = '\0'; + } + else + { + /* For some reason, we were unable to read the exception + name. This could happen if the Runtime was compiled + without debugging info, for instance. In that case, + just replace the exception name by the generic string + "exception" - it will read as "an exception" in the + notification we are about to print. */ + sprintf (exception_name, "exception"); + } + /* In the case of unhandled exception breakpoints, we print + the exception name as "unhandled EXCEPTION_NAME", to make + it clearer to the user which kind of catchpoint just got + hit. We used ui_out_text to make sure that this extra + info does not pollute the exception name in the MI case. */ + if (ex == ex_catch_exception_unhandled) + ui_out_text (uiout, "unhandled "); + ui_out_field_string (uiout, "exception-name", exception_name); + } + break; case ex_catch_assert: - printf_filtered (_("\nCatchpoint %d, failed assertion at "), - b->number); - break; + /* In this case, the name of the exception is not really + important. Just print "failed assertion" to make it clearer + that his program just hit an assertion-failure catchpoint. + We used ui_out_text because this info does not belong in + the MI output. */ + ui_out_text (uiout, "failed assertion"); + break; } + ui_out_text (uiout, " at "); + ada_find_printable_frame (get_current_frame ()); return PRINT_SRC_AND_LOC; } diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index f93500f019d..ce58ff3c684 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -251,7 +251,7 @@ breakpoint_commands (struct breakpoint *b) static int breakpoint_proceeded; -static const char * +const char * bpdisp_text (enum bpdisp disp) { /* NOTE: the following values are a part of MI protocol and diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h index 18a7ce791ae..7a9c2d4729d 100644 --- a/gdb/breakpoint.h +++ b/gdb/breakpoint.h @@ -961,6 +961,10 @@ extern void breakpoint_auto_delete (bpstat); is hit. */ extern struct command_line *breakpoint_commands (struct breakpoint *b); +/* Return a string image of DISP. The string is static, and thus should + NOT be deallocated after use. */ +const char *bpdisp_text (enum bpdisp disp); + extern void break_command (char *, int); extern void hbreak_command_wrapper (char *, int); diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog index 6dc88c16fdb..be75667202c 100644 --- a/gdb/doc/ChangeLog +++ b/gdb/doc/ChangeLog @@ -1,3 +1,8 @@ +2011-04-01 Joel Brobecker + + * gdb.texinfo (GDB/MI Ada Exception Information): Document + the "exception-name" field in the *stopped async record. + 2011-05-03 Joel Brobecker * gdb.texinfo (titlepage): Dedicate GDB version 7.3 to diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo index 437ca43ec6b..010eb8b34fe 100644 --- a/gdb/doc/gdb.texinfo +++ b/gdb/doc/gdb.texinfo @@ -24947,6 +24947,7 @@ follow development on @email{gdb@@sourceware.org} and * GDB/MI Async Records:: * GDB/MI Frame Information:: * GDB/MI Thread Information:: +* GDB/MI Ada Exception Information @end menu @node GDB/MI Result Records @@ -25212,6 +25213,13 @@ The value of this field is an integer number of the processor core the thread was last seen on. This field is optional. @end table +@node GDB/MI Ada Exception Information +@subsection @sc{gdb/mi} Ada Exception Information + +Whenever a @code{*stopped} record is emitted because the program +stopped after hitting an exception catchpoint (@pxref{Set Catchpoints}), +@value{GDBN} provides the name of the exception that was raised via +the @code{exception-name} field. @c %%%%%%%%%%%%%%%%%%%%%%%%%%%% SECTION %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @node GDB/MI Simple Examples diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 2fe165ce89b..cfe84a3bece 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2011-04-01 Joel Brobecker + + * gdb.ada/mi_catch_ex: New testcase. + 2011-04-01 Pedro Alves * gdb.cp/cpexprs.exp (Overloaded methods): No longer try the