diff options
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 8 | ||||
| -rw-r--r-- | gdb/NEWS | 3 | ||||
| -rw-r--r-- | gdb/doc/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/doc/gdb.texinfo | 10 | ||||
| -rw-r--r-- | gdb/stack.c | 87 | ||||
| -rw-r--r-- | gdb/testsuite/ChangeLog | 7 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/default.exp | 2 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/gdb_history | 1 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/help.exp | 2 |
9 files changed, 23 insertions, 102 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 88b8f62..cc0fd4a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2012-01-24 Gary Benson <gbenson@redhat.com> + + Delete #if 0'd out code. + * stack.c (print_frame_label_vars): Remove. + (catch_info): Likewise. + (_initialize_stack): Remove "info catch" command. + * NEWS: Mention the above. + 2012-01-24 Pedro Alves <palves@redhat.com> * remote.c (remote_add_inferior): New `fake_pid_p' parameter. Use @@ -31,6 +31,9 @@ * The "info proc" and "generate-core-file" commands will now also work on remote targets connected to GDBserver on Linux. +* The command "info catch" has been removed. It has been disabled + since December 2007. + *** Changes in GDB 7.4 * GDB now handles ambiguous linespecs more consistently; the existing diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog index 99bc881..f900d74 100644 --- a/gdb/doc/ChangeLog +++ b/gdb/doc/ChangeLog @@ -1,3 +1,8 @@ +2012-01-24 Gary Benson <gbenson@redhat.com> + + Delete #if 0'd out code. + * gdb.texinfo (Frame Info): Remove "info catch". + 2012-01-20 Ulrich Weigand <ulrich.weigand@linaro.org> * gdb.texinfo (Remote Configuration): Document diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo index 20b0b67..a1e937d 100644 --- a/gdb/doc/gdb.texinfo +++ b/gdb/doc/gdb.texinfo @@ -6339,16 +6339,6 @@ Print the local variables of the selected frame, each on a separate line. These are all variables (declared either static or automatic) accessible at the point of execution of the selected frame. -@kindex info catch -@cindex catch exceptions, list active handlers -@cindex exception handlers, how to list -@item info catch -Print a list of all the exception handlers that are active in the -current stack frame at the current point of execution. To see other -exception handlers, visit the associated frame (using the @code{up}, -@code{down}, or @code{frame} commands); then type @code{info catch}. -@xref{Set Catchpoints, , Setting Catchpoints}. - @end table diff --git a/gdb/stack.c b/gdb/stack.c index b15b5fc..6536d74 100644 --- a/gdb/stack.c +++ b/gdb/stack.c @@ -1968,82 +1968,6 @@ print_frame_local_vars (struct frame_info *frame, int num_tabs, fprintf_filtered (stream, _("No locals.\n")); } -/* Same, but print labels. */ - -static void -print_frame_label_vars (struct frame_info *frame, int this_level_only, - struct ui_file *stream) -{ -#if 1 - fprintf_filtered (stream, "print_frame_label_vars disabled.\n"); -#else - struct blockvector *bl; - struct block *block = get_frame_block (frame, 0); - struct gdbarch *gdbarch = get_frame_arch (frame); - int values_printed = 0; - int index, have_default = 0; - char *blocks_printed; - CORE_ADDR pc = get_frame_pc (frame); - - if (block == 0) - { - fprintf_filtered (stream, "No symbol table info available.\n"); - return; - } - - bl = blockvector_for_pc (BLOCK_END (block) - 4, &index); - blocks_printed = alloca (BLOCKVECTOR_NBLOCKS (bl) * sizeof (char)); - memset (blocks_printed, 0, BLOCKVECTOR_NBLOCKS (bl) * sizeof (char)); - - while (block != 0) - { - CORE_ADDR end = BLOCK_END (block) - 4; - int last_index; - - if (bl != blockvector_for_pc (end, &index)) - error (_("blockvector blotch")); - if (BLOCKVECTOR_BLOCK (bl, index) != block) - error (_("blockvector botch")); - last_index = BLOCKVECTOR_NBLOCKS (bl); - index += 1; - - /* Don't print out blocks that have gone by. */ - while (index < last_index - && BLOCK_END (BLOCKVECTOR_BLOCK (bl, index)) < pc) - index++; - - while (index < last_index - && BLOCK_END (BLOCKVECTOR_BLOCK (bl, index)) < end) - { - if (blocks_printed[index] == 0) - { - if (print_block_frame_labels (gdbarch, - BLOCKVECTOR_BLOCK (bl, index), - &have_default, stream)) - values_printed = 1; - blocks_printed[index] = 1; - } - index++; - } - if (have_default) - return; - if (values_printed && this_level_only) - return; - - /* After handling the function's top-level block, stop. Don't - continue to its superblock, the block of per-file symbols. - Also do not continue to the containing function of an inlined - function. */ - if (BLOCK_FUNCTION (block)) - break; - block = BLOCK_SUPERBLOCK (block); - } - - if (!values_printed && !this_level_only) - fprintf_filtered (stream, _("No catches.\n")); -#endif -} - void locals_info (char *args, int from_tty) { @@ -2051,14 +1975,6 @@ locals_info (char *args, int from_tty) 0, gdb_stdout); } -static void -catch_info (char *ignore, int from_tty) -{ - /* Assume g++ compiled code; old GDB 4.16 behaviour. */ - print_frame_label_vars (get_selected_frame (_("No frame selected.")), - 0, gdb_stdout); -} - /* Iterate over all the argument variables in block B. Returns 1 if any argument was walked; 0 otherwise. */ @@ -2615,9 +2531,6 @@ Usage: T <count>\n")); Select the stack frame that contains <func>.\n\ Usage: func <name>\n")); - add_info ("catch", catch_info, - _("Exceptions that can be caught in the current stack frame.")); - add_setshow_enum_cmd ("frame-arguments", class_stack, print_frame_arguments_choices, &print_frame_arguments, _("Set printing of non-scalar frame arguments"), diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 147c546..95a890d 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2012-01-24 Gary Benson <gbenson@redhat.com> + + Delete #if 0'd out code. + * gdb.base/default.exp (info catch): Remove. + * gdb.base/gdb_history (info catch): Likewise. + * gdb.base/help.exp (info catch): Likewise. + 2012-01-24 Jan Kratochvil <jan.kratochvil@redhat.com> Fix watchpoints to be specific for each inferior. diff --git a/gdb/testsuite/gdb.base/default.exp b/gdb/testsuite/gdb.base/default.exp index 9677396..d0a8295 100644 --- a/gdb/testsuite/gdb.base/default.exp +++ b/gdb/testsuite/gdb.base/default.exp @@ -282,8 +282,6 @@ gdb_test "info args" "No frame selected." "info args" gdb_test "info bogus-gdb-command" "Undefined info command: \"bogus-gdb-command\". Try \"help info\".*" "info bogus-gdb-command" #test info breakpoints gdb_test "info breakpoints" "No breakpoints or watchpoints." "info breakpoints" -#test info catch -gdb_test "info catch" "No frame selected." "info catch" #test info copying # FIXME -- doesn't work worth a shit #send_gdb "info copying" diff --git a/gdb/testsuite/gdb.base/gdb_history b/gdb/testsuite/gdb.base/gdb_history index cc22f69..231ba33 100644 --- a/gdb/testsuite/gdb.base/gdb_history +++ b/gdb/testsuite/gdb.base/gdb_history @@ -85,7 +85,6 @@ info all-registers info args info bogus-gdb-command info breakpoints -info catch info copying info display info f diff --git a/gdb/testsuite/gdb.base/help.exp b/gdb/testsuite/gdb.base/help.exp index 819643d..117e5b5 100644 --- a/gdb/testsuite/gdb.base/help.exp +++ b/gdb/testsuite/gdb.base/help.exp @@ -240,8 +240,6 @@ gdb_test "help info args" "Argument variables of current stack frame\." "help in gdb_test "help info breakpoints" \ "Status of specified breakpoints .all user-settable breakpoints if no argument.*\[\r\n\]+breakpoint set\." \ "help info breakpoints" -# test help info catch -gdb_test "help info catch" "Exceptions that can be caught in the current stack frame\." "help info catch" # test help info copying gdb_test "help info copying" "Conditions for redistributing copies of GDB\." "help info copying" # test help info display |