Make "set scheduler-locking step" depend on user intention, only

[deliverable/binutils-gdb.git] / gdb / solib-spu.c

diff --git a/gdb/solib-spu.c b/gdb/solib-spu.c
index 6eb45a507b6f27aa7276be004ab95ac7da4a0d2a..250cf212eda119ca33300c7f6db4f0ec3a297562 100644 (file)
--- 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-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2015 Free Software Foundation, Inc.
 
    Contributed by Ulrich Weigand <uweigand@de.ibm.com>.
 
@@ -21,9 +21,7 @@
 #include "defs.h"
 #include "solib-spu.h"
 #include "gdbcore.h"
-#include "gdb_string.h"
-#include "gdb_assert.h"
-#include "gdb_stat.h"
+#include <sys/stat.h>
 #include "arch-utils.h"
 #include "bfd.h"
 #include "symtab.h"
@@ -35,7 +33,6 @@
 #include "observer.h"
 #include "breakpoint.h"
 #include "gdbthread.h"
-#include "exceptions.h"
 #include "gdb_bfd.h"
 
 #include "spu-tdep.h"
@@ -113,8 +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;
-         volatile struct gdb_exception ex;
-         TRY_CATCH (ex, RETURN_MASK_ALL)
+         TRY
            {
              CORE_ADDR data =
                read_memory_unsigned_integer (*ocl_program_addr_base,
@@ -122,22 +118,22 @@ append_ocl_sos (struct so_list **link_ptr)
                                              byte_order);
              if (data != 0x0)
                {
-                 struct so_list *new;
+                 struct so_list *newobj;
 
                  /* Allocate so_list structure.  */
-                 new = XZALLOC (struct so_list);
+                 newobj = XCNEW (struct so_list);
 
                  /* Encode FD and object ID in path name.  */
-                 xsnprintf (new->so_name, sizeof new->so_name, "@%s <%d>",
+                 xsnprintf (newobj->so_name, sizeof newobj->so_name, "@%s <%d>",
                             hex_string (data),
                             SPUADDR_SPU (*ocl_program_addr_base));
-                 strcpy (new->so_original_name, new->so_name);
+                 strcpy (newobj->so_original_name, newobj->so_name);
 
-                 *link_ptr = new;
-                 link_ptr = &new->next;
+                 *link_ptr = newobj;
+                 link_ptr = &newobj->next;
                }
            }
-         if (ex.reason < 0)
+         CATCH (ex, RETURN_MASK_ALL)
            {
              /* Ignore memory errors.  */
              switch (ex.error)
@@ -149,6 +145,7 @@ append_ocl_sos (struct so_list **link_ptr)
                  break;
                }
            }
+         END_CATCH
        }
     }
 }
@@ -162,7 +159,7 @@ spu_current_sos (void)
   struct so_list *head;
   struct so_list **link_ptr;
 
-  char buf[MAX_SPE_FD * 4];
+  gdb_byte buf[MAX_SPE_FD * 4];
   int i, size;
 
   /* First, retrieve the SVR4 shared library list.  */
@@ -198,7 +195,7 @@ spu_current_sos (void)
   for (i = 0; i < size; i += 4)
     {
       int fd = extract_unsigned_integer (buf + i, 4, byte_order);
-      struct so_list *new;
+      struct so_list *newobj;
 
       unsigned long long addr;
       char annex[32], id[100];
@@ -209,7 +206,7 @@ spu_current_sos (void)
         yet.  Skip such entries; we'll be back for them later.  */
       xsnprintf (annex, sizeof annex, "%d/object-id", fd);
       len = target_read (&current_target, TARGET_OBJECT_SPU, annex,
-                        id, 0, sizeof id);
+                        (gdb_byte *) id, 0, sizeof id);
       if (len <= 0 || len >= sizeof id)
        continue;
       id[len] = 0;
