From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id sJ+vFICdkWQJ+ggAWB0awg (envelope-from ) for ; Tue, 20 Jun 2023 08:37:20 -0400 Authentication-Results: simark.ca; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=Dwan8j6t; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 50D7B1E0BB; Tue, 20 Jun 2023 08:37:20 -0400 (EDT) Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 3EB4B1E0AC for ; Tue, 20 Jun 2023 08:37:18 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 890363858C78 for ; Tue, 20 Jun 2023 12:37:17 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 890363858C78 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1687264637; bh=c+r0ZO7+i8UZsBb5IZFZkdzQvD7NjSfJpwieObmjawI=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=Dwan8j6toiamXJd28INGHJJtWM+bEhxhrMHpE7C0tnkuJZQfbzyVYDhUqEUCghc1H J+igk6w1xxF4d+iFO6fMe8Ntj446e6nywN6rbuK2kuiBdDt3jxxKShSlJT6o3mR8NS NfLUVwDboqrLd089/q5G9VRcTn1b2HqxnnH0MT1I= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 195A8385842D for ; Tue, 20 Jun 2023 12:36:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 195A8385842D Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-623-2RDlYUpCNLOhbqgFKIt1LQ-1; Tue, 20 Jun 2023 08:36:41 -0400 X-MC-Unique: 2RDlYUpCNLOhbqgFKIt1LQ-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4BB25101A529 for ; Tue, 20 Jun 2023 12:36:41 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.45.224.71]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C4D60492C13; Tue, 20 Jun 2023 12:36:40 +0000 (UTC) To: gdb-patches@sourceware.org Cc: Bruno Larsen 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 Message-Id: <20230620122910.2459069-2-blarsen@redhat.com> In-Reply-To: <20230620122910.2459069-1-blarsen@redhat.com> References: <20230620122910.2459069-1-blarsen@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Spam-Status: No, score=-11.5 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Bruno Larsen via Gdb-patches Reply-To: Bruno Larsen Errors-To: gdb-patches-bounces+public-inbox=simark.ca@sourceware.org Sender: "Gdb-patches" 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