From: Bruno Larsen <blarsen@redhat.com>
To: gdb-patches@sourceware.org
Cc: Bruno Larsen <blarsen@redhat.com>
Subject: [PATCH 1/3] gdb/cli: Factor out code to list lines for the first time
Date: Tue, 20 Jun 2023 14:29:10 +0200 [thread overview]
Message-ID: <20230620122910.2459069-2-blarsen@redhat.com> (raw)
In-Reply-To: <20230620122910.2459069-1-blarsen@redhat.com>
A future patch will add more situations that caulcates "lines around a
certain point" to be printed using print_source_lines, and the logic
could be re-used. As a preparation for those commits, this one factors
out that part of the logic of the list command into its own function.
No functional changes are expected
---
gdb/cli/cli-cmds.c | 34 +++++++++++++++++++++-------------
1 file changed, 21 insertions(+), 13 deletions(-)
diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c
index 638c138e7cb..b0b9c08c2ec 100644
--- a/gdb/cli/cli-cmds.c
+++ b/gdb/cli/cli-cmds.c
@@ -1200,6 +1200,26 @@ pipe_command_completer (struct cmd_list_element *ignore,
we don't know how to complete. */
}
+/* Helper for the list_command function. Resets the location to be printed
+ to the line where the inferior is stopped, then prints the lines. */
+static void
+list_around_line (const char *arg, symtab_and_line cursal)
+{
+ int first;
+
+ first = std::max (cursal.line - get_lines_to_list () / 2, 1);
+
+ /* A small special case --- if listing backwards, and we
+ should list only one line, list the preceding line,
+ instead of the exact line we've just shown after e.g.,
+ stopping for a breakpoint. */
+ if (arg != NULL && arg[0] == '-'
+ && get_lines_to_list () == 1 && first > 1)
+ first -= 1;
+
+ print_source_lines (cursal.symtab, source_lines_range (first), 0);
+}
+
static void
list_command (const char *arg, int from_tty)
{
@@ -1221,19 +1241,7 @@ list_command (const char *arg, int from_tty)
source line, center the listing around that line. */
if (get_first_line_listed () == 0)
{
- int first;
-
- first = std::max (cursal.line - get_lines_to_list () / 2, 1);
-
- /* A small special case --- if listing backwards, and we
- should list only one line, list the preceding line,
- instead of the exact line we've just shown after e.g.,
- stopping for a breakpoint. */
- if (arg != NULL && arg[0] == '-'
- && get_lines_to_list () == 1 && first > 1)
- first -= 1;
-
- print_source_lines (cursal.symtab, source_lines_range (first), 0);
+ list_around_line (arg, cursal);
}
/* "l" or "l +" lists next ten lines. */
--
2.40.1
next prev parent reply other threads:[~2023-06-20 12:36 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 ` Bruno Larsen [this message]
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 ` [PATCH 3/3] gdb/cli: add '.' as an argument for 'list' command Bruno Larsen
2023-06-20 13:42 ` 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-2-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).