From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 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-il1-x12d.google.com with SMTP id e9e14a558f8ab-34fcc3ac97bso9184965ab.0 for ; Mon, 18 Sep 2023 07:52:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1695048768; x=1695653568; darn=sourceware.org; h=cc: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=AJF3nIhEiE1zeXXDLLiy8QS55W+mp+1OYnWofN0jiJY=; b=Gtp5YGMb/k9v18tk8xwR+mKXyW352NTtC6x1XprPR6zREwIfIsINnptJE2/096OTnD UFz/oD9LxCrEdgvu/32fN4igpw7tlOaLGsm5uBovR03nzPIKp0DqnXKXBGsTjYJxbWD0 XUAnLMbkI2jD3ZXjbve6488pO3V8DlgTZbFrKEgYHHbnByRJtKDxxzTSei5rbmGCvoxq tl0Or1bhbXmQ7xZHwsM6fWTOBwnCqOprncPLSEGvr+woUNNr7KllGzAyKLUJSd3Hrymf pi1UTroc04mRAQBtU6/KzVIvVJOuDWSksUsutcl8gD684Eesn/RxIox4mG8JXtoVMoFx FFVg== 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) From: Tom Tromey 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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 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. 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. */ -- 2.40.1