From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-il1-x136.google.com (mail-il1-x136.google.com [IPv6:2607:f8b0:4864:20::136]) by sourceware.org (Postfix) with ESMTPS id 4BF1B3858296 for ; Thu, 24 Aug 2023 17:12:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4BF1B3858296 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-x136.google.com with SMTP id e9e14a558f8ab-34b0f3b792dso145355ab.3 for ; Thu, 24 Aug 2023 10:12:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1692897143; x=1693501943; 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=mzCkBH4PhYG3AtlNULvqxU65gtfaUKr0xy3wT1ryD44=; b=RLYTcN9nkApAMg/8QQrSm6udWitFjpQdIvoaK2+bY/HON/52+NEX8lvziFHKIZ1+N+ cYTNwBkfbWLM7QjLIDSt2502w+Xe/XkY40pD3xrgARGDArnae9/h83TasRWScSzQhj2D fKFeCurDvvOb2WQUmiaKmyIDrEW2aytk2cdyeNzkf28VJtn6iFV29RQE4uj1MqUIS1Ah dLlJXNPnFa92GpgB+GVbg/EtvAvnXWnrQdu5aLRe/g8IvKPS4rZ+/WTEQbNppZxb/RQp Zf2skLCW6PzIoSsGlXHVjZIAU1CI29D8V7ZiyjSVusZb/uqL9rjT4JGArgHgyn6anoU/ B6Nw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692897143; x=1693501943; 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=mzCkBH4PhYG3AtlNULvqxU65gtfaUKr0xy3wT1ryD44=; b=dVelaXEMBe7sybaBpfz208VjCz5w+U0mY4RBRSA71Vx+Vv0+jKwUnBZOUH5wi1yW+A zSG9hb3oEU4Se1f5t5jRcImkasQevwKjWJzbqzjwrFT94v+an8hmrRAhyC7J84RMl2Ok 1IswGs7jMzhmbUnqy1jIXg21aBHDzcbahV1q+bWuZh8B+5RT9Gw3bDf+ZoVp/WXn0iLW VYTFIznYE24v2WfO7QGXbxtTfCQ/dxlf0f9vKhuSyglcKNj7N7djYvib55IiTqn3ijAA 1d4fMJHX0+G63FfsVqrOeGeQjeKAVYpn9LNen0z0RnavN/lwg6inXLQV9+ZMufFDofqh HBtA== X-Gm-Message-State: AOJu0YwmsBoXEdwOdT4EqMFO8kUmrLtVDf5ANzu9TRIa1171mfqXTLKT ChntVxFtDayu2LDKsX4ipbXiTszgVxfC4kLWWrKhaQ== X-Google-Smtp-Source: AGHT+IEGjxPxBo1I2LnOjrom9jdw5yi+wzc90u6wmWco60c4hfOVjzLlFRbNn/rkKCt0RKi85w7qdw== X-Received: by 2002:a05:6e02:ca9:b0:349:98eb:3637 with SMTP id 9-20020a056e020ca900b0034998eb3637mr6127274ilg.15.1692897142908; Thu, 24 Aug 2023 10:12:22 -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.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Aug 2023 10:12:22 -0700 (PDT) From: Tom Tromey Date: Thu, 24 Aug 2023 11:12:20 -0600 Subject: [PATCH 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: <20230824-gdb-bfd-vec-v1-3-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.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 733d5e109bb..2f8bb33997b 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