@@ -217,16 +214,16 @@ spu_current_sos (void)
        continue;
 
       /* Allocate so_list structure.  */
-      new = XZALLOC (struct so_list);
+      newobj = XCNEW (struct so_list);
 
       /* 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, "@%s <%d>",
+      xsnprintf (newobj->so_name, sizeof newobj->so_name, "@%s <%d>",
                 hex_string (addr), fd);
-      strcpy (new->so_original_name, new->so_name);
+      strcpy (newobj->so_original_name, newobj->so_name);
 
-      *link_ptr = new;
-      link_ptr = &new->next;
+      *link_ptr = newobj;
+      link_ptr = &newobj->next;
     }
 
   /* Append OpenCL sos.  */
@@ -286,7 +283,9 @@ static int
 spu_bfd_iovec_close (bfd *nbfd, void *stream)
 {
   xfree (stream);
-  return 1;
+
+  /* Zero means success.  */
+  return 0;
 }
 
 static file_ptr
@@ -390,7 +389,7 @@ spu_bfd_open (char *pathname)
 
 /* Lookup global symbol in a SPE executable.  */
 static struct symbol *
-spu_lookup_lib_symbol (const struct objfile *objfile,
+spu_lookup_lib_symbol (struct objfile *objfile,
                       const char *name,
                       const domain_enum domain)
 {
@@ -406,7 +405,7 @@ spu_lookup_lib_symbol (const struct objfile *objfile,
 static int
 spu_enable_break (struct objfile *objfile)
 {
-  struct minimal_symbol *spe_event_sym = NULL;
+  struct bound_minimal_symbol spe_event_sym;
 
   /* The libspe library will call __spe_context_update_event whenever any
      SPE context is allocated or destroyed.  */
@@ -414,9 +413,9 @@ spu_enable_break (struct objfile *objfile)
                                         NULL, objfile);
 
   /* Place a solib_event breakpoint on the symbol.  */
-  if (spe_event_sym)
+  if (spe_event_sym.minsym)
     {
-      CORE_ADDR addr = SYMBOL_VALUE_ADDRESS (spe_event_sym);
+      CORE_ADDR addr = BMSYMBOL_VALUE_ADDRESS (spe_event_sym);
 
       addr = gdbarch_convert_from_func_ptr_addr (target_gdbarch (), addr,
                                                  &current_target);
@@ -432,8 +431,8 @@ spu_enable_break (struct objfile *objfile)
 static void
 ocl_enable_break (struct objfile *objfile)
 {
-  struct minimal_symbol *event_sym = NULL;
-  struct minimal_symbol *addr_sym = NULL;
+  struct bound_minimal_symbol event_sym;
+  struct bound_minimal_symbol addr_sym;
 
   /* The OpenCL runtime on the SPU will call __opencl_program_update_event
      whenever an OpenCL program is loaded.  */
@@ -443,10 +442,10 @@ ocl_enable_break (struct objfile *objfile)
      at opencl_elf_image_address.  */
   addr_sym = lookup_minimal_symbol ("opencl_elf_image_address", NULL, objfile);
 
-  if (event_sym && addr_sym)
+  if (event_sym.minsym && addr_sym.minsym)
     {
       /* Place a solib_event breakpoint on the symbol.  */
-      CORE_ADDR event_addr = SYMBOL_VALUE_ADDRESS (event_sym);
+      CORE_ADDR event_addr = BMSYMBOL_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
@@ -457,7 +456,7 @@ ocl_enable_break (struct objfile *objfile)
                  &objfile->objfile_obstack,
                  objfile->sections_end - objfile->sections,
                  CORE_ADDR);
-         *ocl_program_addr_base = SYMBOL_VALUE_ADDRESS (addr_sym);
+         *ocl_program_addr_base = BMSYMBOL_VALUE_ADDRESS (addr_sym);
          set_objfile_data (objfile, ocl_program_data_key,
                            ocl_program_addr_base);
         }