From patchwork Mon Sep 18 14:52:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 76293 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 653AA385354A for ; Mon, 18 Sep 2023 14:53:45 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 653AA385354A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1695048825; bh=jKPiglA2NdwC+24ZrgfNgXHyzGq4cLgCvdQIgaCyLqg=; h=Date:Subject:References:In-Reply-To:To:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=tigI56ttM7BIzzuAEwGExd0rpFJ/Ek9BmI2ttFQLe8Cv87qt7utd+NcMF4NgdKM1m TnonzBEb/b7kuKybFT/AGHJFcimJU+i2EViHetQcCcT0fDz9sWywJNbjKjKK+KtbDX FrKkHnaY36b7v+GnSea5z9SIvSyqJIrwBtHmASVA= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-io1-xd30.google.com (mail-io1-xd30.google.com [IPv6:2607:f8b0:4864:20::d30]) by sourceware.org (Postfix) with ESMTPS id 10AA53857B9B for ; Mon, 18 Sep 2023 14:52:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 10AA53857B9B Received: by mail-io1-xd30.google.com with SMTP id ca18e2360f4ac-79a7dc97aa2so176843139f.2 for ; Mon, 18 Sep 2023 07:52:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695048771; x=1695653571; 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=jKPiglA2NdwC+24ZrgfNgXHyzGq4cLgCvdQIgaCyLqg=; b=DthGbghA6tiyjCEAZRu31TYzZDjuA3thnZTEt78M6ZaeSQNJsXstSom00aWhMks/Fa OR5YW/ms2PypFD8R+VgPrdcmvZE+U4rnJYogSj/M8TnzzbIu0sMrKgHL8pSSGCsI6yex V5SwRcWQA9n+JlUDnEZVaXLYPAGilFdwj7rGrbZSvP/FjnPj8wkQkFeQQXJmddGY4y05 froT0peznv6mNZ+1qN/HgJsDtkYtS+P7LH5eKn6CyS9e9hhXDvrVAhQBofmo7ADD86KW f3qq/feypQ12ktUP57IiEUK7ZdpuNiXmPwFYxH4BFnGOlZwlHQO4gRNknFrDfTQ4QA9o dbwg== X-Gm-Message-State: AOJu0Yx+ub3QYrl+UZg9CsQoKylIjsz2W40FDv3z5aCgPlIfSv09PCJS aGrwDlumTd3Od/OfVJr9snawUvRCWXHpVyMd1rNw3A== X-Google-Smtp-Source: AGHT+IHkVWNOhny9GTkeZ0L7dHNKPhDy7wRdZzS9AOFtEPm9Pk82RD6pz3kmj62Zu/UJK/+MBVlUGw== X-Received: by 2002:a05:6e02:1302:b0:345:baef:842b with SMTP id g2-20020a056e02130200b00345baef842bmr8493249ilr.25.1695048771282; Mon, 18 Sep 2023 07:52:51 -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.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Sep 2023 07:52:50 -0700 (PDT) Date: Mon, 18 Sep 2023 08:52:51 -0600 Subject: [PATCH v2 6/7] Convert solib-rocm to new type-safe gdb_bfd_openr_iovec MIME-Version: 1.0 Message-Id: <20230918-gdb-bfd-vec-v2-6-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 X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Tom Tromey via Gdb-patches From: Tom Tromey Reply-To: Tom Tromey Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" This converts the solib-rocm BFD iovec implementations to the new type-safe gdb_bfd_openr_iovec. They were already essentially using this approach, just without the type-safe wrapper. Thanks to Lancelot Six for testing and fixing this patch. Co-Authored-By: Lancelot Six Acked-by: Lancelot Six --- gdb/solib-rocm.c | 66 ++++++++++++++++---------------------------------------- 1 file changed, 18 insertions(+), 48 deletions(-) diff --git a/gdb/solib-rocm.c b/gdb/solib-rocm.c index 56c210e9fa5..6b84f09e88b 100644 --- a/gdb/solib-rocm.c +++ b/gdb/solib-rocm.c @@ -268,24 +268,13 @@ namespace { /* Interface to interact with a ROCm code object stream. */ -struct rocm_code_object_stream +struct rocm_code_object_stream : public gdb_bfd_iovec_base { DISABLE_COPY_AND_ASSIGN (rocm_code_object_stream); - /* Copy SIZE bytes from the underlying objfile storage starting at OFFSET - into the user provided buffer BUF. + int stat (bfd *abfd, struct stat *sb) final override; - Return the number of bytes actually copied (might be inferior to SIZE if - the end of the stream is reached). */ - virtual file_ptr read (void *buf, file_ptr size, file_ptr offset) = 0; - - /* Retrieve file information in SB. - - Return 0 on success. On failure, set the appropriate bfd error number - (using bfd_set_error) and return -1. */ - int stat (struct stat *sb); - - virtual ~rocm_code_object_stream () = default; + ~rocm_code_object_stream () override = default; protected: rocm_code_object_stream () = default; @@ -298,7 +287,7 @@ struct rocm_code_object_stream }; int -rocm_code_object_stream::stat (struct stat *sb) +rocm_code_object_stream::stat (bfd *, struct stat *sb) { const LONGEST size = this->size (); if (size == -1) @@ -319,7 +308,8 @@ struct rocm_code_object_stream_file final : rocm_code_object_stream rocm_code_object_stream_file (inferior *inf, int fd, ULONGEST offset, ULONGEST size); - file_ptr read (void *buf, file_ptr size, file_ptr offset) override; + file_ptr read (bfd *abfd, void *buf, file_ptr size, + file_ptr offset) override; LONGEST size () override; @@ -348,7 +338,7 @@ rocm_code_object_stream_file::rocm_code_object_stream_file } file_ptr -rocm_code_object_stream_file::read (void *buf, file_ptr size, +rocm_code_object_stream_file::read (bfd *, void *buf, file_ptr size, file_ptr offset) { fileio_error target_errno; @@ -423,7 +413,8 @@ struct rocm_code_object_stream_memory final : public rocm_code_object_stream rocm_code_object_stream_memory (gdb::byte_vector buffer); - file_ptr read (void *buf, file_ptr size, file_ptr offset) override; + file_ptr read (bfd *abfd, void *buf, file_ptr size, + file_ptr offset) override; protected: @@ -445,7 +436,7 @@ rocm_code_object_stream_memory::rocm_code_object_stream_memory } file_ptr -rocm_code_object_stream_memory::read (void *buf, file_ptr size, +rocm_code_object_stream_memory::read (bfd *, void *buf, file_ptr size, file_ptr offset) { if (size > m_objfile_image.size () - offset) @@ -457,8 +448,8 @@ rocm_code_object_stream_memory::read (void *buf, file_ptr size, } /* anonymous namespace */ -static void * -rocm_bfd_iovec_open (bfd *abfd, void *inferior_void) +static gdb_bfd_iovec_base * +rocm_bfd_iovec_open (bfd *abfd, inferior *inferior) { gdb::string_view uri (bfd_get_filename (abfd)); gdb::string_view protocol_delim = "://"; @@ -522,7 +513,6 @@ rocm_bfd_iovec_open (bfd *abfd, void *inferior_void) { ULONGEST offset = 0; ULONGEST size = 0; - inferior *inferior = static_cast (inferior_void); auto try_strtoulst = [] (gdb::string_view v) { @@ -607,28 +597,6 @@ rocm_bfd_iovec_open (bfd *abfd, void *inferior_void) } } -static int -rocm_bfd_iovec_close (bfd *nbfd, void *data) -{ - delete static_cast (data); - - return 0; -} - -static file_ptr -rocm_bfd_iovec_pread (bfd *abfd, void *data, void *buf, file_ptr size, - file_ptr offset) -{ - return static_cast (data)->read (buf, size, - offset); -} - -static int -rocm_bfd_iovec_stat (bfd *abfd, void *data, struct stat *sb) -{ - return static_cast (data)->stat (sb); -} - static gdb_bfd_ref_ptr rocm_solib_bfd_open (const char *pathname) { @@ -636,10 +604,12 @@ rocm_solib_bfd_open (const char *pathname) if (strstr (pathname, "://") == nullptr) return svr4_so_ops.bfd_open (pathname); - gdb_bfd_ref_ptr abfd - = gdb_bfd_openr_iovec (pathname, "elf64-amdgcn", rocm_bfd_iovec_open, - current_inferior (), rocm_bfd_iovec_pread, - rocm_bfd_iovec_close, rocm_bfd_iovec_stat); + auto open = [] (bfd *nbfd) -> gdb_bfd_iovec_base * + { + return rocm_bfd_iovec_open (nbfd, current_inferior ()); + }; + + gdb_bfd_ref_ptr abfd = gdb_bfd_openr_iovec (pathname, "elf64-amdgcn", open); if (abfd == nullptr) error (_("Could not open `%s' as an executable file: %s"), pathname,