From patchwork Tue Mar 28 18:48:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Maciej W. Rozycki" X-Patchwork-Id: 67045 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 329BE3857C48 for ; Tue, 28 Mar 2023 18:48:29 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-ed1-x52e.google.com (mail-ed1-x52e.google.com [IPv6:2a00:1450:4864:20::52e]) by sourceware.org (Postfix) with ESMTPS id 6CC4C3858C53 for ; Tue, 28 Mar 2023 18:48:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6CC4C3858C53 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=embecosm.com Received: by mail-ed1-x52e.google.com with SMTP id h8so53647950ede.8 for ; Tue, 28 Mar 2023 11:48:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; t=1680029291; h=mime-version:user-agent:references:message-id:in-reply-to:subject :cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=+bo3UDTGWEvfsB0FsfzpD+hb9cs8YcHwK/gnCdi5SRM=; b=E+rg7OpPVnIm1ymWEWrH0zooLK+8eLOiDHissLPZW50QwNZW/8sOTaCZr/f0oxI0Mm zFGU+wpAJWPPUmEck0LurG627Dy3i+1FJt/MnChwL7Gw6mPjNtSu6wkGaAImiBrbcGZA b74hxUPd/+vKAiKc2bg5B2vZaXyCTKP5BWDf9g5xUUbmfVyCSbixdb4ekTTGJ4O2ft+A fqPYs3VYm1b3lAv/Lr9gJN+ADNYlmJlR5bqRfbAw1cBhM1zH0qlTiszvNs0YRYedrdFs TzIcz8Eb+lmRyzGWqgGwzd8cARcT0EZb7VjEY5JcAFRlE5nrXJzR61+hl2Vu7XLluqa7 FSzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680029291; h=mime-version:user-agent:references:message-id:in-reply-to:subject :cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=+bo3UDTGWEvfsB0FsfzpD+hb9cs8YcHwK/gnCdi5SRM=; b=LePmUaca9jAYcXTHf4mdot0dpF3eg9ElHhCeFTVNaO6Au0alSb5Vmq+zkfVB0ZyjI3 WEb5sQEBrAQ+g8S7RHEacWeM3DLQP1vcm/rn6qpJcgjwTW3PbxsopoYo4mVq46BM+HcG T7uV47e/b/QxhHbBJ8qXewMNigSDnzVv8ZneIrWVo5jiRgEGo1kgla3Ak9cUEuQwr0G0 ulydzh+11WPKmZuo0qXMoSjH8zBCyv6/2qAJ4sMPHgvOfEYKPTh/AKIShl9o6G7SyNPz l+VyssqR2Z2bEwKPRuP60oDXuJe6su6tkxf5R0F1KJHKjJFTsoXRLZ1v8NyZu4yEG7Jd 7Xog== X-Gm-Message-State: AAQBX9cq4f8MU1ek4PBOZyY8q7MMeqaN6tUmH49T/v43gnTxKCWvkKRG AI5LMWXK/8XSJoFsJ0ELgPFFnnaCDw0/XsohLBs= X-Google-Smtp-Source: AKy350Zq4Y5g8MHgEri1ll51xWN4+pbkFEkq92ysmB/SJPW5rLJaZqAjWFB9S92iYNbf6okN+xsKfA== X-Received: by 2002:a17:906:7090:b0:885:a62c:5a5c with SMTP id b16-20020a170906709000b00885a62c5a5cmr16409628ejk.46.1680029291679; Tue, 28 Mar 2023 11:48:11 -0700 (PDT) Received: from annie.orcam.me.uk (annie.orcam.me.uk. [2001:4190:8020::48]) by smtp.gmail.com with ESMTPSA id g13-20020a170906198d00b008c16025b318sm15527715ejd.155.2023.03.28.11.48.10 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Mar 2023 11:48:11 -0700 (PDT) Date: Tue, 28 Mar 2023 19:48:09 +0100 (BST) From: "Maciej W. Rozycki" To: gdb-patches@sourceware.org cc: Richard Bunt Subject: [PATCH v2 1/3] GDB: Favor full symbol main name for backtrace stop In-Reply-To: Message-ID: References: User-Agent: Alpine 2.20 (DEB 67 2015-01-07) MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, KAM_ASCII_DIVIDERS, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=no 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: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" From: Richard Bunt In the case where a Fortran program has a program name of "main" and there is also a minimal symbol called main, such as with programs built with GCC version 4.4.7 or below, the backtrace will erroneously stop at the minimal symbol rather than the user specified main, e.g.: (gdb) bt #0 bar () at .../gdb/testsuite/gdb.fortran/backtrace.f90:17 #1 0x0000000000402556 in foo () at .../gdb/testsuite/gdb.fortran/backtrace.f90:21 #2 0x0000000000402575 in main () at .../gdb/testsuite/gdb.fortran/backtrace.f90:31 #3 0x00000000004025aa in main () (gdb) This patch fixes this issue by increasing the precedence of the full symbol when the language of the current frame is Fortran. Newer versions of GCC transform the program name to "MAIN__" in this case, avoiding the problem. Co-Authored-By: Maciej W. Rozycki --- Changes from v1: - Remove testsuite status mistakenly copied to the change description. --- gdb/frame.c | 25 ++++++++++++--------- gdb/testsuite/gdb.fortran/backtrace.exp | 38 ++++++++++++++++++++++++++++++++ gdb/testsuite/gdb.fortran/backtrace.f90 | 32 ++++++++++++++++++++++++++ 3 files changed, 85 insertions(+), 10 deletions(-) gdb-richard-favour-full-symbol-main-name-for-backtrace-stop.diff Index: src/gdb/frame.c =================================================================== --- src.orig/gdb/frame.c +++ src/gdb/frame.c @@ -2542,29 +2542,34 @@ inside_main_func (frame_info_ptr this_fr bound_minimal_symbol msymbol = lookup_minimal_symbol (name, NULL, current_program_space->symfile_object_file); - if (msymbol.minsym == nullptr) + + if (msymbol.minsym != nullptr) + sym_addr = msymbol.value_address (); + + /* Favor a full symbol in Fortran, for the case where the Fortran main + is also called "main". */ + if (msymbol.minsym == nullptr + || get_frame_language (this_frame) == language_fortran) { /* In some language (for example Fortran) there will be no minimal symbol with the name of the main function. In this case we should search the full symbols to see if we can find a match. */ struct block_symbol bs = lookup_symbol (name, NULL, VAR_DOMAIN, 0); - if (bs.symbol == nullptr) - return false; /* We might have found some unrelated symbol. For example, the Rust compiler can emit both a subprogram and a namespace with the same name in the same scope; and due to how gdb's symbol tables currently work, we can't request the one we'd prefer. */ - if (bs.symbol->aclass () != LOC_BLOCK) + if (bs.symbol != nullptr && bs.symbol->aclass () == LOC_BLOCK) + { + const struct block *block = bs.symbol->value_block (); + gdb_assert (block != nullptr); + sym_addr = block->start (); + } + else if (msymbol.minsym == nullptr) return false; - - const struct block *block = bs.symbol->value_block (); - gdb_assert (block != nullptr); - sym_addr = block->start (); } - else - sym_addr = msymbol.value_address (); /* Convert any function descriptor addresses into the actual function code address. */ Index: src/gdb/testsuite/gdb.fortran/backtrace.exp =================================================================== --- /dev/null +++ src/gdb/testsuite/gdb.fortran/backtrace.exp @@ -0,0 +1,38 @@ +# Copyright 2023 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +require allow_fortran_tests + +load_lib fortran.exp + +standard_testfile .f90 + +if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug f90}]} { + return -1 +} + +if {![fortran_runto_main]} { + perror "Could not run to main." + return +} + +gdb_breakpoint [gdb_get_line_number "Break here"] +gdb_continue_to_breakpoint "continue to bar" + +gdb_test "bt" \ + [multi_line \ + "#0\[ \t\]*bar \\(\\) at \[^\r\n\]+" \ + "#1\[ \t\]*$hex in foo \\(\\) at \[^\r\n\]+" \ + "#2\[ \t\]*$hex in \(?:MAIN__\|main\) \\(\\) at \[^\r\n\]+" ] Index: src/gdb/testsuite/gdb.fortran/backtrace.f90 =================================================================== --- /dev/null +++ src/gdb/testsuite/gdb.fortran/backtrace.f90 @@ -0,0 +1,32 @@ +! Copyright 2023 Free Software Foundation, Inc. +! +! This program is free software; you can redistribute it and/or modify +! it under the terms of the GNU General Public License as published by +! the Free Software Foundation; either version 3 of the License, or +! (at your option) any later version. +! +! This program is distributed in the hope that it will be useful, +! but WITHOUT ANY WARRANTY; without even the implied warranty of +! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +! GNU General Public License for more details. +! +! You should have received a copy of the GNU General Public License +! along with this program. If not, see . + +subroutine bar () + return ! Break here +end subroutine bar + +subroutine foo () + call bar () +end subroutine foo + +program main + interface + subroutine bar () + end subroutine bar + subroutine foo () + end subroutine foo + end interface + call foo () +end program main From patchwork Tue Mar 28 18:48:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Maciej W. Rozycki" X-Patchwork-Id: 67046 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5763F3858C20 for ; Tue, 28 Mar 2023 18:48:59 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [IPv6:2a00:1450:4864:20::52a]) by sourceware.org (Postfix) with ESMTPS id B95B13858D39 for ; Tue, 28 Mar 2023 18:48:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B95B13858D39 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=embecosm.com Received: by mail-ed1-x52a.google.com with SMTP id eg48so53566571edb.13 for ; Tue, 28 Mar 2023 11:48:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; t=1680029324; h=mime-version:user-agent:references:message-id:in-reply-to:subject :cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=lmJiqk9+WEcMfHlaRm3nWLHLSVvlCGLUOgSkQQTaVVQ=; b=K9bY7PkGOOoRwpTtE3O8dizkUuDii51Tz8WdW/0z45upwiWVhLuciaPkuo0kNC8qds uzUZjUTvIUCbAKl3zzrEem3gDVC8jQCPs8oeBGvmi7wqenAQHZxigLz0rywkNJoA3xBd FbSvE0ugvrU0OtjDVvwoAj20eAofdimtiV7+9RAtisAMbPYxV61sVzzZE3tXJqNdapai pqSSI+utOCdQ99BdRWez1U2giyNAn+r0Da8gZDN724eJzm+nKLKyvWxdhzoUb9dga6Ec iwTtEMk98lodTy22y/Qo1OH1gIeJbpOLc0MC5vMZIJOyeK1TzfkFMYmnlb6yaOhsBW64 6o6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680029324; h=mime-version:user-agent:references:message-id:in-reply-to:subject :cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=lmJiqk9+WEcMfHlaRm3nWLHLSVvlCGLUOgSkQQTaVVQ=; b=Jy8hfl91S5+ZstjYQraiKazCnSE3mM1H6nL62db43+Pt9QReGvokOMllVc1ECoFYnr XYS1x2WClXJvkbWPkH/0Nov4k6YTWw42aRW1IvnGtuQtADVqpHSKawiunZbRFd2aSCnU RxHEAPjwaoQAxhApOvtD2iwAW4PadNw+2/RT125fuwZvlkcIc/+KNyXjgG5aLrrJ9n9y w0WsiLyhC0KMxZIXEOWHBrJ3d6Y7YQAEpeE31csYh7Zh8ath1pp7nG5KxmuuCO4Knxxm hQ4PBoGbUpiUGWtuh245jj2T9B0otUBUERtbqZgcjNKfSHpsvUQNAGI2hJnZ1gfgQhbL 2olg== X-Gm-Message-State: AAQBX9fZONfSoGj6ca2TN43Whzt629x/jqOC5E4/GPFF5SUAqjgLUKF3 PdmBSu1I/8fe5+Ep9vYfF1HgvWNiOkIQXDBn9ww= X-Google-Smtp-Source: AKy350azGq+l8VNYkuAr3CwBz90S+lVFHI3Q4gDSGsnZ/0cqiYiEbL8Cxwe3lGEIXTRND2tCs1kNgw== X-Received: by 2002:a17:906:5a81:b0:92e:fcc9:aa22 with SMTP id l1-20020a1709065a8100b0092efcc9aa22mr15977755ejq.37.1680029324173; Tue, 28 Mar 2023 11:48:44 -0700 (PDT) Received: from annie.orcam.me.uk (annie.orcam.me.uk. [2001:4190:8020::48]) by smtp.gmail.com with ESMTPSA id u7-20020a170906b10700b0092f38a6d082sm15498946ejy.209.2023.03.28.11.48.43 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Mar 2023 11:48:43 -0700 (PDT) Date: Tue, 28 Mar 2023 19:48:42 +0100 (BST) From: "Maciej W. Rozycki" To: gdb-patches@sourceware.org cc: Richard Bunt Subject: [PATCH v2 2/3] GDB: Bring back the handling of DW_CC_program In-Reply-To: Message-ID: References: User-Agent: Alpine 2.20 (DEB 67 2015-01-07) MIME-Version: 1.0 X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP 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: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" Fix a functional regression and restore the handling of DW_CC_program code of DW_AT_calling_convention attribute for determining the name of the starting function of the program where the DW_AT_main_subprogram attribute has not been provided, such as with Fortran code compiled with GCC versions 4.5.4 and below, or where DWARF version 3 or below has been requested. Without it "main" is considered the starting function. Cf. GCC PR fortran/43414. Original code was removed with commit 6209cde4ddb8 ("Delete DWARF psymtab code"), and then an update to complement commit 81873cc81eff ("[gdb/symtab] Support DW_AT_main_subprogram with -readnow.") has also been included here. --- NB this was discovered with and is covered by the test case included with 3/3; it has been verified to trigger with GCC 4.4.7 and will likely also with other configurations. No change from v1. --- gdb/dwarf2/read.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) Index: src/gdb/dwarf2/read.c =================================================================== --- src.orig/gdb/dwarf2/read.c +++ src/gdb/dwarf2/read.c @@ -9994,6 +9994,18 @@ inherit_abstract_dies (struct die_info * compute_delayed_physnames (origin_cu); } +/* Return TRUE if the given DIE is the program's "main". */ + +static bool +dwarf2_func_is_main_p (struct die_info *die, struct dwarf2_cu *cu) +{ + if (dwarf2_flag_true_p (die, DW_AT_main_subprogram, cu)) + return true; + struct attribute *attr = dwarf2_attr (die, DW_AT_calling_convention, cu); + return (attr != nullptr + && attr->constant_value (DW_CC_normal) == DW_CC_program); +} + static void read_func_scope (struct die_info *die, struct dwarf2_cu *cu) { @@ -10084,7 +10096,7 @@ read_func_scope (struct die_info *die, s newobj = cu->get_builder ()->push_context (0, lowpc); newobj->name = new_symbol (die, read_type_die (die, cu), cu, templ_func); - if (dwarf2_flag_true_p (die, DW_AT_main_subprogram, cu)) + if (dwarf2_func_is_main_p (die, cu)) set_objfile_main_name (objfile, newobj->name->linkage_name (), cu->lang ()); @@ -16141,6 +16153,11 @@ cooked_indexer::scan_attributes (dwarf2_ *flags |= IS_MAIN; break; + case DW_AT_calling_convention: + if (attr.constant_value (DW_CC_normal) == DW_CC_program) + *flags |= IS_MAIN; + break; + case DW_AT_declaration: is_declaration = attr.as_boolean (); break; From patchwork Tue Mar 28 18:49:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Maciej W. Rozycki" X-Patchwork-Id: 67047 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 3761C3858D39 for ; Tue, 28 Mar 2023 18:49:22 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-ed1-x533.google.com (mail-ed1-x533.google.com [IPv6:2a00:1450:4864:20::533]) by sourceware.org (Postfix) with ESMTPS id 7AEC33858D39 for ; Tue, 28 Mar 2023 18:49:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7AEC33858D39 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=embecosm.com Received: by mail-ed1-x533.google.com with SMTP id cn12so53706046edb.4 for ; Tue, 28 Mar 2023 11:49:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; t=1680029344; h=mime-version:user-agent:references:message-id:in-reply-to:subject :cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=LV5Tfw3OPBF02vmGFyCYjwz1pxGo+akho0afyJCa6aI=; b=DIF6TPfff0j2YNl0wVFBc55mGU8fOG/rnYM0hbp/SYTbW8HfJiahNwHhYOktZlIgiO qyQ7m0f8JOkhU5hxc59qxLtiRnmSLoUB2jTq5V+K09Uce3Bu74kkgIi9nPR7AlGkMXza RoHwOvS8wULmcitIzy5lrUf/QDd1gUw3fNLeq0eCcQ+WF4C6C8ClPcPkzYdJTGK3Ut5Q tqSI2wSr4Qy21APx3XvazhhLC8VIvq0qbU6+ZiAhzyKbaY2N4RY12QRFknnsUyT5jopP tOvP/ziN32CJxzkPy5FVoJiFCEagvFrSnh3FalZenDadmIfsETGAgIaDa21QuqKMWy9F ud+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680029344; h=mime-version:user-agent:references:message-id:in-reply-to:subject :cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=LV5Tfw3OPBF02vmGFyCYjwz1pxGo+akho0afyJCa6aI=; b=XvsqYi2qSi9PhI44wqnwrB8TMmZGEOHo6QKu2Fke/TGhRwebeO429IUv/ZeFPkcTmG y0MvZQI0jzjWS4eO7CwnAh24dirlnAEGSJNbaCPZ9nz6iBOxPO/iJR7MtS2aoyzuWTD0 QtkYEGbSzPPoXYSwCdEGQdUzt6JN0cXn49/0YyIeydw5vXIYC8m6wSDkMxi7D3AsfB5U rSOFnwZrjd+ma5RGYTgHLwOolCz9TWO1XFZ08/OtaXhJifVbfrFtR8y79TJAycEk8Jv+ Bp9Lew40586V+1lGIoOpiE75fHsSOe6jkry4n+irjeUQtJvQbKjHFpevih7A0sl9eASu JUZg== X-Gm-Message-State: AAQBX9euaXQQiJEz+Axsdv13hgjcT6XUWJKeM2+Y4V32b73j2jCR5axI StnVt7yMyjZ0wMTFVuvAZhjUyFlfieyxSv94Lnk= X-Google-Smtp-Source: AKy350b8bcNAwZQf3j71mGa8+8lTKyiJXt5AplpKLFKvLrgHVDSlMMC8WrW3A+1RDpMR8hPyRBHf4g== X-Received: by 2002:a17:906:cd19:b0:929:e782:d98e with SMTP id oz25-20020a170906cd1900b00929e782d98emr16715395ejb.17.1680029344085; Tue, 28 Mar 2023 11:49:04 -0700 (PDT) Received: from annie.orcam.me.uk (annie.orcam.me.uk. [2001:4190:8020::48]) by smtp.gmail.com with ESMTPSA id v2-20020a1709064e8200b008d9ddd2da88sm15544127eju.6.2023.03.28.11.49.03 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Mar 2023 11:49:03 -0700 (PDT) Date: Tue, 28 Mar 2023 19:49:02 +0100 (BST) From: "Maciej W. Rozycki" To: gdb-patches@sourceware.org cc: Richard Bunt Subject: [PATCH v2 3/3] GDB: Add `info main' command In-Reply-To: Message-ID: References: User-Agent: Alpine 2.20 (DEB 67 2015-01-07) MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, KAM_ASCII_DIVIDERS, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=no 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: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" From: Richard Bunt Allow consumers of GDB to extract the name of the main method. This is most useful for Fortran programs which have a variable main method. Used by both MAP and DDT e.g. it is used to detect the presence of debug information. Co-Authored-By: Maciej W. Rozycki Reviewed-By: Eli Zaretskii --- Changes from v1: - Add documentation pieces. --- gdb/NEWS | 3 ++ gdb/doc/gdb.texinfo | 6 ++++ gdb/symtab.c | 11 ++++++++ gdb/testsuite/gdb.fortran/info-main.exp | 42 ++++++++++++++++++++++++++++++++ gdb/testsuite/gdb.fortran/info-main.f90 | 19 ++++++++++++++ 5 files changed, 81 insertions(+) gdb-richard-info-main-command.diff Index: src/gdb/NEWS =================================================================== --- src.orig/gdb/NEWS +++ src/gdb/NEWS @@ -83,6 +83,9 @@ show always-read-ctf When off, CTF is only read if DWARF is not present. When on, CTF is read regardless of whether DWARF is present. Off by default. +info main + Get main symbol to identify entry point into program. + * New convenience function "$_shell", to execute a shell command and return the result. This lets you run shell commands in expressions. Some examples: Index: src/gdb/doc/gdb.texinfo =================================================================== --- src.orig/gdb/doc/gdb.texinfo +++ src/gdb/doc/gdb.texinfo @@ -20162,6 +20162,12 @@ The optional flag @samp{-q}, which stand printing header information and messages explaining why no functions or variables have been printed. +@kindex info main +@item info main +Print the name of the starting function of the program. This serves +primarily Fortran programs, which have a user-supplied name for the +main subroutine. + @kindex info classes @cindex Objective-C, classes and selectors @item info classes Index: src/gdb/symtab.c =================================================================== --- src.orig/gdb/symtab.c +++ src/gdb/symtab.c @@ -5282,6 +5282,14 @@ info_modules_command (const char *args, from_tty); } +/* Implement the 'info main' command. */ + +static void +info_main_command (const char *args, int from_tty) +{ + gdb_printf ("%s\n", main_name ()); +} + static void rbreak_command (const char *regexp, int from_tty) { @@ -6873,6 +6881,9 @@ Options:\n\ _("All module names, or those matching REGEXP.")); set_cmd_completer_handle_brkchars (c, info_types_command_completer); + add_info ("main", info_main_command, + _("Get main symbol to identify entry point into program.")); + add_basic_prefix_cmd ("module", class_info, _("\ Print information about modules."), &info_module_cmdlist, 0, &infolist); Index: src/gdb/testsuite/gdb.fortran/info-main.exp =================================================================== --- /dev/null +++ src/gdb/testsuite/gdb.fortran/info-main.exp @@ -0,0 +1,42 @@ +# Copyright 2023 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +require allow_fortran_tests + +load_lib fortran.exp + +standard_testfile .f90 + +set old_gdbflags $GDBFLAGS +set GDBFLAGS [string map {"-readnow" ""} "$GDBFLAGS"] + +if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug f90}]} { + return -1 +} + +gdb_test "info main" "simple" "info main prior to start" + +if ![fortran_runto_main] { + untested "could not run to main" + return -1 +} + +gdb_test "info main" "simple" "info main post start" + +set GDBFLAGS "$GDBFLAGS -readnow" +clean_restart $testfile +gdb_test "info main" "simple" "info main with readnow" + +set GDBFLAGS $old_gdbflags Index: src/gdb/testsuite/gdb.fortran/info-main.f90 =================================================================== --- /dev/null +++ src/gdb/testsuite/gdb.fortran/info-main.f90 @@ -0,0 +1,19 @@ +! Copyright 2023 Free Software Foundation, Inc. +! +! This program is free software; you can redistribute it and/or modify +! it under the terms of the GNU General Public License as published by +! the Free Software Foundation; either version 3 of the License, or +! (at your option) any later version. +! +! This program is distributed in the hope that it will be useful, +! but WITHOUT ANY WARRANTY; without even the implied warranty of +! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +! GNU General Public License for more details. +! +! You should have received a copy of the GNU General Public License +! along with this program. If not, see . + +program simple + implicit none + print *, "Nothing." +end program simple