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 11F6A3858C2A for ; Mon, 18 Sep 2023 14:52:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 11F6A3858C2A 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-34f6c725d94so14151385ab.0 for ; Mon, 18 Sep 2023 07:52:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1695048769; x=1695653569; darn=sourceware.org; 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=48wBCx8DPtltGFxBqWOdPq3STa1hIO2TCEYEeRHpZgE=; b=lBSYnt8LdjYU30owkfwpfT4E2smnijqdTvEoCuEjuVp2EMefZ3+VwbhWCEacaNVr10 sqRYjWM0lwnqMEvUwQ08Q2DBW9peO5Y6/CoBY2AyUHleMfaA7r2vz2rDe528FY54dMYi M8DxwIpX55gy6/l5BzW2MIc8GAegJYN+lbhZqGOTjoTmBTiXumjrkARnt8j361kb4Sdn yChmWYRW5EHduHVLGelyxairO6EAt2WVac81l2ZEfutSr3yRmB2RXerz/bZ/5bDSkG1P UoBAVzKtLj4rdj0MM8elMnHnS+eqTUasCdDbggC1YhbXbObaWw0pjurPl6hu7jnOpMhF OPmQ== 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) From: Tom Tromey 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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 List-Id: 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. */ -- 2.40.1