From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com Received: by mail-io1-xd2c.google.com with SMTP id ca18e2360f4ac-79231457b7fso1460439f.3 for ; Thu, 24 Aug 2023 10:12:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1692897141; x=1693501941; h=to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=V4mBnLySFUYHF/S8bo+vQBDQ04llzsp3nJNsxt88bm8=; b=a5jZ9fsQzBy/b9G6UgeTtoWJJExh2DjPVwLUjcatlyjBc3lhsjTPD+8QSbe6qByu3u Dm+eeToB9LbrxJeB2pEM9ph12ntkn4rCvWN+sap2W8tEO1O/vQnv22A71OmagiYjSjBG 1MRwE/IlyWE+1yyUmiMIcD0lPLjs6dZRf2TJF34tHAb/L1C9F8+CVYePdKsCVoI7+ZZq 0ya51kZOAZjDkku4mLM4LrA3M14+EET5gl0HgmwJ43G6GzPgWs9sTei/eauGFzrjjuNX lHTneEaBWIJMt/XVlRv6eMBGJdy53VvAow8gR0lPaSWaTYmGBVo8zInwGKG2WJrkaaS2 8ouQ== 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) From: Tom Tromey 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 List-Id: 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