espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-21 18:39:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Change solib-spu.c to use type-safe registry

Browse Source 
This changes solib-spu.c to use the type-safe registry.

2019-07-10  Tom Tromey  <tromey@adacore.com>

	* solib-spu.c (ocl_program_data_key): Change type.
	(append_ocl_sos, ocl_enable_break, _initialize_spu_solib):
	Update.
This commit is contained in:
Tom Tromey
2019-06-27 13:52:42 -06:00
parent a269fbf12d
commit 48c66e1d07
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gdb/ChangeLog
View File

@ -1,3 +1,9 @@
2019-07-10 Tom Tromey <tromey@adacore.com>
* solib-spu.c (ocl_program_data_key): Change type.
(append_ocl_sos, ocl_enable_break, _initialize_spu_solib):
Update.
2019-07-10 Tom Tromey <tromey@adacore.com> 2019-07-10 Tom Tromey <tromey@adacore.com>
* solib-aix.c (lm_info_aix_p): Remove typedef. Don't define VEC. * solib-aix.c (lm_info_aix_p): Remove typedef. Don't define VEC.

12
gdb/solib-spu.c
View File

@ -94,7 +94,8 @@ spu_skip_standalone_loader (void)
} }
} }
static const struct objfile_data *ocl_program_data_key; static objfile_key<CORE_ADDR, gdb::noop_deleter<CORE_ADDR>>
ocl_program_data_key;
/* Appends OpenCL programs to the list of `struct so_list' objects. */ /* Appends OpenCL programs to the list of `struct so_list' objects. */
static void static void
@ -104,8 +105,7 @@ append_ocl_sos (struct so_list **link_ptr)
for (objfile *objfile : current_program_space->objfiles ()) for (objfile *objfile : current_program_space->objfiles ())
{ {
ocl_program_addr_base ocl_program_addr_base = ocl_program_data_key.get (objfile);
= (CORE_ADDR *) objfile_data (objfile, ocl_program_data_key);
if (ocl_program_addr_base != NULL) if (ocl_program_addr_base != NULL)
{ {
enum bfd_endian byte_order = bfd_big_endian (objfile->obfd)? 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 /* Store the address of the symbol that will point to OpenCL program
using the per-objfile private data mechanism. */ 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 ( CORE_ADDR *ocl_program_addr_base = OBSTACK_CALLOC (
&objfile->objfile_obstack, &objfile->objfile_obstack,
objfile->sections_end - objfile->sections, objfile->sections_end - objfile->sections,
CORE_ADDR); CORE_ADDR);
*ocl_program_addr_base = BMSYMBOL_VALUE_ADDRESS (addr_sym); *ocl_program_addr_base = BMSYMBOL_VALUE_ADDRESS (addr_sym);
set_objfile_data (objfile, ocl_program_data_key, ocl_program_data_key.set (objfile, ocl_program_addr_base);
ocl_program_addr_base);
} }
} }
} }
@ -544,6 +543,5 @@ void
_initialize_spu_solib (void) _initialize_spu_solib (void)
{ {
gdb::observers::solib_loaded.attach (spu_solib_loaded); gdb::observers::solib_loaded.attach (spu_solib_loaded);
ocl_program_data_key = register_objfile_data ();
} }