From: Bruno Larsen <blarsen@redhat.com>
To: gdb-patches@sourceware.org
Cc: Bruno Larsen <blarsen@redhat.com>
Subject: [PATCH 3/3] gdb/cli: add '.' as an argument for 'list' command
Date: Tue, 20 Jun 2023 14:29:13 +0200 [thread overview]
Message-ID: <20230620122910.2459069-4-blarsen@redhat.com> (raw)
In-Reply-To: <20230620122910.2459069-1-blarsen@redhat.com>
Currently, after the user has used the list command once, there is no
way to ask GDB to print the location where the inferior is stopped.
This commit adds a way to do that using '.' as a new argument for the
'list' command. If the inferior isn't running, the command throws an
error. The test gdb.base/list.exp was updated to test this new argument.
Because this necessitated having the inferior running and the test was
(seemingly unnecessarily) using printf in a non-essential way and it
would make the resulting log harder to read for no benefit, it was
replaced by a differen t statement.
---
gdb/NEWS | 3 +++
gdb/cli/cli-cmds.c | 26 ++++++++++++++++++++--
gdb/testsuite/gdb.base/list.exp | 38 +++++++++++++++++++++++++++++++++
gdb/testsuite/gdb.base/list1.c | 2 +-
4 files changed, 66 insertions(+), 3 deletions(-)
diff --git a/gdb/NEWS b/gdb/NEWS
index 48147f4f916..debe07847d2 100644
--- a/gdb/NEWS
+++ b/gdb/NEWS
@@ -83,6 +83,9 @@
erroring out, it will now warn the user that the end of file has been
reached and the default location.
+* The 'list' command now accepts '.' as a parameter, which tells GDB to
+ print the default location.
+
* New commands
maintenance print record-instruction [ N ]
diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c
index 5973aebfad3..a966142eaea 100644
--- a/gdb/cli/cli-cmds.c
+++ b/gdb/cli/cli-cmds.c
@@ -1232,14 +1232,14 @@ list_command (const char *arg, int from_tty)
const char *p;
/* Pull in the current default source line if necessary. */
- if (arg == NULL || ((arg[0] == '+' || arg[0] == '-') && arg[1] == '\0'))
+ 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)
+ if (get_first_line_listed () == 0 && (arg == nullptr || arg[0] != '.'))
{
list_around_line (arg, cursal);
}
@@ -1293,6 +1293,27 @@ list_command (const char *arg, int from_tty)
print_source_lines (cursal.symtab, range, 0);
}
+ /* "l *" lists the default location again. */
+ else if (arg[0] == '.')
+ {
+ try
+ {
+ /* Find the current line by getting the PC of the currently
+ selected frame, and finding the line associated to it. */
+ frame_info_ptr frame = get_selected_frame (nullptr);
+ CORE_ADDR curr_pc = get_frame_pc (frame);
+ cursal = find_pc_line (curr_pc, 0);
+ }
+ catch (const gdb_exception &e)
+ {
+ /* If there was an exception above, it means the inferior
+ is not running, so reset the current source location to
+ the default. */
+ error (_("Inferior is not running. No current location."));
+ }
+ list_around_line (arg, cursal);
+ }
+
return;
}
@@ -2800,6 +2821,7 @@ and send its output to SHELL_COMMAND."));
= add_com ("list", class_files, list_command, _("\
List specified function or line.\n\
With no argument, lists ten more lines after or around previous listing.\n\
+\"list .\" lists ten lines arond where the inferior is stopped.\n\
\"list -\" lists the ten lines before a previous ten-line listing.\n\
One argument specifies a line, and ten lines are listed around that line.\n\
Two arguments with comma between specify starting and ending lines to list.\n\
diff --git a/gdb/testsuite/gdb.base/list.exp b/gdb/testsuite/gdb.base/list.exp
index 35e099ebaff..f853a9b814d 100644
--- a/gdb/testsuite/gdb.base/list.exp
+++ b/gdb/testsuite/gdb.base/list.exp
@@ -400,6 +400,41 @@ proc test_list_invalid_args {} {
"second use of \"list +INVALID\""
}
+proc test_list_current_location {} {
+ global binfile
+ # If the first "list" command that GDB runs is "list ." GDB may be
+ # unable to recognize that the inferior isn't running, so we should
+ # reload the inferior to test that condition.
+ clean_restart
+ gdb_file_cmd ${binfile}
+
+ # Ensure that we are printing 10 lines
+ if {![set_listsize 10]} {
+ return
+ }
+
+ # First guarantee that GDB correctly identifies that the inferior
+ # isn't running.
+ gdb_test "list ." "Inferior is not running. No current location." \
+ "list . with inferior not running"
+
+ if {![runto_main]} {
+ warning "couldn't start inferior"
+ return
+ }
+
+ # Walk forward some lines
+ gdb_test "until 15" ".*15.*foo.*"
+
+ # Test that the correct location is printed and that
+ # using just "list" will print the following lines.
+ gdb_test "list ." ".*" "list current line after starting"
+ gdb_test "list" ".*" "confirm we are printing the following lines"
+
+ # Test that list . will reset to current location
+ gdb_test "list ." ".*" "list around current line again"
+}
+
clean_restart
gdb_file_cmd ${binfile}
@@ -519,4 +554,7 @@ test_list "list -" 10 2 "7-8" "5-6"
# the current line.
test_list "list -" 10 1 "7" "6"
+# Test printing the location where the inferior is stopped.
+test_list_current_location
+
remote_exec build "rm -f list0.h"
diff --git a/gdb/testsuite/gdb.base/list1.c b/gdb/testsuite/gdb.base/list1.c
index d694495c3fb..9297f958f46 100644
--- a/gdb/testsuite/gdb.base/list1.c
+++ b/gdb/testsuite/gdb.base/list1.c
@@ -7,7 +7,7 @@ void bar (int x)
-
- */
{
- printf ("%d\n", x);
+ x++;
long_line ();
}
--
2.40.1
next prev parent reply other threads:[~2023-06-20 12:37 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-20 12:29 [PATCH 0/3] Small changes to "list" command Bruno Larsen
2023-06-20 12:29 ` [PATCH 1/3] gdb/cli: Factor out code to list lines for the first time Bruno Larsen
2023-06-20 12:29 ` [PATCH 2/3] gdb/cli: Improve UX when using list with no args Bruno Larsen
2023-06-20 13:43 ` Eli Zaretskii
2023-06-20 13:46 ` Bruno Larsen
2023-06-20 13:48 ` Eli Zaretskii
2023-06-20 13:49 ` Bruno Larsen
2023-06-20 12:29 ` Bruno Larsen [this message]
2023-06-20 13:42 ` [PATCH 3/3] gdb/cli: add '.' as an argument for 'list' command Eli Zaretskii
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230620122910.2459069-4-blarsen@redhat.com \
--to=blarsen@redhat.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).