From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 4AF983858C74 for ; Tue, 20 Jun 2023 15:56:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4AF983858C74 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687276580; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=c+r0ZO7+i8UZsBb5IZFZkdzQvD7NjSfJpwieObmjawI=; b=OH7i8aR5bDUt9sds2YJekkM3gcMC61okTg/0yFXXEbAz2q3SSnxB6opfkuR5V9qPsIhn44 3+aV7Wm8gJq4AfFTnlf1aOlZnbz1aabAXqYvlC8PT/DYDUkqTCJmx1deFbh1N1F1LWdPUa G9i+wtZvSSa/UqrNwRABC4Gerfd9JEQ= 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-433-NpDjmbyyO-mUt_XEuBYk3A-1; Tue, 20 Jun 2023 11:56:18 -0400 X-MC-Unique: NpDjmbyyO-mUt_XEuBYk3A-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 07B9D90A907; Tue, 20 Jun 2023 15:56:02 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.45.224.71]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5C39E422B0; Tue, 20 Jun 2023 15:56:01 +0000 (UTC) From: Bruno Larsen To: gdb-patches@sourceware.org Cc: eliz@gnu.org, Bruno Larsen Subject: [PATCH v2 1/4] gdb/cli: Factor out code to list lines for the first time Date: Tue, 20 Jun 2023 17:52:57 +0200 Message-Id: <20230620155259.2476415-2-blarsen@redhat.com> In-Reply-To: <20230620155259.2476415-1-blarsen@redhat.com> References: <20230620155259.2476415-1-blarsen@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 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 List-Id: 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