X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fsolib-spu.c;h=c5dc8639f1e286afab8edc0fbe93f39e3e36f998;hb=219920a7c49069e30a7be2b166099bf795837a6d;hp=468ab1a35056247c978384f602b7ee682ef2b145;hpb=19ba03f49581e407097a3e4821a957c422551ae5;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/solib-spu.c b/gdb/solib-spu.c index 468ab1a350..c5dc8639f1 100644 --- a/gdb/solib-spu.c +++ b/gdb/solib-spu.c @@ -1,5 +1,5 @@ /* Cell SPU GNU/Linux support -- shared library handling. - Copyright (C) 2009-2015 Free Software Foundation, Inc. + Copyright (C) 2009-2019 Free Software Foundation, Inc. Contributed by Ulrich Weigand . @@ -30,7 +30,7 @@ #include "solist.h" #include "inferior.h" #include "objfiles.h" -#include "observer.h" +#include "observable.h" #include "breakpoint.h" #include "gdbthread.h" #include "gdb_bfd.h" @@ -101,9 +101,8 @@ static void append_ocl_sos (struct so_list **link_ptr) { CORE_ADDR *ocl_program_addr_base; - struct objfile *objfile; - ALL_OBJFILES (objfile) + for (objfile *objfile : current_program_space->objfiles ()) { ocl_program_addr_base = (CORE_ADDR *) objfile_data (objfile, ocl_program_data_key); @@ -111,7 +110,7 @@ append_ocl_sos (struct so_list **link_ptr) { enum bfd_endian byte_order = bfd_big_endian (objfile->obfd)? BFD_ENDIAN_BIG : BFD_ENDIAN_LITTLE; - TRY + try { CORE_ADDR data = read_memory_unsigned_integer (*ocl_program_addr_base, @@ -134,7 +133,7 @@ append_ocl_sos (struct so_list **link_ptr) link_ptr = &newobj->next; } } - CATCH (ex, RETURN_MASK_ALL) + catch (const gdb_exception &ex) { /* Ignore memory errors. */ switch (ex.error) @@ -142,11 +141,10 @@ append_ocl_sos (struct so_list **link_ptr) case MEMORY_ERROR: break; default: - throw_exception (ex); + throw; break; } } - END_CATCH } } } @@ -171,7 +169,7 @@ spu_current_sos (void) ; /* Determine list of SPU ids. */ - size = target_read (¤t_target, TARGET_OBJECT_SPU, NULL, + size = target_read (current_top_target (), TARGET_OBJECT_SPU, NULL, buf, 0, sizeof buf); /* Do not add stand-alone SPE executable context as shared library, @@ -206,7 +204,7 @@ spu_current_sos (void) already created the SPE context, but not installed the object-id yet. Skip such entries; we'll be back for them later. */ xsnprintf (annex, sizeof annex, "%d/object-id", fd); - len = target_read (¤t_target, TARGET_OBJECT_SPU, annex, + len = target_read (current_top_target (), TARGET_OBJECT_SPU, annex, (gdb_byte *) id, 0, sizeof id); if (len <= 0 || len >= sizeof id) continue; @@ -296,7 +294,7 @@ spu_bfd_iovec_pread (bfd *abfd, void *stream, void *buf, CORE_ADDR addr = *(CORE_ADDR *)stream; int ret; - ret = target_read_memory (addr + offset, buf, nbytes); + ret = target_read_memory (addr + offset, (gdb_byte *) buf, nbytes); if (ret != 0) { bfd_set_error (bfd_error_invalid_operation); @@ -319,36 +317,32 @@ spu_bfd_iovec_stat (bfd *abfd, void *stream, struct stat *sb) return 0; } -static bfd * -spu_bfd_fopen (char *name, CORE_ADDR addr) +static gdb_bfd_ref_ptr +spu_bfd_fopen (const char *name, CORE_ADDR addr) { - bfd *nbfd; CORE_ADDR *open_closure = XNEW (CORE_ADDR); *open_closure = addr; - nbfd = gdb_bfd_openr_iovec (name, "elf32-spu", - spu_bfd_iovec_open, open_closure, - spu_bfd_iovec_pread, spu_bfd_iovec_close, - spu_bfd_iovec_stat); - if (!nbfd) + gdb_bfd_ref_ptr nbfd (gdb_bfd_openr_iovec (name, "elf32-spu", + spu_bfd_iovec_open, open_closure, + spu_bfd_iovec_pread, + spu_bfd_iovec_close, + spu_bfd_iovec_stat)); + if (nbfd == NULL) return NULL; - if (!bfd_check_format (nbfd, bfd_object)) - { - gdb_bfd_unref (nbfd); - return NULL; - } + if (!bfd_check_format (nbfd.get (), bfd_object)) + return NULL; return nbfd; } /* Open shared library BFD. */ -static bfd * -spu_bfd_open (char *pathname) +static gdb_bfd_ref_ptr +spu_bfd_open (const char *pathname) { - char *original_name = strrchr (pathname, '@'); - bfd *abfd; + const char *original_name = strrchr (pathname, '@'); asection *spu_name; unsigned long long addr; int fd; @@ -362,22 +356,23 @@ spu_bfd_open (char *pathname) internal_error (__FILE__, __LINE__, "bad object ID"); /* Open BFD representing SPE executable. */ - abfd = spu_bfd_fopen (original_name, (CORE_ADDR) addr); - if (!abfd) + gdb_bfd_ref_ptr abfd (spu_bfd_fopen (original_name, (CORE_ADDR) addr)); + if (abfd == NULL) error (_("Cannot read SPE executable at %s"), original_name); /* Retrieve SPU name note. */ - spu_name = bfd_get_section_by_name (abfd, ".note.spu_name"); + spu_name = bfd_get_section_by_name (abfd.get (), ".note.spu_name"); if (spu_name) { - int sect_size = bfd_section_size (abfd, spu_name); + int sect_size = bfd_section_size (abfd.get (), spu_name); if (sect_size > 20) { char *buf = (char *) alloca (sect_size - 20 + strlen (original_name) + 1); - bfd_get_section_contents (abfd, spu_name, buf, 20, sect_size - 20); + bfd_get_section_contents (abfd.get (), spu_name, buf, 20, + sect_size - 20); buf[sect_size - 20] = '\0'; strcat (buf, original_name); @@ -401,7 +396,7 @@ spu_lookup_lib_symbol (struct objfile *objfile, if (svr4_so_ops.lookup_lib_global_symbol != NULL) return svr4_so_ops.lookup_lib_global_symbol (objfile, name, domain); - return (struct block_symbol) {NULL, NULL}; + return {}; } /* Enable shared library breakpoint. */ @@ -421,7 +416,7 @@ spu_enable_break (struct objfile *objfile) CORE_ADDR addr = BMSYMBOL_VALUE_ADDRESS (spe_event_sym); addr = gdbarch_convert_from_func_ptr_addr (target_gdbarch (), addr, - ¤t_target); + current_top_target ()); create_solib_event_breakpoint (target_gdbarch (), addr); return 1; } @@ -545,13 +540,10 @@ spu_solib_loaded (struct so_list *so) } } -/* -Wmissing-prototypes */ -extern initialize_file_ftype _initialize_spu_solib; - void _initialize_spu_solib (void) { - observer_attach_solib_loaded (spu_solib_loaded); + gdb::observers::solib_loaded.attach (spu_solib_loaded); ocl_program_data_key = register_objfile_data (); }