From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id 6vFuDeFRlGSP1QoAWB0awg (envelope-from ) for ; Thu, 22 Jun 2023 09:51:29 -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=OPM1fp7h; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 2D7111E0BB; Thu, 22 Jun 2023 09:51:29 -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 1A4C81E0AC for ; Thu, 22 Jun 2023 09:51:27 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A870F3858D37 for ; Thu, 22 Jun 2023 13:51:26 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A870F3858D37 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1687441886; bh=hNAWqk0r/WDbU1LhvM+yZIuDsd9d7Mx579OMCB4snVA=; h=To:Cc:Subject:In-Reply-To:References:Date:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=OPM1fp7hj9iqO5ZGuXpfZWHNL5ThwcVb9cRdcfaA2WxNgkni8R1xXOwx7xWmXadAw I1WEzIe9In5or4heEK1YKkZUsVkWLSzxBtjAwmnRREs3f5BlKyWi9hNuQflOp7A7dn AFZeVJW/LB+U3O2rxxv9Yeru2kaClSzw3PdxGYNU= 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 239273858D37 for ; Thu, 22 Jun 2023 13:51:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 239273858D37 Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-167-3CPsItcaP3aequcn-hUzQA-1; Thu, 22 Jun 2023 09:51:04 -0400 X-MC-Unique: 3CPsItcaP3aequcn-hUzQA-1 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-31118de9a69so2833101f8f.2 for ; Thu, 22 Jun 2023 06:51:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687441863; x=1690033863; h=mime-version:message-id:date:references:in-reply-to:subject:cc:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=hNAWqk0r/WDbU1LhvM+yZIuDsd9d7Mx579OMCB4snVA=; b=a/JdIfJ353Hnw+MLDK52xWN6nNbcbhcYSZqqE8X0M2d6tfAcw27D1/qsrtZm/y4RdC Dl6n9XhP+qHTv/EjVt5CBk7etMO8NqyQKpMgR3H6UZPCOZGZ3Yl+ArX7m9yh2aIM++pJ CdjduoB356sTarkIYYl445f6zajodDJRbLI7b+BJUm72L7UKkZ5eBZ08Y4Pnho0CvClo PY8CXV0GAX2moN/UUHr8ph7taXwfyFeYQVGEYYZ2mJgrOUJvPTYEgJ9ZQ155/nwB273y cMBvqHaKDY0C9+jNaPehhi/eLU/L9jbj5Uo1pIk8ffllj5sGmOn+V58WeQIn8CemnlRn Nx6Q== X-Gm-Message-State: AC+VfDxkSHd2lKWraatENhjP4oCppVYNsT/5qjJ6efZHhTUSwonIl8N8 GmnNXi1eGxBIHZtAw24QWuN4nxCUG+RbuZMGBKe/2lkCsQ1ZNrpJ1OuG46GFcnck7G7Nt46jpa/ y61VAxDNIGBDwRAeeJlvYLcNFvvwbgIVU3pxdIzC8Mhg1O0MTrb8ikntF/Q5CEkpAKI8sFFvbCu BVnZqsuA== X-Received: by 2002:adf:f74f:0:b0:307:9b66:f512 with SMTP id z15-20020adff74f000000b003079b66f512mr14108993wrp.19.1687441862804; Thu, 22 Jun 2023 06:51:02 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4ul45qPqwLnusAOIdtK0dIXF0X1HGlEgVF+5XydNBE8lAZ4E5pvel8aJ/FmnB948wnWdDVwQ== X-Received: by 2002:adf:f74f:0:b0:307:9b66:f512 with SMTP id z15-20020adff74f000000b003079b66f512mr14108965wrp.19.1687441862252; Thu, 22 Jun 2023 06:51:02 -0700 (PDT) Received: from localhost (2.72.115.87.dyn.plus.net. [87.115.72.2]) by smtp.gmail.com with ESMTPSA id w7-20020a5d6807000000b003127741d7desm7109870wru.58.2023.06.22.06.51.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jun 2023 06:51:01 -0700 (PDT) To: Bruno Larsen via Gdb-patches , gdb-patches@sourceware.org Cc: Bruno Larsen , Eli Zaretskii Subject: Re: [PATCH v3 3/4] gdb/cli: add '.' as an argument for 'list' command In-Reply-To: <20230621104545.2530552-4-blarsen@redhat.com> References: <20230621104545.2530552-1-blarsen@redhat.com> <20230621104545.2530552-4-blarsen@redhat.com> Date: Thu, 22 Jun 2023 14:51:00 +0100 Message-ID: <875y7ftxkr.fsf@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain X-Spam-Status: No, score=-11.9 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, RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL, 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: Andrew Burgess via Gdb-patches Reply-To: Andrew Burgess Errors-To: gdb-patches-bounces+public-inbox=simark.ca@sourceware.org Sender: "Gdb-patches" Bruno Larsen via Gdb-patches writes: > 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. (gdb) list *$pc should do the job. > 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. If you start GDB with an executable, but don't start the executable, and then just 'list', GDB does list a location. Could 'list .' not just replicate this behaviour instead of throwing 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. > > Reviewed-By: Eli Zaretskii > --- > gdb/NEWS | 4 ++++ > gdb/cli/cli-cmds.c | 26 ++++++++++++++++++++-- > gdb/doc/gdb.texinfo | 5 +++++ > gdb/testsuite/gdb.base/list.exp | 38 +++++++++++++++++++++++++++++++++ > gdb/testsuite/gdb.base/list1.c | 2 +- > 5 files changed, 72 insertions(+), 3 deletions(-) > > diff --git a/gdb/NEWS b/gdb/NEWS > index 348e73dd15f..d3779c1e953 100644 > --- a/gdb/NEWS > +++ b/gdb/NEWS > @@ -85,6 +85,10 @@ > this purpose is the last solitary line printed, if there was one, > else the lines around the main function. > > +* The 'list' command now accepts '.' as an argument, which tells GDB to > + print the location where the inferior is stopped. If the inferior hasn't > + started yet, the command will error out. > + > * 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. */ Is 'l *' here a typo? Thanks, Andrew > + 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/doc/gdb.texinfo b/gdb/doc/gdb.texinfo > index 55010f69a1c..e4e374d138c 100644 > --- a/gdb/doc/gdb.texinfo > +++ b/gdb/doc/gdb.texinfo > @@ -9151,8 +9151,13 @@ it prints the lines around the function @code{main}. > > @item list - > Print lines just before the lines last printed. > + > +@item list . > +Print the lines surrounding the location that is where the inferior > +is stopped. > @end table > > + > @cindex @code{list}, how many lines to display > By default, @value{GDBN} prints ten source lines with any of these forms of > the @code{list} command. You can change this using @code{set listsize}: > 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