From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id Gz9bDY6P52TbTQoAWB0awg (envelope-from ) for ; Thu, 24 Aug 2023 13:12:46 -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=J5wmWLya; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 2A5A51E0C3; Thu, 24 Aug 2023 13:12:46 -0400 (EDT) Received: from server2.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 ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 1BFD71E092 for ; Thu, 24 Aug 2023 13:12:44 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 90A5538555A0 for ; Thu, 24 Aug 2023 17:12:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 90A5538555A0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1692897163; bh=V4mBnLySFUYHF/S8bo+vQBDQ04llzsp3nJNsxt88bm8=; 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=J5wmWLyaf5Wl1gkv5Gvqzez1OruCVQery96zbjicId0aZ9G2NPDmUFiO2Im/9sdLb 27j46Wz/rTPZV4kBif7E8X5pFJegtoykaKKuibaGXoIm4CGjxPLVU+q1MwaXnun7JB 5xs9cFc2lEwPIHVtBjpZ9dO59qIZazD58PRj24fo= 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 BC4AC3858C2C for ; Thu, 24 Aug 2023 17:12:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org BC4AC3858C2C Received: by mail-io1-xd2c.google.com with SMTP id ca18e2360f4ac-79231457b7fso1460439f.3 for ; Thu, 24 Aug 2023 10:12:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692897141; x=1693501941; 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=V4mBnLySFUYHF/S8bo+vQBDQ04llzsp3nJNsxt88bm8=; b=eOqOl4uImhRhjRTwoYaq/osgCcMq8I8yg6UZWcaf37A007Hj2LZhP6nWsSAvli+kpj QdApbnUmopRB9lLWo+DvnokfCuPi18L4OSDybQGgR8m6u3Ut2vqbkrg1Bc3GOP8cTh5Y MOTl2Simo86JvCcIE/bSP6SrHNZ4zw4+srbZ5TmHxn1hftb4CL37FPIW5CVXs+PpByh/ WdEHKeowugIEmyBejvwHuSIjjubuVIUkQiRL+CPW89AtKuItDb5ViPGMGjv0no7DavqK WCE/SGtRbd9VTV+R8VfWAOnKytMM47BDqych04CIkJSydMtori3RUQEZ1qcvqgy+Y7w5 DIJw== X-Gm-Message-State: AOJu0YxdlvOwE/jqcxLi99EIPjUxekO8VPv6xQQqlHs5CCDB5Mr/NHEJ VkOWwTfhaXxmz4DaGbIPeAfFIIXx+iITqbe6Ch0uHg== X-Google-Smtp-Source: AGHT+IFWDxJzxEFFMtKMc5rU0HCVzTupZkJmslPRoVYCRwp3CZq40FFyLx0vbgjdHu7YAqCXRxNESA== X-Received: by 2002:a05:6e02:144e:b0:346:7c6d:c667 with SMTP id p14-20020a056e02144e00b003467c6dc667mr7157469ilo.13.1692897141687; Thu, 24 Aug 2023 10:12:21 -0700 (PDT) Received: from localhost.localdomain (75-166-142-177.hlrn.qwest.net. [75.166.142.177]) by smtp.gmail.com with ESMTPSA id n8-20020a92d9c8000000b0034986f6d9a9sm4722515ilq.78.2023.08.24.10.12.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Aug 2023 10:12:21 -0700 (PDT) Date: Thu, 24 Aug 2023 11:12:18 -0600 Subject: [PATCH 1/7] Introduce type-safe variant of gdb_bfd_openr_iovec MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20230824-gdb-bfd-vec-v1-1-850e4e907ed1@adacore.com> References: <20230824-gdb-bfd-vec-v1-0-850e4e907ed1@adacore.com> In-Reply-To: <20230824-gdb-bfd-vec-v1-0-850e4e907ed1@adacore.com> To: gdb-patches@sourceware.org X-Mailer: b4 0.12.3 X-Spam-Status: No, score=-11.5 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.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Tom Tromey via Gdb-patches Reply-To: Tom Tromey Errors-To: gdb-patches-bounces+public-inbox=simark.ca@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. --- 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..0bb97460898 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 = (gdb_iovec_opener_ftype *) 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 = (gdb_bfd_iovec_base *) 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 = (gdb_bfd_iovec_base *) stream; + return obj->stat (abfd, sb); + }; + + auto close_trampoline = [] (struct bfd *nbfd, void *stream) -> int + { + gdb_bfd_iovec_base *obj = (gdb_bfd_iovec_base *) 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. */ -- 2.40.1