From patchwork Tue Mar 14 20:04:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 66390 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 58493385B530 for ; Tue, 14 Mar 2023 20:05:20 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 58493385B530 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1678824320; bh=f5c5w7V9UScwknM7yLt2TLNb4G39ZP3FWVMiPPQMJVo=; h=Date:Subject:References:In-Reply-To:To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=SrGdE65tL6ET90J2UC7ziZbpbjbTtkxb6rw0nYVpYanwkfDQJzbNafnvV0COXDlxt 3R08d8Gbs8KIaZPMtUXVleBTbZxGpslR9uHxDzl8OwHCd81KkpPKWnAhdkZzSCsHoj jYIpb/4SdrZ0ZPkyY8VOtxLPS0K7j4kP5RbTgUE4= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-il1-x12b.google.com (mail-il1-x12b.google.com [IPv6:2607:f8b0:4864:20::12b]) by sourceware.org (Postfix) with ESMTPS id 6ECC03858C1F for ; Tue, 14 Mar 2023 20:04:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6ECC03858C1F Received: by mail-il1-x12b.google.com with SMTP id bp11so3841396ilb.3 for ; Tue, 14 Mar 2023 13:04:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678824289; h=to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=f5c5w7V9UScwknM7yLt2TLNb4G39ZP3FWVMiPPQMJVo=; b=sow75BW42tr97kfWiuoEOsXe3jLOgg/QpIubIKTiSrrYG8He815sLBbGOicdW0WxEn 5LcC1hlUqxL5zbpeMlKZJNnBTiEC8R+0B+LJvrOGAiAHlI2t4i/yCKQw3dujJFppGvT8 1ekqvYNc1tw57WclY7cJsWuCIzz8cFJOnI0PUTdnR/uRMnDah+eBUNaU9vONSa4Kkvhn NNs0n9Nt8Tjp3eQPuZsnQuu7KHftpgBCamiVU/5WQJ7TM7UM/OzoOjXImSkRyy6mt+eC J/Cq0qqLdd54vQ/OZfU2KzDT2RGgdQe8/X1feRymRaXdnx30vB7fDSv/w36zS/LgVrb4 AXXg== X-Gm-Message-State: AO0yUKUJ6fD2ZTb1cimJM/P2gI4Oash1K4j3+usUCwM9Zkx68zzq8Na4 20J7NaccnDlq/mF+7c10OpwwYOkP+PIxRSxjUig= X-Google-Smtp-Source: AK7set+CLpXG6/rn1MPeYOP5LyzS8CJlXsxaZCfISNHC78W32KDZgDPopw6UPG/X36f4Bt00q+fCCQ== X-Received: by 2002:a05:6e02:d46:b0:317:6ead:2e4e with SMTP id h6-20020a056e020d4600b003176ead2e4emr3131583ilj.5.1678824289611; Tue, 14 Mar 2023 13:04:49 -0700 (PDT) Received: from localhost.localdomain (71-211-185-113.hlrn.qwest.net. [71.211.185.113]) by smtp.gmail.com with ESMTPSA id m13-20020a056638224d00b003ee9720740esm1030257jas.153.2023.03.14.13.04.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Mar 2023 13:04:49 -0700 (PDT) Date: Tue, 14 Mar 2023 14:04:48 -0600 Subject: [PATCH 4/5] Introduce symbol_block_ops::get_block_value MIME-Version: 1.0 Message-Id: <20230314-submit-pragma-import-export-v1-4-a235709f7e96@adacore.com> References: <20230314-submit-pragma-import-export-v1-0-a235709f7e96@adacore.com> In-Reply-To: <20230314-submit-pragma-import-export-v1-0-a235709f7e96@adacore.com> To: gdb-patches@sourceware.org X-Mailer: b4 0.12.1 X-Spam-Status: No, score=-10.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_STOCKGEN, 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: , X-Patchwork-Original-From: Tom Tromey via Gdb-patches From: Tom Tromey Reply-To: Tom Tromey Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" This adds a new callback to symbol_block_ops. This callback lets a LOC_BLOCK symbol implement its own function to find the underlying block. --- gdb/symtab.c | 3 ++- gdb/symtab.h | 9 +++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/gdb/symtab.c b/gdb/symtab.c index 57ba61c2c05..237b3ff794f 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -6391,7 +6391,8 @@ register_symbol_block_impl (enum address_class aclass, /* Sanity check OPS. */ gdb_assert (ops != NULL); - gdb_assert (ops->find_frame_base_location != NULL); + gdb_assert (ops->find_frame_base_location != nullptr + || ops->get_block_value != nullptr); return result; } diff --git a/gdb/symtab.h b/gdb/symtab.h index 0a42fd2380c..ea3cf395f26 100644 --- a/gdb/symtab.h +++ b/gdb/symtab.h @@ -1149,6 +1149,12 @@ struct symbol_block_ops the corresponding DW_AT_frame_base attribute. */ CORE_ADDR (*get_frame_base) (struct symbol *framefunc, frame_info_ptr frame); + + /* Return the block for this function. So far, this is used to + implement function aliases. So, if this is set, then it's not + necessary to set the other functions in this structure; and vice + versa. */ + const block *(*get_block_value) (const struct symbol *sym); }; /* Functions used with LOC_REGISTER and LOC_REGPARM_ADDR. */ @@ -1507,6 +1513,9 @@ struct block_symbol inline const block * symbol::value_block () const { + if (SYMBOL_BLOCK_OPS (this) != nullptr + && SYMBOL_BLOCK_OPS (this)->get_block_value != nullptr) + return SYMBOL_BLOCK_OPS (this)->get_block_value (this); return m_value.block; }