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 E06D33858C41 for ; Tue, 20 Jun 2023 12:37:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E06D33858C41 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=1687264628; 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=UZ7KXxUMID7N2Ky0ce5wP88RaDGwWtlHaa6yuoSJius=; b=ZdKtH4/QtsqquD0vWBZAtle8s5C99nv+YCkb8j46gnXwXwxr+so5AKwsvVtcLAjQwUXRHu fAnibuzCT1Px/7FbAKFJB2vg6gobbclUDUrQzuU5QqexXgcjcS6duYJnHwKvBXLwxaEBuY N8BzPJCxH+qqqNoxmj3WGfWmO91hs4A= 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-391-pE45YqQcMwmc8iJSoO3Fzw-1; Tue, 20 Jun 2023 08:37:04 -0400 X-MC-Unique: pE45YqQcMwmc8iJSoO3Fzw-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 DF32F1006E28 for ; Tue, 20 Jun 2023 12:37:03 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.45.224.71]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 647EB425356; Tue, 20 Jun 2023 12:37:03 +0000 (UTC) From: Bruno Larsen To: gdb-patches@sourceware.org Cc: Bruno Larsen Subject: [PATCH 3/3] gdb/cli: add '.' as an argument for 'list' command Date: Tue, 20 Jun 2023 14:29:13 +0200 Message-Id: <20230620122910.2459069-4-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 List-Id: 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