Add a TRY_CATCH to get_prev_frame_always to better manage errors during unwind.

[deliverable/binutils-gdb.git] / gdb / coffread.c

diff --git a/gdb/coffread.c b/gdb/coffread.c
index 7ade38c92eb74e868ae947b2051c671b7e8da624..c650d61e4df4eae5213d7477f1cf8cf24eeb09b0 100644 (file)
--- a/gdb/coffread.c
+++ b/gdb/coffread.c
@@ -1,5 +1,5 @@
 /* Read coff symbol tables and convert to internal format, for GDB.
-   Copyright (C) 1987-2013 Free Software Foundation, Inc.
+   Copyright (C) 1987-2014 Free Software Foundation, Inc.
    Contributed by David D. Johnson, Brown University (ddj@cs.brown.edu).
 
    This file is part of GDB.
@@ -26,7 +26,7 @@
 #include "bfd.h"
 #include "gdb_obstack.h"
 
-#include "gdb_string.h"
+#include <string.h>
 #include <ctype.h>
 
 #include "coff/internal.h"     /* Internal format of COFF symbols in BFD */
@@ -669,7 +669,7 @@ coff_symfile_read (struct objfile *objfile, int symfile_flags)
 
       ALL_OBJFILE_MSYMBOLS (objfile, msym)
        {
-         const char *name = SYMBOL_LINKAGE_NAME (msym);
+         const char *name = MSYMBOL_LINKAGE_NAME (msym);
 
          /* If the minimal symbols whose name are prefixed by "__imp_"
             or "_imp_", get rid of the prefix, and search the minimal
@@ -680,14 +680,15 @@ coff_symfile_read (struct objfile *objfile, int symfile_flags)
                  || strncmp (name, "_imp_", 5) == 0))
            {
              const char *name1 = (name[1] == '_' ? &name[7] : &name[6]);
-             struct minimal_symbol *found;
+             struct bound_minimal_symbol found;
 
              found = lookup_minimal_symbol (name1, NULL, objfile);
              /* If found, there are symbols named "_imp_foo" and "foo"
                 respectively in OBJFILE.  Set the type of symbol "foo"
                 as 'mst_solib_trampoline'.  */
-             if (found != NULL && MSYMBOL_TYPE (found) == mst_text)
-               MSYMBOL_TYPE (found) = mst_solib_trampoline;
+             if (found.minsym != NULL
+                 && MSYMBOL_TYPE (found.minsym) == mst_text)
+               MSYMBOL_TYPE (found.minsym) = mst_solib_trampoline;
            }
        }
     }
@@ -738,7 +739,7 @@ coff_symfile_read (struct objfile *objfile, int symfile_flags)
          bfd *abfd = symfile_bfd_open (debugfile);
 
          make_cleanup_bfd_unref (abfd);
-         symbol_file_add_separate (abfd, symfile_flags, objfile);
+         symbol_file_add_separate (abfd, debugfile, symfile_flags, objfile);
        }
     }
 
