X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fsolib-spu.c;h=09a40474a754fcddc5c73641d4235aed7496fb02;hb=bcef180ccbeb8a6a9301065ede1fe038c3040fa5;hp=fb17d2c775dd0d76cdfe935c14223eec9e69f629;hpb=94af9270db6b89f9a3a1f72e8f5091fee8b0294b;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/solib-spu.c b/gdb/solib-spu.c index fb17d2c775..09a40474a7 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, 2010 Free Software Foundation, Inc. + Copyright (C) 2009-2012 Free Software Foundation, Inc. Contributed by Ulrich Weigand . @@ -19,6 +19,7 @@ along with this program. If not, see . */ #include "defs.h" +#include "solib-spu.h" #include "gdbcore.h" #include "gdb_string.h" #include "gdb_assert.h" @@ -34,6 +35,8 @@ #include "observer.h" #include "breakpoint.h" #include "gdbthread.h" +#include "exceptions.h" +#include "gdb_bfd.h" #include "spu-tdep.h" @@ -84,13 +87,69 @@ spu_skip_standalone_loader (void) this will step past the first instruction of the stand-alone SPE executable loader, but we don't care about that. */ - inferior_thread ()->in_infcall = 1; /* Suppress MI messages. */ + inferior_thread ()->control.in_infcall = 1; /* Suppress MI messages. */ - target_resume (inferior_ptid, 1, TARGET_SIGNAL_0); + target_resume (inferior_ptid, 1, GDB_SIGNAL_0); target_wait (minus_one_ptid, &ws, 0); set_executing (minus_one_ptid, 0); - inferior_thread ()->in_infcall = 0; + inferior_thread ()->control.in_infcall = 0; + } +} + +static const struct objfile_data *ocl_program_data_key; + +/* Appends OpenCL programs to the list of `struct so_list' objects. */ +static void +append_ocl_sos (struct so_list **link_ptr) +{ + CORE_ADDR *ocl_program_addr_base; + struct objfile *objfile; + + ALL_OBJFILES (objfile) + { + ocl_program_addr_base = objfile_data (objfile, ocl_program_data_key); + if (ocl_program_addr_base != NULL) + { + enum bfd_endian byte_order = bfd_big_endian (objfile->obfd)? + BFD_ENDIAN_BIG : BFD_ENDIAN_LITTLE; + volatile struct gdb_exception ex; + TRY_CATCH (ex, RETURN_MASK_ALL) + { + CORE_ADDR data = + read_memory_unsigned_integer (*ocl_program_addr_base, + sizeof (CORE_ADDR), + byte_order); + if (data != 0x0) + { + struct so_list *new; + + /* Allocate so_list structure. */ + new = XZALLOC (struct so_list); + + /* Encode FD and object ID in path name. */ + xsnprintf (new->so_name, sizeof new->so_name, "@%s <%d>", + hex_string (data), + SPUADDR_SPU (*ocl_program_addr_base)); + strcpy (new->so_original_name, new->so_name); + + *link_ptr = new; + link_ptr = &new->next; + } + } + if (ex.reason < 0) + { + /* Ignore memory errors. */ + switch (ex.error) + { + case MEMORY_ERROR: + break; + default: + throw_exception (ex); + break; + } + } + } } } @@ -99,7 +158,7 @@ spu_skip_standalone_loader (void) static struct so_list * spu_current_sos (void) { - enum bfd_endian byte_order = gdbarch_byte_order (target_gdbarch); + enum bfd_endian byte_order = gdbarch_byte_order (target_gdbarch ()); struct so_list *head; struct so_list **link_ptr; @@ -124,6 +183,7 @@ spu_current_sos (void) if (size == 4) { int fd = extract_unsigned_integer (buf, 4, byte_order); + spu_relocate_main_executable (fd); /* Re-enable breakpoints after main SPU context was established; @@ -161,13 +221,17 @@ spu_current_sos (void) /* Encode FD and object ID in path name. Choose the name so as not to conflict with any (normal) SVR4 library path name. */ - xsnprintf (new->so_name, sizeof new->so_name, "@0x%llx <%d>", addr, fd); + xsnprintf (new->so_name, sizeof new->so_name, "@%s <%d>", + hex_string (addr), fd); strcpy (new->so_original_name, new->so_name); *link_ptr = new; link_ptr = &new->next; } + /* Append OpenCL sos. */ + append_ocl_sos (link_ptr); + return head; } @@ -262,16 +326,16 @@ spu_bfd_fopen (char *name, CORE_ADDR addr) CORE_ADDR *open_closure = xmalloc (sizeof (CORE_ADDR)); *open_closure = addr; - nbfd = bfd_openr_iovec (xstrdup (name), "elf32-spu", - spu_bfd_iovec_open, open_closure, - spu_bfd_iovec_pread, spu_bfd_iovec_close, - spu_bfd_iovec_stat); + 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) return NULL; if (!bfd_check_format (nbfd, bfd_object)) { - bfd_close (nbfd); + gdb_bfd_unref (nbfd); return NULL; } @@ -306,9 +370,11 @@ spu_bfd_open (char *pathname) if (spu_name) { int sect_size = bfd_section_size (abfd, spu_name); + if (sect_size > 20) { char *buf = alloca (sect_size - 20 + strlen (original_name) + 1); + bfd_get_section_contents (abfd, spu_name, buf, 20, sect_size - 20); buf[sect_size - 20] = '\0'; @@ -351,15 +417,53 @@ spu_enable_break (struct objfile *objfile) if (spe_event_sym) { CORE_ADDR addr = SYMBOL_VALUE_ADDRESS (spe_event_sym); - addr = gdbarch_convert_from_func_ptr_addr (target_gdbarch, addr, + + addr = gdbarch_convert_from_func_ptr_addr (target_gdbarch (), addr, ¤t_target); - create_solib_event_breakpoint (target_gdbarch, addr); + create_solib_event_breakpoint (target_gdbarch (), addr); return 1; } return 0; } +/* Enable shared library breakpoint for the + OpenCL runtime running on the SPU. */ +static void +ocl_enable_break (struct objfile *objfile) +{ + struct minimal_symbol *event_sym = NULL; + struct minimal_symbol *addr_sym = NULL; + + /* The OpenCL runtime on the SPU will call __opencl_program_update_event + whenever an OpenCL program is loaded. */ + event_sym = lookup_minimal_symbol ("__opencl_program_update_event", NULL, + objfile); + /* The PPU address of the OpenCL program can be found + at opencl_elf_image_address. */ + addr_sym = lookup_minimal_symbol ("opencl_elf_image_address", NULL, objfile); + + if (event_sym && addr_sym) + { + /* Place a solib_event breakpoint on the symbol. */ + CORE_ADDR event_addr = SYMBOL_VALUE_ADDRESS (event_sym); + create_solib_event_breakpoint (get_objfile_arch (objfile), event_addr); + + /* 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) + { + CORE_ADDR *ocl_program_addr_base = OBSTACK_CALLOC ( + &objfile->objfile_obstack, + objfile->sections_end - objfile->sections, + CORE_ADDR); + *ocl_program_addr_base = SYMBOL_VALUE_ADDRESS (addr_sym); + set_objfile_data (objfile, ocl_program_data_key, + ocl_program_addr_base); + } + } +} + /* Create inferior hook. */ static void spu_solib_create_inferior_hook (int from_tty) @@ -427,14 +531,25 @@ spu_solib_loaded (struct so_list *so) { if (strstr (so->so_original_name, "/libspe") != NULL) { - solib_read_symbols (so, so->from_tty ? SYMFILE_VERBOSE : 0); + solib_read_symbols (so, 0); spu_enable_break (so->objfile); } + /* In case the OpenCL runtime is loaded we install a breakpoint + to get notified whenever an OpenCL program gets loaded. */ + if (strstr (so->so_name, "CLRuntimeAccelCellSPU@") != NULL) + { + solib_read_symbols (so, 0); + ocl_enable_break (so->objfile); + } } +/* -Wmissing-prototypes */ +extern initialize_file_ftype _initialize_spu_solib; + void _initialize_spu_solib (void) { observer_attach_solib_loaded (spu_solib_loaded); + ocl_program_data_key = register_objfile_data (); }