From patchwork Mon Sep 18 14:52:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 76290 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 6B7403858426 for ; Mon, 18 Sep 2023 14:53:13 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6B7403858426 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1695048793; bh=AJF3nIhEiE1zeXXDLLiy8QS55W+mp+1OYnWofN0jiJY=; h=Date:Subject:References:In-Reply-To:To:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=aC6SPjeVKpQKaOiHljMukwVCDkXmPtVyjIet/g3M/BuOKvmBZ/aum9/lnhr/Aah3+ A7dEy9SLT92JHpoToGRbGRmMcP2GnvOM47iq/sCj0TfmvwwuUB4Np3PIFjfDpkYu1D 7qIgiyixO7z8hfTTuY7gMQX5XzocaQwzJG44pOsY= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-il1-x12d.google.com (mail-il1-x12d.google.com [IPv6:2607:f8b0:4864:20::12d]) by sourceware.org (Postfix) with ESMTPS id C10F63858C78 for ; Mon, 18 Sep 2023 14:52:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C10F63858C78 Received: by mail-il1-x12d.google.com with SMTP id e9e14a558f8ab-34fcc3ac97bso9184965ab.0 for ; Mon, 18 Sep 2023 07:52:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695048768; x=1695653568; h=cc: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=AJF3nIhEiE1zeXXDLLiy8QS55W+mp+1OYnWofN0jiJY=; b=dRmovfbcNAMjEk2D5xcJyYwnfhB1MG9CDmu6NahYVDgTm7zlOzSCVEoq7T+YoF2f2C NSYJAlfN3sXM0MBm/ltTgixFxQVtEDhW6oQtXoAPNeK6rJdrN75fGKu+vFzghNP7cWsB lF1TB+VDmrFrCdhYnvttRhwteE8m7lQrpc2N3yESL5m6lfsrJ5H97J6Ya6TsEABaRQ6C PgQJFRtaTnngkqNg1VGZ8me5eA95E103VcKBPLXtgJUGEUiHzbd10W8+8nPC9MtCgIqS K6imAVVCsWF+OAyKIcCryHekoCM6UKjG5wDC89QXydroemb6XXYTknLnNZNBWr5Qj99x wphQ== X-Gm-Message-State: AOJu0Yw6aoUK9skGolkUUyQjpb/3XJ4DVWXZg5lb2yXXWbp5WrZh1JFD bxLTszPuVfowiIStzEj8tXImDx0gr2QdyZZVQyh79w== X-Google-Smtp-Source: AGHT+IFRaduf4cdhbqw6bv/Ym5jMmw3/AdjYQdWylrlrWFFWIaA27ZACKhiLUnX+WbHZkw7msWCHCw== X-Received: by 2002:a05:6e02:e01:b0:34f:bd1f:54f2 with SMTP id a1-20020a056e020e0100b0034fbd1f54f2mr10543546ilk.8.1695048768014; Mon, 18 Sep 2023 07:52:48 -0700 (PDT) Received: from localhost.localdomain (71-211-130-31.hlrn.qwest.net. [71.211.130.31]) by smtp.gmail.com with ESMTPSA id v19-20020a056e020f9300b0034f65b28335sm2359256ilo.66.2023.09.18.07.52.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Sep 2023 07:52:47 -0700 (PDT) Date: Mon, 18 Sep 2023 08:52:46 -0600 Subject: [PATCH v2 1/7] Introduce type-safe variant of gdb_bfd_openr_iovec MIME-Version: 1.0 Message-Id: <20230918-gdb-bfd-vec-v2-1-162c0e9a2bc9@adacore.com> References: <20230918-gdb-bfd-vec-v2-0-162c0e9a2bc9@adacore.com> In-Reply-To: <20230918-gdb-bfd-vec-v2-0-162c0e9a2bc9@adacore.com> To: gdb-patches@sourceware.org Cc: Lancelot Six X-Mailer: b4 0.12.3 X-Spam-Status: No, score=-11.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, 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.30 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 patch adds a new, type-safe variant of gdb_bfd_openr_iovec. In this approach, the underlying user data is simply an object, the callbacks are methods, and the "open" function is a function view. Nothing uses this new code yet. Reviewed-By: Lancelot Six --- gdb/gdb_bfd.c | 42 ++++++++++++++++++++++++++++++++++++++++++ gdb/gdb_bfd.h | 31 +++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+) diff --git a/gdb/gdb_bfd.c b/gdb/gdb_bfd.c index 3765561cbe9..de7ecaea630 100644 --- a/gdb/gdb_bfd.c +++ b/gdb/gdb_bfd.c @@ -907,6 +907,48 @@ gdb_bfd_openw (const char *filename, const char *target) /* See gdb_bfd.h. */ +gdb_bfd_ref_ptr +gdb_bfd_openr_iovec (const char *filename, const char *target, + gdb_iovec_opener_ftype open_fn) +{ + auto do_open = [] (bfd *nbfd, void *closure) -> void * + { + auto real_opener = static_cast (closure); + return (*real_opener) (nbfd); + }; + + auto read_trampoline = [] (bfd *nbfd, void *stream, void *buf, + file_ptr nbytes, file_ptr offset) -> file_ptr + { + gdb_bfd_iovec_base *obj = static_cast (stream); + return obj->read (nbfd, buf, nbytes, offset); + }; + + auto stat_trampoline = [] (struct bfd *abfd, void *stream, + struct stat *sb) -> int + { + gdb_bfd_iovec_base *obj = static_cast (stream); + return obj->stat (abfd, sb); + }; + + auto close_trampoline = [] (struct bfd *nbfd, void *stream) -> int + { + gdb_bfd_iovec_base *obj = static_cast (stream); + delete obj; + /* Success. */ + return 0; + }; + + bfd *result = bfd_openr_iovec (filename, target, + do_open, &open_fn, + read_trampoline, close_trampoline, + stat_trampoline); + + return gdb_bfd_ref_ptr::new_reference (result); +} + +/* See gdb_bfd.h. */ + gdb_bfd_ref_ptr gdb_bfd_openr_iovec (const char *filename, const char *target, void *(*open_func) (struct bfd *nbfd, diff --git a/gdb/gdb_bfd.h b/gdb/gdb_bfd.h index d15b1106d9a..ae374f5d7ae 100644 --- a/gdb/gdb_bfd.h +++ b/gdb/gdb_bfd.h @@ -22,6 +22,7 @@ #include "registry.h" #include "gdbsupport/byte-vector.h" +#include "gdbsupport/function-view.h" #include "gdbsupport/gdb_ref_ptr.h" #include "gdbsupport/iterator-range.h" #include "gdbsupport/next-iterator.h" @@ -150,6 +151,36 @@ gdb_bfd_ref_ptr gdb_bfd_openr (const char *, const char *); gdb_bfd_ref_ptr gdb_bfd_openw (const char *, const char *); +/* The base class for BFD "iovec" implementations. This is used by + gdb_bfd_openr_iovec and enables better type safety. */ + +class gdb_bfd_iovec_base +{ +protected: + + gdb_bfd_iovec_base () = default; + +public: + + virtual ~gdb_bfd_iovec_base () = default; + + /* The "read" callback. */ + virtual file_ptr read (bfd *abfd, void *buffer, file_ptr nbytes, + file_ptr offset) = 0; + + /* The "stat" callback. */ + virtual int stat (struct bfd *abfd, struct stat *sb) = 0; +}; + +/* The type of the function used to open a new iovec-based BFD. */ +using gdb_iovec_opener_ftype + = gdb::function_view; + +/* A type-safe wrapper for bfd_openr_iovec. */ + +gdb_bfd_ref_ptr gdb_bfd_openr_iovec (const char *filename, const char *target, + gdb_iovec_opener_ftype open_fn); + /* A wrapper for bfd_openr_iovec that initializes the gdb-specific reference count. */ From patchwork Mon Sep 18 14:52:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 76291 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 763E4385772B for ; Mon, 18 Sep 2023 14:53:13 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 763E4385772B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1695048793; bh=RTdjt9zpMIKqj70Eht7ETjOOBE2fLSvDFl8I7hbZ9HI=; 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=SH6VzihoEDe/fIwyQ03rvSLZIuXQTTm56UOtKt1Q2vhHcSTkepXpJyaNyPAyi8q8M nw1qSN/PK58TW90g0okpxPg5v/Yxa6wNz82lAyIECF6i3yPxZrP7UHAQuObjcc+CJR jhPyz/4yYCrFdLww3bbQtyyBKVij/IKd9D/IWkRc= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-il1-x132.google.com (mail-il1-x132.google.com [IPv6:2607:f8b0:4864:20::132]) by sourceware.org (Postfix) with ESMTPS id 57C093858C1F for ; Mon, 18 Sep 2023 14:52:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 57C093858C1F Received: by mail-il1-x132.google.com with SMTP id e9e14a558f8ab-34fc2773fa4so9482565ab.2 for ; Mon, 18 Sep 2023 07:52:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695048768; x=1695653568; 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=RTdjt9zpMIKqj70Eht7ETjOOBE2fLSvDFl8I7hbZ9HI=; b=eHVuzh6DVc88PCrcfmOMinP3Q0O/BPrND9EHlKlWb7CeNMzX/DP5dWJszqOD0Ml+Cs oRnKNVlx/vVCxvyJxkdZTqQc0p+8jlk5rSFEHiXSpTc7kTfOJN0xVSkwyxffU8CGs1jV 4UUNK8n1tCbcDseFTnl1dIpsHkbFsPKFzqcJxQx2dqVaKBJ4RfrRsfI/9RAM7pTm/8rm n2B7zrfkx1/ooZvR36UlZotdCz/pomaBd8EDJFA2TkqmJzv1Om3J4O2oaDPe1GKM84b/ mxlUKHJD+B3ApPDzP8KUgWb/wMP3eJh2Fp8z49J+HNbvuXY4KZ97DVYlE868AR3Z8qMw jPLQ== X-Gm-Message-State: AOJu0YyuT4hbWVSDdObb9nJHyxekxSD4ViefOznCGnttUPGx/EVYFJMp 3LxkyRkO4pycFqw1pdFTlDRhr0WnNW56h806XF7UIA== X-Google-Smtp-Source: AGHT+IFjK90pEKHrI39/Kg+RRw3AidCKk0LB5DTtGQli+ppuSiODdrX4GX1q/NTCprUR5GiBM6Cq5Q== X-Received: by 2002:a05:6e02:1baa:b0:34f:379c:d58e with SMTP id n10-20020a056e021baa00b0034f379cd58emr13081902ili.20.1695048768739; Mon, 18 Sep 2023 07:52:48 -0700 (PDT) Received: from localhost.localdomain (71-211-130-31.hlrn.qwest.net. [71.211.130.31]) by smtp.gmail.com with ESMTPSA id v19-20020a056e020f9300b0034f65b28335sm2359256ilo.66.2023.09.18.07.52.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Sep 2023 07:52:48 -0700 (PDT) Date: Mon, 18 Sep 2023 08:52:47 -0600 Subject: [PATCH v2 2/7] Small constructor change to target_buffer MIME-Version: 1.0 Message-Id: <20230918-gdb-bfd-vec-v2-2-162c0e9a2bc9@adacore.com> References: <20230918-gdb-bfd-vec-v2-0-162c0e9a2bc9@adacore.com> In-Reply-To: <20230918-gdb-bfd-vec-v2-0-162c0e9a2bc9@adacore.com> To: gdb-patches@sourceware.org X-Mailer: b4 0.12.3 X-Spam-Status: No, score=-11.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, 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.30 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 changes the target_buffer constructor to initialize m_filename rather than assign to it. --- gdb/gdb_bfd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gdb/gdb_bfd.c b/gdb/gdb_bfd.c index de7ecaea630..6b64e92b48e 100644 --- a/gdb/gdb_bfd.c +++ b/gdb/gdb_bfd.c @@ -226,10 +226,10 @@ struct target_buffer target memory. */ target_buffer (CORE_ADDR base, ULONGEST size) : m_base (base), - m_size (size) + m_size (size), + m_filename (xstrprintf ("", + core_addr_to_string_nz (m_base))) { - m_filename - = xstrprintf ("", core_addr_to_string_nz (m_base)); } /* Return the size of the in-memory BFD file. */ From patchwork Mon Sep 18 14:52: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: 76294 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 933D03853573 for ; Mon, 18 Sep 2023 14:53:46 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 933D03853573 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1695048826; bh=48wBCx8DPtltGFxBqWOdPq3STa1hIO2TCEYEeRHpZgE=; 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=AApG28M3HWGxwauRlOgUV4jHEYMMvu/v/35zRDA36MhPKGjMMZ4tT9eYqVVGl+Nrb vJcGQUW1P7bV7E6pGtzQRjQL3NfsAxAUK5kXYfQVKo/Qmb1HpSXM9vByq7mP05SQYJ QraeIwLvoIHZWNSWp5+Sa+Tvtwwp9jHkuHabv9ZE= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-il1-x12d.google.com (mail-il1-x12d.google.com [IPv6:2607:f8b0:4864:20::12d]) by sourceware.org (Postfix) with ESMTPS id 11F6A3858C2A for ; Mon, 18 Sep 2023 14:52:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 11F6A3858C2A Received: by mail-il1-x12d.google.com with SMTP id e9e14a558f8ab-34f6c725d94so14151385ab.0 for ; Mon, 18 Sep 2023 07:52:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695048769; x=1695653569; 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=48wBCx8DPtltGFxBqWOdPq3STa1hIO2TCEYEeRHpZgE=; b=T29OZSm9mbQV6mg+bEhz3SmpTzst/ugElp7w0sl1F6/KLLgRgWHmeCvrN0m9sMq00K mM9+JeQBPiuQ1gteyuUUInbCMFVZh0PQhSJ5HyoLoqfr0WxHHyZFEqTcjFYsGeSqJ329 Sc8S2iP9A3ls/yKC/DG1MQMnyrTXDE6zXm0ohSspTLkWjjDNQdJkMalVimP6kHa4oJVG Oq1+k4nuDCiSfmzDo12oDgZX6oSoWZLo8pj1/95jDDNP52DKQoP0proVXsq54hpIqfWV GQewqrsysJBmhvz+ayZmmkAtxUz2LOYb5AHDdnJpQ2UsAMyGSgKpiP48EGDuMwpiyvY3 v0Vw== X-Gm-Message-State: AOJu0YyEY0AFAHC24aDV/vOrw5NHMrLc08Vgot4LzkUwHJX3x2YtfvbN GpyNGKGz3vXtMm+TbmwSWOM6BMcAbUq2aiPmdNHlkA== X-Google-Smtp-Source: AGHT+IHfSZobaAYjl+AzVK0Dil+pmXvt5uAJhfQYFOCsAH4qmMBJRG6bf8tRLIrawWl00jPmLCJC2A== X-Received: by 2002:a05:6e02:1b04:b0:34f:22a6:7f64 with SMTP id i4-20020a056e021b0400b0034f22a67f64mr13091750ilv.1.1695048769371; Mon, 18 Sep 2023 07:52:49 -0700 (PDT) Received: from localhost.localdomain (71-211-130-31.hlrn.qwest.net. [71.211.130.31]) by smtp.gmail.com with ESMTPSA id v19-20020a056e020f9300b0034f65b28335sm2359256ilo.66.2023.09.18.07.52.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Sep 2023 07:52:49 -0700 (PDT) Date: Mon, 18 Sep 2023 08:52:48 -0600 Subject: [PATCH v2 3/7] Convert mem_bfd_iovec to new type-safe gdb_bfd_openr_iovec MIME-Version: 1.0 Message-Id: <20230918-gdb-bfd-vec-v2-3-162c0e9a2bc9@adacore.com> References: <20230918-gdb-bfd-vec-v2-0-162c0e9a2bc9@adacore.com> In-Reply-To: <20230918-gdb-bfd-vec-v2-0-162c0e9a2bc9@adacore.com> To: gdb-patches@sourceware.org X-Mailer: b4 0.12.3 X-Spam-Status: No, score=-11.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, 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.30 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 converts the mem_bfd_iovec / target_buffer code to use the new type-safe gdb_bfd_openr_iovec. --- gdb/gdb_bfd.c | 61 ++++++++++++++++++++--------------------------------------- 1 file changed, 20 insertions(+), 41 deletions(-) diff --git a/gdb/gdb_bfd.c b/gdb/gdb_bfd.c index 6b64e92b48e..e331703d4b1 100644 --- a/gdb/gdb_bfd.c +++ b/gdb/gdb_bfd.c @@ -220,7 +220,7 @@ gdb_bfd_has_target_filename (struct bfd *abfd) /* For `gdb_bfd_open_from_target_memory`. An object that manages the details of a BFD in target memory. */ -struct target_buffer +struct target_buffer : public gdb_bfd_iovec_base { /* Constructor. BASE and SIZE define where the BFD can be found in target memory. */ @@ -245,6 +245,11 @@ struct target_buffer const char *filename () const { return m_filename.get (); } + file_ptr read (bfd *abfd, void *buffer, file_ptr nbytes, + file_ptr offset) override; + + int stat (struct bfd *abfd, struct stat *sb) override; + private: /* The base address of the in-memory BFD file. */ CORE_ADDR m_base; @@ -256,47 +261,23 @@ struct target_buffer gdb::unique_xmalloc_ptr m_filename; }; -/* For `gdb_bfd_open_from_target_memory`. Opening the file is a no-op. */ - -static void * -mem_bfd_iovec_open (struct bfd *abfd, void *open_closure) -{ - return open_closure; -} - -/* For `gdb_bfd_open_from_target_memory`. Closing the file is just freeing the - base/size pair on our side. */ - -static int -mem_bfd_iovec_close (struct bfd *abfd, void *stream) -{ - struct target_buffer *buffer = (target_buffer *) stream; - delete buffer; - - /* Zero means success. */ - return 0; -} - /* For `gdb_bfd_open_from_target_memory`. For reading the file, we just need to pass through to target_read_memory and fix up the arguments and return values. */ -static file_ptr -mem_bfd_iovec_pread (struct bfd *abfd, void *stream, void *buf, +file_ptr +target_buffer::read (struct bfd *abfd, void *buf, file_ptr nbytes, file_ptr offset) { - struct target_buffer *buffer = (struct target_buffer *) stream; - /* If this read will read all of the file, limit it to just the rest. */ - if (offset + nbytes > buffer->size ()) - nbytes = buffer->size () - offset; + if (offset + nbytes > size ()) + nbytes = size () - offset; /* If there are no more bytes left, we've reached EOF. */ if (nbytes == 0) return 0; - int err - = target_read_memory (buffer->base () + offset, (gdb_byte *) buf, nbytes); + int err = target_read_memory (base () + offset, (gdb_byte *) buf, nbytes); if (err) return -1; @@ -306,13 +287,11 @@ mem_bfd_iovec_pread (struct bfd *abfd, void *stream, void *buf, /* For `gdb_bfd_open_from_target_memory`. For statting the file, we only support the st_size attribute. */ -static int -mem_bfd_iovec_stat (struct bfd *abfd, void *stream, struct stat *sb) +int +target_buffer::stat (struct bfd *abfd, struct stat *sb) { - struct target_buffer *buffer = (struct target_buffer*) stream; - memset (sb, 0, sizeof (struct stat)); - sb->st_size = buffer->size (); + sb->st_size = size (); return 0; } @@ -322,14 +301,14 @@ gdb_bfd_ref_ptr gdb_bfd_open_from_target_memory (CORE_ADDR addr, ULONGEST size, const char *target) { - struct target_buffer *buffer = new target_buffer (addr, size); + std::unique_ptr buffer + = gdb::make_unique (addr, size); return gdb_bfd_openr_iovec (buffer->filename (), target, - mem_bfd_iovec_open, - buffer, - mem_bfd_iovec_pread, - mem_bfd_iovec_close, - mem_bfd_iovec_stat); + [&] (bfd *nbfd) + { + return buffer.release (); + }); } /* bfd_openr_iovec OPEN_CLOSURE data for gdb_bfd_open. */ From patchwork Mon Sep 18 14:52:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 76292 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 810823856DE7 for ; Mon, 18 Sep 2023 14:53:22 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 810823856DE7 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1695048802; bh=JBRc7N7UMM5sq8mdCBoM4oeRZNnOOyKN/O6QUWpFebA=; 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=qvnAbjOmSw43E/ZB0Z/asvMRp5uAVASRl4NJTbqvhR1Z+TRxmLri9P6RZ3kNCXYPS 9KTygSyVEvw7fuDRCRSvt2ZRxIZ6fn+/cI+ZvOjbpy+13mA2URPJmrSSIdee82p/Q8 X0TaO1tdpWt6YwGPiaY3LfF/l4I9+C9INNfwdVes= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-il1-x12a.google.com (mail-il1-x12a.google.com [IPv6:2607:f8b0:4864:20::12a]) by sourceware.org (Postfix) with ESMTPS id D01A73858C2B for ; Mon, 18 Sep 2023 14:52:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D01A73858C2B Received: by mail-il1-x12a.google.com with SMTP id e9e14a558f8ab-34fd83200efso5879665ab.0 for ; Mon, 18 Sep 2023 07:52:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695048770; x=1695653570; 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=JBRc7N7UMM5sq8mdCBoM4oeRZNnOOyKN/O6QUWpFebA=; b=dSDIW0ZCfgiY5ozzq/LybnyYabxGitAvH6/irgX3TTWBB34YbBDktDbn1f7uXW91r+ EZK2+li/yPYAAdmc6oZjYHejU4sM5TAbnBIbr5z27EXQHGvnJGugRwIA+zopSCi5i6x8 r0mjlom7vOVjyWtTmn2ydbaYnOoGq1QaNlQ9aK2NeATdlqD6/9xzAXYoJPkhOybOnX6+ N3fC3aFnSpTGIg73l84WeDsNpKlr3IqNqZV5n59+jFAH7gyx/TDbC9GJkFkjA/IgV8ZS z+LTTjeeH2rjRKo8nm3fcSCiHqHU4ZTlSPUfCzyRmioqd38pHQGiRJzLiqrdj/4UnMrW 1pLg== X-Gm-Message-State: AOJu0YwfIjtTg2t/hKKwlqRhScF/tzSaERNIwImRMCWiA7uIodoawTHs rtq5jTCbYfyVbYaC92/FzINm8nd7h9do4JhO2QM9mA== X-Google-Smtp-Source: AGHT+IHLixYlujFKkV8dndBtkDW/VL5me5LCN8eOAAeQCzoORohzgkCtl9q0bYEbIUkLn9LfWXjtrw== X-Received: by 2002:a05:6e02:1546:b0:34f:6f44:aec4 with SMTP id j6-20020a056e02154600b0034f6f44aec4mr14108200ilu.8.1695048770078; Mon, 18 Sep 2023 07:52:50 -0700 (PDT) Received: from localhost.localdomain (71-211-130-31.hlrn.qwest.net. [71.211.130.31]) by smtp.gmail.com with ESMTPSA id v19-20020a056e020f9300b0034f65b28335sm2359256ilo.66.2023.09.18.07.52.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Sep 2023 07:52:49 -0700 (PDT) Date: Mon, 18 Sep 2023 08:52:49 -0600 Subject: [PATCH v2 4/7] Convert target fileio to new type-safe gdb_bfd_openr_iovec MIME-Version: 1.0 Message-Id: <20230918-gdb-bfd-vec-v2-4-162c0e9a2bc9@adacore.com> References: <20230918-gdb-bfd-vec-v2-0-162c0e9a2bc9@adacore.com> In-Reply-To: <20230918-gdb-bfd-vec-v2-0-162c0e9a2bc9@adacore.com> To: gdb-patches@sourceware.org X-Mailer: b4 0.12.3 X-Spam-Status: No, score=-11.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, 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.30 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 converts the target fileio BFD iovec implementation to use the new type-safe gdb_bfd_openr_iovec. --- gdb/gdb_bfd.c | 97 ++++++++++++++++++++++++++++++----------------------------- 1 file changed, 50 insertions(+), 47 deletions(-) diff --git a/gdb/gdb_bfd.c b/gdb/gdb_bfd.c index e331703d4b1..2f489a4f210 100644 --- a/gdb/gdb_bfd.c +++ b/gdb/gdb_bfd.c @@ -311,30 +311,48 @@ gdb_bfd_open_from_target_memory (CORE_ADDR addr, ULONGEST size, }); } -/* bfd_openr_iovec OPEN_CLOSURE data for gdb_bfd_open. */ -struct gdb_bfd_open_closure +/* An object that manages the underlying stream for a BFD, using + target file I/O. */ + +struct target_fileio_stream : public gdb_bfd_iovec_base { - inferior *inf; - bool warn_if_slow; + target_fileio_stream (bfd *nbfd, int fd) + : m_bfd (nbfd), + m_fd (fd) + { + } + + ~target_fileio_stream (); + + file_ptr read (bfd *abfd, void *buffer, file_ptr nbytes, + file_ptr offset) override; + + int stat (struct bfd *abfd, struct stat *sb) override; + +private: + + /* The BFD. Saved for the destructor. */ + bfd *m_bfd; + + /* The file descriptor. */ + int m_fd; }; -/* Wrapper for target_fileio_open suitable for passing as the - OPEN_FUNC argument to gdb_bfd_openr_iovec. */ +/* Wrapper for target_fileio_open suitable for use as a helper + function for gdb_bfd_openr_iovec. */ -static void * -gdb_bfd_iovec_fileio_open (struct bfd *abfd, void *open_closure) +static target_fileio_stream * +gdb_bfd_iovec_fileio_open (struct bfd *abfd, inferior *inf, bool warn_if_slow) { const char *filename = bfd_get_filename (abfd); int fd; fileio_error target_errno; - int *stream; - gdb_bfd_open_closure *oclosure = (gdb_bfd_open_closure *) open_closure; gdb_assert (is_target_filename (filename)); - fd = target_fileio_open (oclosure->inf, + fd = target_fileio_open (inf, filename + strlen (TARGET_SYSROOT_PREFIX), - FILEIO_O_RDONLY, 0, oclosure->warn_if_slow, + FILEIO_O_RDONLY, 0, warn_if_slow, &target_errno); if (fd == -1) { @@ -343,19 +361,15 @@ gdb_bfd_iovec_fileio_open (struct bfd *abfd, void *open_closure) return NULL; } - stream = XCNEW (int); - *stream = fd; - return stream; + return new target_fileio_stream (abfd, fd); } -/* Wrapper for target_fileio_pread suitable for passing as the - PREAD_FUNC argument to gdb_bfd_openr_iovec. */ +/* Wrapper for target_fileio_pread. */ -static file_ptr -gdb_bfd_iovec_fileio_pread (struct bfd *abfd, void *stream, void *buf, +file_ptr +target_fileio_stream::read (struct bfd *abfd, void *buf, file_ptr nbytes, file_ptr offset) { - int fd = *(int *) stream; fileio_error target_errno; file_ptr pos, bytes; @@ -364,7 +378,7 @@ gdb_bfd_iovec_fileio_pread (struct bfd *abfd, void *stream, void *buf, { QUIT; - bytes = target_fileio_pread (fd, (gdb_byte *) buf + pos, + bytes = target_fileio_pread (m_fd, (gdb_byte *) buf + pos, nbytes - pos, offset + pos, &target_errno); if (bytes == 0) @@ -392,46 +406,35 @@ gdb_bfd_close_warning (const char *name, const char *reason) warning (_("cannot close \"%s\": %s"), name, reason); } -/* Wrapper for target_fileio_close suitable for passing as the - CLOSE_FUNC argument to gdb_bfd_openr_iovec. */ +/* Wrapper for target_fileio_close. */ -static int -gdb_bfd_iovec_fileio_close (struct bfd *abfd, void *stream) +target_fileio_stream::~target_fileio_stream () { - int fd = *(int *) stream; fileio_error target_errno; - xfree (stream); - /* Ignore errors on close. These may happen with remote targets if the connection has already been torn down. */ try { - target_fileio_close (fd, &target_errno); + target_fileio_close (m_fd, &target_errno); } catch (const gdb_exception &ex) { /* Also avoid crossing exceptions over bfd. */ - gdb_bfd_close_warning (bfd_get_filename (abfd), + gdb_bfd_close_warning (bfd_get_filename (m_bfd), ex.message->c_str ()); } - - /* Zero means success. */ - return 0; } -/* Wrapper for target_fileio_fstat suitable for passing as the - STAT_FUNC argument to gdb_bfd_openr_iovec. */ +/* Wrapper for target_fileio_fstat. */ -static int -gdb_bfd_iovec_fileio_fstat (struct bfd *abfd, void *stream, - struct stat *sb) +int +target_fileio_stream::stat (struct bfd *abfd, struct stat *sb) { - int fd = *(int *) stream; fileio_error target_errno; int result; - result = target_fileio_fstat (fd, sb, &target_errno); + result = target_fileio_fstat (m_fd, sb, &target_errno); if (result == -1) { errno = fileio_error_to_host (target_errno); @@ -482,13 +485,13 @@ gdb_bfd_open (const char *name, const char *target, int fd, { gdb_assert (fd == -1); - gdb_bfd_open_closure open_closure { current_inferior (), warn_if_slow }; - return gdb_bfd_openr_iovec (name, target, - gdb_bfd_iovec_fileio_open, - &open_closure, - gdb_bfd_iovec_fileio_pread, - gdb_bfd_iovec_fileio_close, - gdb_bfd_iovec_fileio_fstat); + auto open = [&] (bfd *nbfd) -> gdb_bfd_iovec_base * + { + return gdb_bfd_iovec_fileio_open (nbfd, current_inferior (), + warn_if_slow); + }; + + return gdb_bfd_openr_iovec (name, target, open); } name += strlen (TARGET_SYSROOT_PREFIX); From patchwork Mon Sep 18 14:52:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 76296 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 F22FA385DC15 for ; Mon, 18 Sep 2023 14:54:20 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F22FA385DC15 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1695048861; bh=+az5E3RvBikGhXKzBuLr/+Cc8CftvxohDjVdemEhh/M=; 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=AaLI3QKnQOYN3lzexaUQasq4dF2T9ZrCBHG4rgUi0uuFS7YRMy/D4h/MUfa0dczic M+baKTDaBjg02pStyVjAIjzZAqIzxCy3HKuaywrvhTo49Flly/1DoGZFm5ZYjtYwHh IB/xT7uqgB7esCmy9yFm0pPrfAKw+RcClRXtFLx4= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-il1-x134.google.com (mail-il1-x134.google.com [IPv6:2607:f8b0:4864:20::134]) by sourceware.org (Postfix) with ESMTPS id 6FD6D385840F for ; Mon, 18 Sep 2023 14:52:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6FD6D385840F Received: by mail-il1-x134.google.com with SMTP id e9e14a558f8ab-34fcbb4a097so9320475ab.1 for ; Mon, 18 Sep 2023 07:52:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695048770; x=1695653570; 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=+az5E3RvBikGhXKzBuLr/+Cc8CftvxohDjVdemEhh/M=; b=XDEEVtOPbiKULp/W0c7t1v+j/GBYhPyy5JKq6ADCgKyXDrqNgrRM9gpkdP7uf9s51X pqu/mkMjy3ZDroIK2HCLe0P+RW7VqDXnAkcbIFjhBnECAjJBC5TNu30h5W3BKst7AeSo StVck+am5oE/rOpdWiPsQO3nu0S6C4w6+gtdcRSa+hNmm1B3jKumtjHguG8Xez3GIlVl 9EBaka+Gyxe0oa8KBJ5HbHxDgbDT0DAZcTYGUK4GVNcxMfJ8oe5hLE8azlKl7N7KUM9J ekCUQXSmVJSQrDCXTdKPKnocUS6V/BMdCeZT3DTDdk4G9H/edPaPlXVOdYIOadTHFCLx tdcA== X-Gm-Message-State: AOJu0YzlWk8BZw+Bm2y3kmo6EQ0DncaWfJ1pXpDCM8G2LdR1oNC+oNet 0vP6/c8kemiZATCASZ/NMQP3E7KcAGbPAO65elVGIw== X-Google-Smtp-Source: AGHT+IELyfTBpGFLbeRc17F9LorV9VB8WlESMmsZEwYx/NjYmM0L5VoBmo5gHe6km5R2jttQlLAVaQ== X-Received: by 2002:a92:c566:0:b0:34e:2060:40eb with SMTP id b6-20020a92c566000000b0034e206040ebmr12071394ilj.28.1695048770672; Mon, 18 Sep 2023 07:52:50 -0700 (PDT) Received: from localhost.localdomain (71-211-130-31.hlrn.qwest.net. [71.211.130.31]) by smtp.gmail.com with ESMTPSA id v19-20020a056e020f9300b0034f65b28335sm2359256ilo.66.2023.09.18.07.52.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Sep 2023 07:52:50 -0700 (PDT) Date: Mon, 18 Sep 2023 08:52:50 -0600 Subject: [PATCH v2 5/7] Convert minidebug to new type-safe gdb_bfd_openr_iovec MIME-Version: 1.0 Message-Id: <20230918-gdb-bfd-vec-v2-5-162c0e9a2bc9@adacore.com> References: <20230918-gdb-bfd-vec-v2-0-162c0e9a2bc9@adacore.com> In-Reply-To: <20230918-gdb-bfd-vec-v2-0-162c0e9a2bc9@adacore.com> To: gdb-patches@sourceware.org X-Mailer: b4 0.12.3 X-Spam-Status: No, score=-11.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, 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.30 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 converts the minidebug BFD iovec implementation to the new type-safe gdb_bfd_openr_iovec. --- gdb/minidebug.c | 98 +++++++++++++++++++++++---------------------------------- 1 file changed, 40 insertions(+), 58 deletions(-) diff --git a/gdb/minidebug.c b/gdb/minidebug.c index 979e569e639..e2b60fb959c 100644 --- a/gdb/minidebug.c +++ b/gdb/minidebug.c @@ -57,7 +57,7 @@ static lzma_allocator gdb_lzma_allocator = { alloc_lzma, free_lzma, NULL }; a section. This keeps only the last decompressed block in memory to allow larger data without using to much memory. */ -struct gdb_lzma_stream +struct gdb_lzma_stream : public gdb_bfd_iovec_base { /* Section of input BFD from which we are decoding data. */ asection *section = nullptr; @@ -69,19 +69,25 @@ struct gdb_lzma_stream bfd_size_type data_start = 0; bfd_size_type data_end = 0; gdb::byte_vector data; -}; -/* bfd_openr_iovec OPEN_P implementation for - find_separate_debug_file_in_section. OPEN_CLOSURE is 'asection *' - of the section to decompress. - Return 'struct gdb_lzma_stream *' must be freed by caller by delete, - together with its INDEX lzma data. */ + ~gdb_lzma_stream () + { + lzma_index_end (index, &gdb_lzma_allocator); + } -static void * -lzma_open (struct bfd *nbfd, void *open_closure) + file_ptr read (bfd *abfd, void *buffer, file_ptr nbytes, + file_ptr offset) override; + + int stat (struct bfd *abfd, struct stat *sb) override; +}; + +/* bfd_openr_iovec implementation helper for + find_separate_debug_file_in_section. */ + +static gdb_lzma_stream * +lzma_open (struct bfd *nbfd, asection *section) { - asection *section = (asection *) open_closure; bfd_size_type size, offset; lzma_stream_flags options; gdb_byte footer[LZMA_STREAM_HEADER_SIZE]; @@ -127,15 +133,13 @@ lzma_open (struct bfd *nbfd, void *open_closure) return lstream; } -/* bfd_openr_iovec PREAD_P implementation for - find_separate_debug_file_in_section. Passed STREAM - is 'struct gdb_lzma_stream *'. */ +/* bfd_openr_iovec read implementation for + find_separate_debug_file_in_section. */ -static file_ptr -lzma_pread (struct bfd *nbfd, void *stream, void *buf, file_ptr nbytes, - file_ptr offset) +file_ptr +gdb_lzma_stream::read (struct bfd *nbfd, void *buf, file_ptr nbytes, + file_ptr offset) { - struct gdb_lzma_stream *lstream = (struct gdb_lzma_stream *) stream; bfd_size_type chunk_size; lzma_index_iter iter; file_ptr block_offset; @@ -147,12 +151,9 @@ lzma_pread (struct bfd *nbfd, void *stream, void *buf, file_ptr nbytes, res = 0; while (nbytes > 0) { - if (lstream->data.empty () - || lstream->data_start > offset || offset >= lstream->data_end) + if (data.empty () || data_start > offset || offset >= data_end) { - asection *section = lstream->section; - - lzma_index_iter_init (&iter, lstream->index); + lzma_index_iter_init (&iter, index); if (lzma_index_iter_locate (&iter, offset)) break; @@ -184,15 +185,14 @@ lzma_pread (struct bfd *nbfd, void *stream, void *buf, file_ptr nbytes, != LZMA_OK) break; - lstream->data = std::move (uncompressed); - lstream->data_start = iter.block.uncompressed_file_offset; - lstream->data_end = (iter.block.uncompressed_file_offset - + iter.block.uncompressed_size); + data = std::move (uncompressed); + data_start = iter.block.uncompressed_file_offset; + data_end = (iter.block.uncompressed_file_offset + + iter.block.uncompressed_size); } - chunk_size = std::min (nbytes, (file_ptr) lstream->data_end - offset); - memcpy (buf, lstream->data.data () + offset - lstream->data_start, - chunk_size); + chunk_size = std::min (nbytes, (file_ptr) data_end - offset); + memcpy (buf, data.data () + offset - data_start, chunk_size); buf = (gdb_byte *) buf + chunk_size; offset += chunk_size; nbytes -= chunk_size; @@ -202,36 +202,14 @@ lzma_pread (struct bfd *nbfd, void *stream, void *buf, file_ptr nbytes, return res; } -/* bfd_openr_iovec CLOSE_P implementation for - find_separate_debug_file_in_section. Passed STREAM - is 'struct gdb_lzma_stream *'. */ - -static int -lzma_close (struct bfd *nbfd, - void *stream) -{ - struct gdb_lzma_stream *lstream = (struct gdb_lzma_stream *) stream; - - lzma_index_end (lstream->index, &gdb_lzma_allocator); - delete lstream; - - /* Zero means success. */ - return 0; -} - -/* bfd_openr_iovec STAT_P implementation for - find_separate_debug_file_in_section. Passed STREAM - is 'struct gdb_lzma_stream *'. */ +/* bfd_openr_iovec stat implementation for + find_separate_debug_file_in_section. */ -static int -lzma_stat (struct bfd *abfd, - void *stream, - struct stat *sb) +int +gdb_lzma_stream::stat (struct bfd *abfd, struct stat *sb) { - struct gdb_lzma_stream *lstream = (struct gdb_lzma_stream *) stream; - memset (sb, 0, sizeof (struct stat)); - sb->st_size = lzma_index_uncompressed_size (lstream->index); + sb->st_size = lzma_index_uncompressed_size (index); return 0; } @@ -265,8 +243,12 @@ find_separate_debug_file_in_section (struct objfile *objfile) std::string filename = string_printf (_(".gnu_debugdata for %s"), objfile_name (objfile)); - abfd = gdb_bfd_openr_iovec (filename.c_str (), gnutarget, lzma_open, - section, lzma_pread, lzma_close, lzma_stat); + auto open = [&] (bfd *nbfd) -> gdb_lzma_stream * + { + return lzma_open (nbfd, section); + }; + + abfd = gdb_bfd_openr_iovec (filename.c_str (), gnutarget, open); if (abfd == NULL) return NULL; From patchwork Mon Sep 18 14:52:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 76293 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 653AA385354A for ; Mon, 18 Sep 2023 14:53:45 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 653AA385354A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1695048825; bh=jKPiglA2NdwC+24ZrgfNgXHyzGq4cLgCvdQIgaCyLqg=; h=Date:Subject:References:In-Reply-To:To:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=tigI56ttM7BIzzuAEwGExd0rpFJ/Ek9BmI2ttFQLe8Cv87qt7utd+NcMF4NgdKM1m TnonzBEb/b7kuKybFT/AGHJFcimJU+i2EViHetQcCcT0fDz9sWywJNbjKjKK+KtbDX FrKkHnaY36b7v+GnSea5z9SIvSyqJIrwBtHmASVA= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-io1-xd30.google.com (mail-io1-xd30.google.com [IPv6:2607:f8b0:4864:20::d30]) by sourceware.org (Postfix) with ESMTPS id 10AA53857B9B for ; Mon, 18 Sep 2023 14:52:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 10AA53857B9B Received: by mail-io1-xd30.google.com with SMTP id ca18e2360f4ac-79a7dc97aa2so176843139f.2 for ; Mon, 18 Sep 2023 07:52:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695048771; x=1695653571; h=cc: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=jKPiglA2NdwC+24ZrgfNgXHyzGq4cLgCvdQIgaCyLqg=; b=DthGbghA6tiyjCEAZRu31TYzZDjuA3thnZTEt78M6ZaeSQNJsXstSom00aWhMks/Fa OR5YW/ms2PypFD8R+VgPrdcmvZE+U4rnJYogSj/M8TnzzbIu0sMrKgHL8pSSGCsI6yex V5SwRcWQA9n+JlUDnEZVaXLYPAGilFdwj7rGrbZSvP/FjnPj8wkQkFeQQXJmddGY4y05 froT0peznv6mNZ+1qN/HgJsDtkYtS+P7LH5eKn6CyS9e9hhXDvrVAhQBofmo7ADD86KW f3qq/feypQ12ktUP57IiEUK7ZdpuNiXmPwFYxH4BFnGOlZwlHQO4gRNknFrDfTQ4QA9o dbwg== X-Gm-Message-State: AOJu0Yx+ub3QYrl+UZg9CsQoKylIjsz2W40FDv3z5aCgPlIfSv09PCJS aGrwDlumTd3Od/OfVJr9snawUvRCWXHpVyMd1rNw3A== X-Google-Smtp-Source: AGHT+IHkVWNOhny9GTkeZ0L7dHNKPhDy7wRdZzS9AOFtEPm9Pk82RD6pz3kmj62Zu/UJK/+MBVlUGw== X-Received: by 2002:a05:6e02:1302:b0:345:baef:842b with SMTP id g2-20020a056e02130200b00345baef842bmr8493249ilr.25.1695048771282; Mon, 18 Sep 2023 07:52:51 -0700 (PDT) Received: from localhost.localdomain (71-211-130-31.hlrn.qwest.net. [71.211.130.31]) by smtp.gmail.com with ESMTPSA id v19-20020a056e020f9300b0034f65b28335sm2359256ilo.66.2023.09.18.07.52.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Sep 2023 07:52:50 -0700 (PDT) Date: Mon, 18 Sep 2023 08:52:51 -0600 Subject: [PATCH v2 6/7] Convert solib-rocm to new type-safe gdb_bfd_openr_iovec MIME-Version: 1.0 Message-Id: <20230918-gdb-bfd-vec-v2-6-162c0e9a2bc9@adacore.com> References: <20230918-gdb-bfd-vec-v2-0-162c0e9a2bc9@adacore.com> In-Reply-To: <20230918-gdb-bfd-vec-v2-0-162c0e9a2bc9@adacore.com> To: gdb-patches@sourceware.org Cc: Lancelot Six X-Mailer: b4 0.12.3 X-Spam-Status: No, score=-11.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, 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.30 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 converts the solib-rocm BFD iovec implementations to the new type-safe gdb_bfd_openr_iovec. They were already essentially using this approach, just without the type-safe wrapper. Thanks to Lancelot Six for testing and fixing this patch. Co-Authored-By: Lancelot Six Acked-by: Lancelot Six --- gdb/solib-rocm.c | 66 ++++++++++++++++---------------------------------------- 1 file changed, 18 insertions(+), 48 deletions(-) diff --git a/gdb/solib-rocm.c b/gdb/solib-rocm.c index 56c210e9fa5..6b84f09e88b 100644 --- a/gdb/solib-rocm.c +++ b/gdb/solib-rocm.c @@ -268,24 +268,13 @@ namespace { /* Interface to interact with a ROCm code object stream. */ -struct rocm_code_object_stream +struct rocm_code_object_stream : public gdb_bfd_iovec_base { DISABLE_COPY_AND_ASSIGN (rocm_code_object_stream); - /* Copy SIZE bytes from the underlying objfile storage starting at OFFSET - into the user provided buffer BUF. + int stat (bfd *abfd, struct stat *sb) final override; - Return the number of bytes actually copied (might be inferior to SIZE if - the end of the stream is reached). */ - virtual file_ptr read (void *buf, file_ptr size, file_ptr offset) = 0; - - /* Retrieve file information in SB. - - Return 0 on success. On failure, set the appropriate bfd error number - (using bfd_set_error) and return -1. */ - int stat (struct stat *sb); - - virtual ~rocm_code_object_stream () = default; + ~rocm_code_object_stream () override = default; protected: rocm_code_object_stream () = default; @@ -298,7 +287,7 @@ struct rocm_code_object_stream }; int -rocm_code_object_stream::stat (struct stat *sb) +rocm_code_object_stream::stat (bfd *, struct stat *sb) { const LONGEST size = this->size (); if (size == -1) @@ -319,7 +308,8 @@ struct rocm_code_object_stream_file final : rocm_code_object_stream rocm_code_object_stream_file (inferior *inf, int fd, ULONGEST offset, ULONGEST size); - file_ptr read (void *buf, file_ptr size, file_ptr offset) override; + file_ptr read (bfd *abfd, void *buf, file_ptr size, + file_ptr offset) override; LONGEST size () override; @@ -348,7 +338,7 @@ rocm_code_object_stream_file::rocm_code_object_stream_file } file_ptr -rocm_code_object_stream_file::read (void *buf, file_ptr size, +rocm_code_object_stream_file::read (bfd *, void *buf, file_ptr size, file_ptr offset) { fileio_error target_errno; @@ -423,7 +413,8 @@ struct rocm_code_object_stream_memory final : public rocm_code_object_stream rocm_code_object_stream_memory (gdb::byte_vector buffer); - file_ptr read (void *buf, file_ptr size, file_ptr offset) override; + file_ptr read (bfd *abfd, void *buf, file_ptr size, + file_ptr offset) override; protected: @@ -445,7 +436,7 @@ rocm_code_object_stream_memory::rocm_code_object_stream_memory } file_ptr -rocm_code_object_stream_memory::read (void *buf, file_ptr size, +rocm_code_object_stream_memory::read (bfd *, void *buf, file_ptr size, file_ptr offset) { if (size > m_objfile_image.size () - offset) @@ -457,8 +448,8 @@ rocm_code_object_stream_memory::read (void *buf, file_ptr size, } /* anonymous namespace */ -static void * -rocm_bfd_iovec_open (bfd *abfd, void *inferior_void) +static gdb_bfd_iovec_base * +rocm_bfd_iovec_open (bfd *abfd, inferior *inferior) { gdb::string_view uri (bfd_get_filename (abfd)); gdb::string_view protocol_delim = "://"; @@ -522,7 +513,6 @@ rocm_bfd_iovec_open (bfd *abfd, void *inferior_void) { ULONGEST offset = 0; ULONGEST size = 0; - inferior *inferior = static_cast (inferior_void); auto try_strtoulst = [] (gdb::string_view v) { @@ -607,28 +597,6 @@ rocm_bfd_iovec_open (bfd *abfd, void *inferior_void) } } -static int -rocm_bfd_iovec_close (bfd *nbfd, void *data) -{ - delete static_cast (data); - - return 0; -} - -static file_ptr -rocm_bfd_iovec_pread (bfd *abfd, void *data, void *buf, file_ptr size, - file_ptr offset) -{ - return static_cast (data)->read (buf, size, - offset); -} - -static int -rocm_bfd_iovec_stat (bfd *abfd, void *data, struct stat *sb) -{ - return static_cast (data)->stat (sb); -} - static gdb_bfd_ref_ptr rocm_solib_bfd_open (const char *pathname) { @@ -636,10 +604,12 @@ rocm_solib_bfd_open (const char *pathname) if (strstr (pathname, "://") == nullptr) return svr4_so_ops.bfd_open (pathname); - gdb_bfd_ref_ptr abfd - = gdb_bfd_openr_iovec (pathname, "elf64-amdgcn", rocm_bfd_iovec_open, - current_inferior (), rocm_bfd_iovec_pread, - rocm_bfd_iovec_close, rocm_bfd_iovec_stat); + auto open = [] (bfd *nbfd) -> gdb_bfd_iovec_base * + { + return rocm_bfd_iovec_open (nbfd, current_inferior ()); + }; + + gdb_bfd_ref_ptr abfd = gdb_bfd_openr_iovec (pathname, "elf64-amdgcn", open); if (abfd == nullptr) error (_("Could not open `%s' as an executable file: %s"), pathname, From patchwork Mon Sep 18 14:52:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 76295 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 CB4E8385559F for ; Mon, 18 Sep 2023 14:53:52 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CB4E8385559F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1695048832; bh=QbuCWHCxyi7E2pgXGnbIb4qUk/s3ToN23mJhwAMfW1w=; 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=ovAL+Ss/fl3WZhajbG4hGHurYD83AIx/+xQlznbn6eoOAPMb9PW2pdaXlqwtBG8aV SN07FlCXgkzuu704NlfatB8MScYZ89Tn5Tl2CNXAqMC6+7PcwC6rpFIKdE+q5q/xn3 dt0UTmIfiOSH+YD/h6NO12M6T1vwHRqAQEJqbJJg= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-io1-xd2c.google.com (mail-io1-xd2c.google.com [IPv6:2607:f8b0:4864:20::d2c]) by sourceware.org (Postfix) with ESMTPS id A9F95385772F for ; Mon, 18 Sep 2023 14:52:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A9F95385772F Received: by mail-io1-xd2c.google.com with SMTP id ca18e2360f4ac-79ac0d271b4so118570539f.1 for ; Mon, 18 Sep 2023 07:52:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695048772; x=1695653572; 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=QbuCWHCxyi7E2pgXGnbIb4qUk/s3ToN23mJhwAMfW1w=; b=te4B5QCwWbdUoaU9DHyRh+hiIpJk5b8x1o77Ml2dnBwAWp/86r74khk/czTCl4/ciz FL3mTHnsPXYpkpd5mjsYFp73rH4u5RqCaV1VU6szCt4/UaIwAxI4q/mWoaUSTtc6wn8G p/jlRJmT0bur/cQmtm4F6A5VUH4dS3yVfr9DaysGz0tHBStD420FeDNHwSErnt3/f67B rCYoJFiqxxWppa9HEXf0xHcK5a1BByDdar56EhfZ4DEXmo4tecyFNb+7BJt1YeNOO6Fr 8vceypBr0oPP9SeWuH+PsxFQv9fdquIBz/9uhLbmLZ0z9HXdxxJ3NwzHGTUVlUtiUPE7 JimA== X-Gm-Message-State: AOJu0YxBNhqi7T/AEEj1AwQi5OjbjXObj26Q9RVgcBdvZbWhb19lkkD/ Xm7C9CftPSHNpbezfcXGcPFDeIqQvUEsbzFsOl1tag== X-Google-Smtp-Source: AGHT+IGeE6S4JPsRAvGxYRLDpm3c+3+6uUikMf1a4aowFSSIHsRFOkt8+Y7vFTvw5jSYmYZ5WNljEQ== X-Received: by 2002:a05:6e02:c74:b0:34b:ba9b:c764 with SMTP id f20-20020a056e020c7400b0034bba9bc764mr9745224ilj.18.1695048771957; Mon, 18 Sep 2023 07:52:51 -0700 (PDT) Received: from localhost.localdomain (71-211-130-31.hlrn.qwest.net. [71.211.130.31]) by smtp.gmail.com with ESMTPSA id v19-20020a056e020f9300b0034f65b28335sm2359256ilo.66.2023.09.18.07.52.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Sep 2023 07:52:51 -0700 (PDT) Date: Mon, 18 Sep 2023 08:52:52 -0600 Subject: [PATCH v2 7/7] Remove old gdb_bfd_openr_iovec MIME-Version: 1.0 Message-Id: <20230918-gdb-bfd-vec-v2-7-162c0e9a2bc9@adacore.com> References: <20230918-gdb-bfd-vec-v2-0-162c0e9a2bc9@adacore.com> In-Reply-To: <20230918-gdb-bfd-vec-v2-0-162c0e9a2bc9@adacore.com> To: gdb-patches@sourceware.org X-Mailer: b4 0.12.3 X-Spam-Status: No, score=-11.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, 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.30 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 removes the old gdb_bfd_openr_iovec entirely. I think any new code should use the type-safe approach. --- gdb/gdb_bfd.c | 25 ------------------------- gdb/gdb_bfd.h | 18 ------------------ 2 files changed, 43 deletions(-) diff --git a/gdb/gdb_bfd.c b/gdb/gdb_bfd.c index 2f489a4f210..217753cf914 100644 --- a/gdb/gdb_bfd.c +++ b/gdb/gdb_bfd.c @@ -931,31 +931,6 @@ gdb_bfd_openr_iovec (const char *filename, const char *target, /* See gdb_bfd.h. */ -gdb_bfd_ref_ptr -gdb_bfd_openr_iovec (const char *filename, const char *target, - void *(*open_func) (struct bfd *nbfd, - void *open_closure), - void *open_closure, - file_ptr (*pread_func) (struct bfd *nbfd, - void *stream, - void *buf, - file_ptr nbytes, - file_ptr offset), - int (*close_func) (struct bfd *nbfd, - void *stream), - int (*stat_func) (struct bfd *abfd, - void *stream, - struct stat *sb)) -{ - bfd *result = bfd_openr_iovec (filename, target, - open_func, open_closure, - pread_func, close_func, stat_func); - - return gdb_bfd_ref_ptr::new_reference (result); -} - -/* See gdb_bfd.h. */ - void gdb_bfd_mark_parent (bfd *child, bfd *parent) { diff --git a/gdb/gdb_bfd.h b/gdb/gdb_bfd.h index ae374f5d7ae..604365b61b1 100644 --- a/gdb/gdb_bfd.h +++ b/gdb/gdb_bfd.h @@ -181,24 +181,6 @@ using gdb_iovec_opener_ftype gdb_bfd_ref_ptr gdb_bfd_openr_iovec (const char *filename, const char *target, gdb_iovec_opener_ftype open_fn); -/* A wrapper for bfd_openr_iovec that initializes the gdb-specific - reference count. */ - -gdb_bfd_ref_ptr gdb_bfd_openr_iovec (const char *filename, const char *target, - void *(*open_func) (struct bfd *nbfd, - void *open_closure), - void *open_closure, - file_ptr (*pread_func) (struct bfd *nbfd, - void *stream, - void *buf, - file_ptr nbytes, - file_ptr offset), - int (*close_func) (struct bfd *nbfd, - void *stream), - int (*stat_func) (struct bfd *abfd, - void *stream, - struct stat *sb)); - /* A wrapper for bfd_openr_next_archived_file that initializes the gdb-specific reference count. */