@@ -819,7 +820,7 @@ coff_symtab_read (long symtab_offset, unsigned int nsyms,
   /* Position to read the symbol table.  */
   val = bfd_seek (objfile->obfd, (long) symtab_offset, 0);
   if (val < 0)
-    perror_with_name (objfile->name);
+    perror_with_name (objfile_name (objfile));
 
   coffread_objfile = objfile;
   nlist_bfd_global = objfile->obfd;
@@ -872,8 +873,7 @@ coff_symtab_read (long symtab_offset, unsigned int nsyms,
             minsyms.  */
          int section = cs_to_section (cs, objfile);
 
-         tmpaddr = cs->c_value + ANOFFSET (objfile->section_offsets,
-                                           SECT_OFF_TEXT (objfile));
+         tmpaddr = cs->c_value;
          record_minimal_symbol (cs, tmpaddr, mst_text,
                                 section, objfile);
 
@@ -975,6 +975,7 @@ coff_symtab_read (long symtab_offset, unsigned int nsyms,
 
            enum minimal_symbol_type ms_type;
            int sec;
+           CORE_ADDR offset = 0;
 
            if (cs->c_secnum == N_UNDEF)
              {
@@ -1006,7 +1007,7 @@ coff_symtab_read (long symtab_offset, unsigned int nsyms,
                    || cs->c_sclass == C_THUMBEXTFUNC
                    || cs->c_sclass == C_THUMBEXT
                    || (pe_file && (cs->c_sclass == C_STAT)))
-                 tmpaddr += ANOFFSET (objfile->section_offsets, sec);
+                 offset = ANOFFSET (objfile->section_offsets, sec);
 
                if (bfd_section->flags & SEC_CODE)
                  {
@@ -1045,7 +1046,7 @@ coff_symtab_read (long symtab_offset, unsigned int nsyms,
 
                sym = process_coff_symbol
                  (cs, &main_aux, objfile);
-               SYMBOL_VALUE (sym) = tmpaddr;
+               SYMBOL_VALUE (sym) = tmpaddr + offset;
                SYMBOL_SECTION (sym) = sec;
              }
          }
@@ -1229,14 +1230,14 @@ read_one_sym (struct coff_symbol *cs,
   cs->c_symnum = symnum;
   bytes = bfd_bread (temp_sym, local_symesz, nlist_bfd_global);
   if (bytes != local_symesz)
-    error (_("%s: error reading symbols"), coffread_objfile->name);
+    error (_("%s: error reading symbols"), objfile_name (coffread_objfile));
   bfd_coff_swap_sym_in (symfile_bfd, temp_sym, (char *) sym);
   cs->c_naux = sym->n_numaux & 0xff;
   if (cs->c_naux >= 1)
     {
       bytes  = bfd_bread (temp_aux, local_auxesz, nlist_bfd_global);
       if (bytes != local_auxesz)
-       error (_("%s: error reading symbols"), coffread_objfile->name);
+       error (_("%s: error reading symbols"), objfile_name (coffread_objfile));
       bfd_coff_swap_aux_in (symfile_bfd, temp_aux,
                            sym->n_type, sym->n_sclass,
                            0, cs->c_naux, (char *) aux);
@@ -1246,7 +1247,8 @@ read_one_sym (struct coff_symbol *cs,
        {
          bytes = bfd_bread (temp_aux, local_auxesz, nlist_bfd_global);
          if (bytes != local_auxesz)
-           error (_("%s: error reading symbols"), coffread_objfile->name);
+           error (_("%s: error reading symbols"),
+                  objfile_name (coffread_objfile));
        }
     }
   cs->c_name = getsymname (sym);
@@ -1840,9 +1842,9 @@ decode_type (struct coff_symbol *cs, unsigned int c_type,
 
          base_type = decode_type (cs, new_c_type, aux, objfile);
          index_type = objfile_type (objfile)->builtin_int;
-         range_type =
-           create_range_type ((struct type *) NULL, 
-                              index_type, 0, n - 1);
+         range_type
+           = create_static_range_type ((struct type *) NULL,
+                                       index_type, 0, n - 1);
          type =
            create_array_type ((struct type *) NULL, 
                               base_type, range_type);
@@ -2249,7 +2251,6 @@ coff_read_enum_type (int index, int length, int lastsym,
 
 static const struct sym_fns coff_sym_fns =
 {
-  bfd_target_coff_flavour,
   coff_new_init,               /* sym_new_init: init anything gbl to
                                   entire symtab */
   coff_symfile_init,           /* sym_init: read initial info, setup
@@ -2282,7 +2283,7 @@ coff_free_info (struct objfile *objfile, void *arg)
 void
 _initialize_coffread (void)
 {
-  add_symtab_fns (&coff_sym_fns);
+  add_symtab_fns (bfd_target_coff_flavour, &coff_sym_fns);
 
   coff_objfile_data_key = register_objfile_data_with_cleanup (NULL,
                                                              coff_free_info);