From: Bruno Larsen <blarsen@redhat.com>
To: gdb-patches@sourceware.org
Cc: Bruno Larsen <blarsen@redhat.com>
Subject: [PATCH v4 1/4] gdb/cli: Factor out code to list lines around a given line
Date: Thu, 13 Jul 2023 12:24:08 +0200 [thread overview]
Message-ID: <20230713102411.2279542-2-blarsen@redhat.com> (raw)
In-Reply-To: <20230713102411.2279542-1-blarsen@redhat.com>
A future patch will add more situations that calculates "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 | 36 +++++++++++++++++++++++-------------
1 file changed, 23 insertions(+), 13 deletions(-)
diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c
index 638c138e7cb..00977bc2ee3 100644
--- a/gdb/cli/cli-cmds.c
+++ b/gdb/cli/cli-cmds.c
@@ -1200,6 +1200,28 @@ pipe_command_completer (struct cmd_list_element *ignore,
we don't know how to complete. */
}
+/* Helper for the list_command function. Prints the lines around (and
+ including) line stored in CURSAL. ARG contains the arguments used in
+ the command invocation, and is used to determine a special case when
+ printing backwards. */
+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 +1243,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.41.0
next prev parent reply other threads:[~2023-07-13 10:24 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-13 10:24 [PATCH v4 0/4] Small changes to "list" command Bruno Larsen
2023-07-13 10:24 ` Bruno Larsen [this message]
2023-07-13 16:53 ` [PATCH v4 1/4] gdb/cli: Factor out code to list lines around a given line Tom Tromey
2023-07-13 10:24 ` [PATCH v4 2/4] gdb/cli: add '.' as an argument for 'list' command Bruno Larsen
2023-07-13 11:05 ` Eli Zaretskii
2023-07-13 16:53 ` Tom Tromey
2023-07-14 17:50 ` Pedro Alves
2023-07-17 8:21 ` Bruno Larsen
2023-07-17 8:44 ` Andrew Burgess
2023-07-17 14:14 ` Pedro Alves
2023-07-18 11:21 ` [PATCH] gdb/cli: fixes to newly added "list ." command Bruno Larsen
2023-07-18 12:54 ` Eli Zaretskii
2023-07-18 13:40 ` Bruno Larsen
2023-07-18 16:17 ` Eli Zaretskii
2023-07-18 13:43 ` Pedro Alves
2023-07-18 14:55 ` Bruno Larsen
2023-07-21 10:26 ` [PATCH v2] " Bruno Larsen
2023-07-21 11:05 ` Eli Zaretskii
2023-08-04 8:37 ` [PING][PATCH " Bruno Larsen
2023-08-23 10:03 ` [PINGv2][PATCH " Guinevere Larsen
2023-08-23 15:00 ` [PATCH " Andrew Burgess
2023-08-28 15:50 ` [PATCH v3] " Guinevere Larsen
2023-09-14 13:00 ` [PING][PATCH " Guinevere Larsen
2023-09-18 13:16 ` [PATCH " Andrew Burgess
2023-09-19 9:06 ` [PATCH v4] " Guinevere Larsen
2023-09-19 11:27 ` Eli Zaretskii
2023-09-19 12:07 ` Guinevere Larsen
2023-07-13 10:24 ` [PATCH v4 3/4] gdb/cli: Improve UX when using list with no args Bruno Larsen
2023-07-13 11:06 ` Eli Zaretskii
2023-07-13 17:41 ` Keith Seitz
2023-07-13 10:24 ` [PATCH v4 4/4] gdb/doc: document '+' argument for 'list' command Bruno Larsen
2023-07-13 17:35 ` Keith Seitz
2023-07-13 21:30 ` Matt Rice
2023-07-14 8:53 ` Bruno Larsen
2023-07-14 16:30 ` Tom Tromey
2023-07-14 21:30 ` Matt Rice
2023-07-13 17:31 ` [PATCH v4 0/4] Small changes to "list" command Tom Tromey
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=20230713102411.2279542-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).