diff options
author | Guinevere Larsen <blarsen@redhat.com> | 2024-02-13 15:36:23 +0100 |
---|---|---|
committer | Guinevere Larsen <blarsen@redhat.com> | 2024-05-08 14:08:16 -0300 |
commit | e61c7092f7fa93a196eccfb175b0f7d313231b83 (patch) | |
tree | 7e6304adf1d6eb2bf33b5052d743c257990b5c3d | |
parent | 189d3013eefb06ed4ccaae8f248842b785f387a1 (diff) | |
download | binutils-e61c7092f7fa93a196eccfb175b0f7d313231b83.zip binutils-e61c7092f7fa93a196eccfb175b0f7d313231b83.tar.gz binutils-e61c7092f7fa93a196eccfb175b0f7d313231b83.tar.bz2 |
gdb: Change "list ." command's error when no debuginfo is available
Currently, when a user tries to list the current location, there are 2
different error messages that can happen, either:
(gdb) list .
No symbol table is loaded. Use the "file" command.
or
(gdb) list .
No debug information available to print source lines.
The difference here is if gdb can find any symtabs at all or not, which
is not something too important for end-users - and isn't informative at
all. This commit changes it so that the error always says that there
isn't debug information available, with these two variants:
(gdb) list .
Insufficient debug info for showing source lines at current PC (0x55555555511d).
or
(gdb) list .
Insufficient debug info for showing source lines at default location.
The difference now is if the inferior has started already, which is
controlled by the user and may be useful.
Unfortunately, it isn't as easy to differentiate if the symtab found for
other list parameters is correct, so other invocations, such as "list +"
still retain their original error message.
Co-Authored-By: Simon Marchi <simark@simark.ca>
Reviewed-By: Eli Zaretskii <eliz@gnu.org>
Approved-By: Andrew Burgess <aburgess@redhat.com>
-rw-r--r-- | gdb/NEWS | 6 | ||||
-rw-r--r-- | gdb/cli/cli-cmds.c | 41 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/list-dot-nodebug-extra.c | 24 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/list-dot-nodebug.c | 33 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/list-dot-nodebug.exp | 60 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/list-nodebug.exp | 4 |
6 files changed, 155 insertions, 13 deletions
@@ -40,6 +40,12 @@ target record-full This command now gives an error if any unexpected arguments are found after the command. +list . + When using the command "list ." in a location that has no debug information + or no file loaded, GDB now says that there is no debug information to print + lines. This makes it more obvious that there is no information, as opposed + to implying there is no inferior loaded. + * New commands info missing-debug-handler diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c index 476138a..5d49e39 100644 --- a/gdb/cli/cli-cmds.c +++ b/gdb/cli/cli-cmds.c @@ -1234,37 +1234,39 @@ list_command (const char *arg, int from_tty) /* Pull in the current default source line if necessary. */ if (arg == NULL || ((arg[0] == '+' || arg[0] == '-' || arg[0] == '.') && arg[1] == '\0')) { - set_default_source_symtab_and_line (); - symtab_and_line cursal = get_current_source_symtab_and_line (); - /* If this is the first "list" since we've set the current source line, center the listing around that line. */ if (get_first_line_listed () == 0 && (arg == nullptr || arg[0] != '.')) { - list_around_line (arg, cursal); + set_default_source_symtab_and_line (); + list_around_line (arg, get_current_source_symtab_and_line ()); } /* "l" and "l +" lists the next few lines, unless we're listing past the end of the file. */ else if (arg == nullptr || arg[0] == '+') { + set_default_source_symtab_and_line (); + const symtab_and_line cursal = get_current_source_symtab_and_line (); if (last_symtab_line (cursal.symtab) >= cursal.line) print_source_lines (cursal.symtab, source_lines_range (cursal.line), 0); else - { - error (_("End of the file was already reached, use \"list .\" to" - " list the current location again")); - } + error (_("End of the file was already reached, use \"list .\" to" + " list the current location again")); } /* "l -" lists previous ten lines, the ones before the ten just listed. */ else if (arg[0] == '-') { + set_default_source_symtab_and_line (); + const symtab_and_line cursal = get_current_source_symtab_and_line (); + if (get_first_line_listed () == 1) error (_("Already at the start of %s."), symtab_to_filename_for_display (cursal.symtab)); + source_lines_range range (get_first_line_listed (), source_lines_range::BACKWARD); print_source_lines (cursal.symtab, range, 0); @@ -1273,6 +1275,7 @@ list_command (const char *arg, int from_tty) /* "list ." lists the default location again. */ else if (arg[0] == '.') { + symtab_and_line cursal; if (target_has_stack ()) { /* Find the current line by getting the PC of the currently @@ -1280,18 +1283,34 @@ list_command (const char *arg, int from_tty) frame_info_ptr frame = get_selected_frame (nullptr); CORE_ADDR curr_pc = get_frame_pc (frame); cursal = find_pc_line (curr_pc, 0); + + if (cursal.symtab == nullptr) + error + (_("Insufficient debug info for showing source lines at " + "current PC (%s)."), paddress (get_frame_arch (frame), + curr_pc)); } else { /* The inferior is not running, so reset the current source location to the default (usually the main function). */ clear_current_source_symtab_and_line (); - set_default_source_symtab_and_line (); + try + { + set_default_source_symtab_and_line (); + } + catch (const gdb_exception &e) + { + error (_("Insufficient debug info for showing source " + "lines at default location")); + } cursal = get_current_source_symtab_and_line (); + + gdb_assert (cursal.symtab != nullptr); } - if (cursal.symtab == nullptr) - error (_("No debug information available to print source lines.")); + list_around_line (arg, cursal); + /* Set the repeat args so just pressing "enter" after using "list ." will print the following lines instead of the same lines again. */ if (from_tty) diff --git a/gdb/testsuite/gdb.base/list-dot-nodebug-extra.c b/gdb/testsuite/gdb.base/list-dot-nodebug-extra.c new file mode 100644 index 0000000..58c1b64 --- /dev/null +++ b/gdb/testsuite/gdb.base/list-dot-nodebug-extra.c @@ -0,0 +1,24 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2024 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +extern void bar (int *); + +void +foo (int *x) +{ + bar (x); +} diff --git a/gdb/testsuite/gdb.base/list-dot-nodebug.c b/gdb/testsuite/gdb.base/list-dot-nodebug.c new file mode 100644 index 0000000..b37c356 --- /dev/null +++ b/gdb/testsuite/gdb.base/list-dot-nodebug.c @@ -0,0 +1,33 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2024 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +extern void foo (int *x); + +int x; + +void +bar (int *p) +{ + *p++; +} + +int +main () +{ + foo (&x); + return 0; +} diff --git a/gdb/testsuite/gdb.base/list-dot-nodebug.exp b/gdb/testsuite/gdb.base/list-dot-nodebug.exp new file mode 100644 index 0000000..40256ca --- /dev/null +++ b/gdb/testsuite/gdb.base/list-dot-nodebug.exp @@ -0,0 +1,60 @@ +# Copyright 2005-2024 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +# This test is here to confirm that the command "list ." will print the +# same message if GDB detects no debug information at all, or detects some +# but nothing for the current objfile. + +require !use_gdb_stub + +set linkflags [list additional_flags="-static"] + +if { ![gdb_can_simple_compile static-libc \ + { + void main (void) { return 0; } + } \ + executable $linkflags] } { + untested "Can't statically link" + return -1 +} + +standard_testfile .c -extra.c + +foreach_with_prefix debug {"none" "some"} { + + set flags "nodebug" + if {$debug == "some"} { + set flags "debug" + } + + if {[prepare_for_testing_full "failed to prepare" \ + [list ${testfile}-${debug} $linkflags \ + $srcfile [list nodebug] \ + $srcfile2 [list $debug]]]} { + return -1 + } + + gdb_test "list ." \ + "^Insufficient debug info for showing source lines at default location" \ + "print before start" + + if { ![runto bar] } { + return -1 + } + + gdb_test "list ." \ + "^Insufficient debug info for showing source lines at current PC \\($::hex\\)\\." \ + "print after start" +} diff --git a/gdb/testsuite/gdb.base/list-nodebug.exp b/gdb/testsuite/gdb.base/list-nodebug.exp index 942a282..e07fa9e 100644 --- a/gdb/testsuite/gdb.base/list-nodebug.exp +++ b/gdb/testsuite/gdb.base/list-nodebug.exp @@ -33,8 +33,8 @@ if {![runto_main]} { # Check that GDB doesn't crash when we use list . on an inferior with # no debug information -gdb_test "list ." "No debug.*" "first 'list .'" +gdb_test "list ." "Insufficient debug.*" "first 'list .'" # This should be called twice because the first list invocation since # printing a frame may take a different codepath, which wouldn't # trigger the crash. -gdb_test "list ." "No debug.*" "second 'list .'" +gdb_test "list ." "Insufficient debug.*" "second 'list .'" |