From patchwork Wed Jul 10 15:39:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 33657 Received: (qmail 125311 invoked by alias); 10 Jul 2019 15:39:57 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 125167 invoked by uid 89); 10 Jul 2019 15:39:56 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.8 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_STOCKGEN, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.1 spammy=HContent-Transfer-Encoding:8bit X-HELO: rock.gnat.com Received: from rock.gnat.com (HELO rock.gnat.com) (205.232.38.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 10 Jul 2019 15:39:54 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id D7126561D6; Wed, 10 Jul 2019 11:39:52 -0400 (EDT) Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id clfIf745LCUY; Wed, 10 Jul 2019 11:39:52 -0400 (EDT) Received: from murgatroyd.Home (97-122-178-82.hlrn.qwest.net [97.122.178.82]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by rock.gnat.com (Postfix) with ESMTPSA id 80F0756128; Wed, 10 Jul 2019 11:39:52 -0400 (EDT) From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 8/9] Change solib-spu.c to use type-safe registry Date: Wed, 10 Jul 2019 09:39:46 -0600 Message-Id: <20190710153947.25721-9-tromey@adacore.com> In-Reply-To: <20190710153947.25721-1-tromey@adacore.com> References: <20190710153947.25721-1-tromey@adacore.com> MIME-Version: 1.0 This changes solib-spu.c to use the type-safe registry. gdb/ChangeLog 2019-07-10 Tom Tromey * solib-spu.c (ocl_program_data_key): Change type. (append_ocl_sos, ocl_enable_break, _initialize_spu_solib): Update. --- gdb/ChangeLog | 6 ++++++ gdb/solib-spu.c | 12 +++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/gdb/solib-spu.c b/gdb/solib-spu.c index c5dc8639f1e..448e1a64f4c 100644 --- a/gdb/solib-spu.c +++ b/gdb/solib-spu.c @@ -94,7 +94,8 @@ spu_skip_standalone_loader (void) } } -static const struct objfile_data *ocl_program_data_key; +static objfile_key> + ocl_program_data_key; /* Appends OpenCL programs to the list of `struct so_list' objects. */ static void @@ -104,8 +105,7 @@ append_ocl_sos (struct so_list **link_ptr) for (objfile *objfile : current_program_space->objfiles ()) { - ocl_program_addr_base - = (CORE_ADDR *) objfile_data (objfile, ocl_program_data_key); + ocl_program_addr_base = ocl_program_data_key.get (objfile); if (ocl_program_addr_base != NULL) { enum bfd_endian byte_order = bfd_big_endian (objfile->obfd)? @@ -448,15 +448,14 @@ ocl_enable_break (struct objfile *objfile) /* Store the address of the symbol that will point to OpenCL program using the per-objfile private data mechanism. */ - if (objfile_data (objfile, ocl_program_data_key) == NULL) + if (ocl_program_data_key.get (objfile) == NULL) { CORE_ADDR *ocl_program_addr_base = OBSTACK_CALLOC ( &objfile->objfile_obstack, objfile->sections_end - objfile->sections, CORE_ADDR); *ocl_program_addr_base = BMSYMBOL_VALUE_ADDRESS (addr_sym); - set_objfile_data (objfile, ocl_program_data_key, - ocl_program_addr_base); + ocl_program_data_key.set (objfile, ocl_program_addr_base); } } } @@ -544,6 +543,5 @@ void _initialize_spu_solib (void) { gdb::observers::solib_loaded.attach (spu_solib_loaded); - ocl_program_data_key = register_objfile_data (); }