Fix assertion failure in linux-thread-db

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

diff --git a/gdb/solib-spu.c b/gdb/solib-spu.c
index 41e41b08c14c84dd5d1436c1d6a65864e7448c7c..a629ec9818c78f36c71863a160ced3f8661deb7f 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-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009-2015 Free Software Foundation, Inc.
 
    Contributed by Ulrich Weigand <uweigand@de.ibm.com>.
 
@@ -33,7 +33,6 @@
 #include "observer.h"
 #include "breakpoint.h"
 #include "gdbthread.h"
-#include "exceptions.h"
 #include "gdb_bfd.h"
 
 #include "spu-tdep.h"
@@ -111,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,
@@ -120,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 = XCNEW (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)
@@ -147,6 +145,7 @@ append_ocl_sos (struct so_list **link_ptr)
                  break;
                }
            }
+         END_CATCH
        }
     }
 }
@@ -196,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];
@@ -215,16 +214,16 @@ spu_current_sos (void)
        continue;
 
       /* Allocate so_list structure.  */
-      new = XCNEW (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.  */
@@ -314,6 +313,7 @@ spu_bfd_iovec_stat (bfd *abfd, void *stream, struct stat *sb)
      table to find the extent of the last section but that seems
      pointless when the size is needed only for checks of other
      parsed values in dbxread.c.  */
+  memset (sb, 0, sizeof (struct stat));
   sb->st_size = INT_MAX;
   return 0;
 }
@@ -322,8 +322,8 @@ static bfd *
 spu_bfd_fopen (char *name, CORE_ADDR addr)
 {
   bfd *nbfd;
+  CORE_ADDR *open_closure = XNEW (CORE_ADDR);
 
-  CORE_ADDR *open_closure = xmalloc (sizeof (CORE_ADDR));
   *open_closure = addr;
 
   nbfd = gdb_bfd_openr_iovec (name, "elf32-spu",
@@ -389,8 +389,8 @@ spu_bfd_open (char *pathname)
 }
 
 /* Lookup global symbol in a SPE executable.  */
-static struct symbol *
-spu_lookup_lib_symbol (const struct objfile *objfile,
+static struct block_symbol
+spu_lookup_lib_symbol (struct objfile *objfile,
                       const char *name,
                       const domain_enum domain)
 {
@@ -399,7 +399,7 @@ spu_lookup_lib_symbol (const struct objfile *objfile,
 
   if (svr4_so_ops.lookup_lib_global_symbol != NULL)
     return svr4_so_ops.lookup_lib_global_symbol (objfile, name, domain);
-  return NULL;
+  return (struct block_symbol) {NULL, NULL};
 }
 
 /* Enable shared library breakpoint.  */