gdb: remove TYPE_NAME macro
[deliverable/binutils-gdb.git] / gdb / mdebugread.c
index d53d57f13674472f6ee0f3bc6959a29a60be1834..9ad9c664bcbd5df020a0619c981e05d797f755a4 100644 (file)
@@ -1,6 +1,6 @@
 /* Read a symbol table in ECOFF format (Third-Eye).
 
-   Copyright (C) 1986-2019 Free Software Foundation, Inc.
+   Copyright (C) 1986-2020 Free Software Foundation, Inc.
 
    Original version contributed by Alessandro Forin (af@cs.cmu.edu) at
    CMU.  Major work by Per Bothner, John Gilmore and Ian Lance Taylor
@@ -251,10 +251,10 @@ static struct symbol *mylookup_symbol (const char *, const struct block *,
 
 static void sort_blocks (struct symtab *);
 
-static struct partial_symtab *new_psymtab (const char *, struct objfile *);
+static legacy_psymtab *new_psymtab (const char *, struct objfile *);
 
-static void psymtab_to_symtab_1 (struct objfile *objfile,
-                                struct partial_symtab *, const char *);
+static void mdebug_expand_psymtab (legacy_psymtab *pst,
+                                 struct objfile *objfile);
 
 static void add_block (struct block *, struct symtab *);
 
@@ -275,24 +275,15 @@ static const char *mdebug_next_symbol_text (struct objfile *);
    and reorders the symtab list at the end.  SELF is not NULL.  */
 
 static void
-mdebug_read_symtab (struct partial_symtab *self, struct objfile *objfile)
+mdebug_read_symtab (legacy_psymtab *self, struct objfile *objfile)
 {
-  if (info_verbose)
-    {
-      printf_filtered (_("Reading in symbols for %s..."), self->filename);
-      gdb_flush (gdb_stdout);
-    }
-
   next_symbol_text_func = mdebug_next_symbol_text;
 
-  psymtab_to_symtab_1 (objfile, self, self->filename);
+  self->expand_psymtab (objfile);
 
   /* Match with global symbols.  This only needs to be done once,
      after all of the symtabs and dependencies have been read in.  */
   scan_file_globals (objfile);
-
-  if (info_verbose)
-    printf_filtered (_("done.\n"));
 }
 \f
 /* File-level interface functions.  */
@@ -389,7 +380,7 @@ mdebug_build_psymtabs (minimal_symbol_reader &reader,
 
 struct pst_map
 {
-  struct partial_symtab *pst;  /* the psymtab proper */
+  legacy_psymtab *pst; /* the psymtab proper */
   long n_globals;              /* exported globals (external symbols) */
   long globals_offset;         /* cumulative */
 };
@@ -541,7 +532,7 @@ mdebug_reg_to_regnum (struct symbol *sym, struct gdbarch *gdbarch)
   if (regno < 0 || regno >= gdbarch_num_cooked_regs (gdbarch))
     {
       reg_value_complaint (regno, gdbarch_num_cooked_regs (gdbarch),
-                          SYMBOL_PRINT_NAME (sym));
+                          sym->print_name ());
 
       regno = gdbarch_sp_regnum (gdbarch); /* Known safe, though useless.  */
     }
@@ -580,9 +571,9 @@ add_data_symbol (SYMR *sh, union aux_ext *ax, int bigend,
 
 static int
 parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend,
-             struct section_offsets *section_offsets, struct objfile *objfile)
+             const section_offsets &section_offsets, struct objfile *objfile)
 {
-  struct gdbarch *gdbarch = get_objfile_arch (objfile);
+  struct gdbarch *gdbarch = objfile->arch ();
   const bfd_size_type external_sym_size = debug_swap->external_sym_size;
   void (*const swap_sym_in) (bfd *, void *, SYMR *) = debug_swap->swap_sym_in;
   const char *name;
@@ -610,18 +601,18 @@ parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend,
          The value of a stBlock symbol is the displacement from the
          procedure address.  */
       if (sh->st != stEnd && sh->st != stBlock)
-       sh->value += ANOFFSET (section_offsets, SECT_OFF_TEXT (objfile));
+       sh->value += section_offsets[SECT_OFF_TEXT (objfile)];
       break;
     case scData:
     case scSData:
     case scRData:
     case scPData:
     case scXData:
-      sh->value += ANOFFSET (section_offsets, SECT_OFF_DATA (objfile));
+      sh->value += section_offsets[SECT_OFF_DATA (objfile)];
       break;
     case scBss:
     case scSBss:
-      sh->value += ANOFFSET (section_offsets, SECT_OFF_BSS (objfile));
+      sh->value += section_offsets[SECT_OFF_BSS (objfile)];
       break;
     }
 
@@ -646,7 +637,7 @@ parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend,
          /* It is a FORTRAN common block.  At least for SGI Fortran the
             address is not in the symbol; we need to fix it later in
             scan_file_globals.  */
-         int bucket = hashname (SYMBOL_LINKAGE_NAME (s));
+         int bucket = hashname (s->linkage_name ());
          SYMBOL_VALUE_CHAIN (s) = global_sym_chain[bucket];
          global_sym_chain[bucket] = s;
        }
@@ -756,7 +747,7 @@ parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend,
        {
          t = parse_type (cur_fd, ax, sh->index + 1, 0, bigend, name);
          if (strcmp (name, "malloc") == 0
-             && TYPE_CODE (t) == TYPE_CODE_VOID)
+             && t->code () == TYPE_CODE_VOID)
            {
              /* I don't know why, but, at least under Alpha GNU/Linux,
                 when linking against a malloc without debugging
@@ -794,11 +785,11 @@ parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend,
 
       /* All functions in C++ have prototypes.  For C we don't have enough
          information in the debug info.  */
-      if (SYMBOL_LANGUAGE (s) == language_cplus)
+      if (s->language () == language_cplus)
        TYPE_PROTOTYPED (SYMBOL_TYPE (s)) = 1;
 
       /* Create and enter a new lexical context.  */
-      b = new_block (FUNCTION_BLOCK, SYMBOL_LANGUAGE (s));
+      b = new_block (FUNCTION_BLOCK, s->language ());
       SYMBOL_BLOCK_VALUE (s) = b;
       BLOCK_FUNCTION (b) = s;
       BLOCK_START (b) = BLOCK_END (b) = sh->value;
@@ -1019,12 +1010,12 @@ parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend,
           (.Fxx or .xxfake or empty) for unnamed struct/union/enums.
           Alpha cc puts out an sh->iss of zero for those.  */
        if (sh->iss == 0 || name[0] == '.' || name[0] == '\0')
-         TYPE_NAME (t) = NULL;
+         t->set_name (NULL);
        else
-         TYPE_NAME (t) = obconcat (&mdebugread_objfile->objfile_obstack,
-                                   name, (char *) NULL);
+         t->set_name (obconcat (&mdebugread_objfile->objfile_obstack,
+                                name, (char *) NULL));
 
-       TYPE_CODE (t) = type_code;
+       t->set_code (type_code);
        TYPE_LENGTH (t) = sh->value;
        TYPE_NFIELDS (t) = nfields;
        TYPE_FIELDS (t) = f = ((struct field *)
@@ -1065,10 +1056,9 @@ parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend,
                FIELD_NAME (*f) = debug_info->ss + cur_fdr->issBase + tsym.iss;
                FIELD_BITSIZE (*f) = 0;
 
-               enum_sym = allocate_symbol (mdebugread_objfile);
-               SYMBOL_SET_LINKAGE_NAME
-                 (enum_sym,
-                  obstack_strdup (&mdebugread_objfile->objfile_obstack,
+               enum_sym = new (&mdebugread_objfile->objfile_obstack) symbol;
+               enum_sym->set_linkage_name
+                 (obstack_strdup (&mdebugread_objfile->objfile_obstack,
                                   f->name));
                SYMBOL_ACLASS_INDEX (enum_sym) = LOC_CONST;
                SYMBOL_TYPE (enum_sym) = t;
@@ -1306,13 +1296,13 @@ parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend,
       add_symbol (s, top_stack->cur_st, top_stack->cur_block);
 
       /* Incomplete definitions of structs should not get a name.  */
-      if (TYPE_NAME (SYMBOL_TYPE (s)) == NULL
+      if (SYMBOL_TYPE (s)->name () == NULL
          && (TYPE_NFIELDS (SYMBOL_TYPE (s)) != 0
-             || (TYPE_CODE (SYMBOL_TYPE (s)) != TYPE_CODE_STRUCT
-                 && TYPE_CODE (SYMBOL_TYPE (s)) != TYPE_CODE_UNION)))
+             || (SYMBOL_TYPE (s)->code () != TYPE_CODE_STRUCT
+                 && SYMBOL_TYPE (s)->code () != TYPE_CODE_UNION)))
        {
-         if (TYPE_CODE (SYMBOL_TYPE (s)) == TYPE_CODE_PTR
-             || TYPE_CODE (SYMBOL_TYPE (s)) == TYPE_CODE_FUNC)
+         if (SYMBOL_TYPE (s)->code () == TYPE_CODE_PTR
+             || SYMBOL_TYPE (s)->code () == TYPE_CODE_FUNC)
            {
              /* If we are giving a name to a type such as "pointer to
                 foo" or "function returning foo", we better not set
@@ -1334,7 +1324,7 @@ parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend,
                 for anything except pointers or functions.  */
            }
          else
-           TYPE_NAME (SYMBOL_TYPE (s)) = SYMBOL_LINKAGE_NAME (s);
+           SYMBOL_TYPE (s)->set_name (s->linkage_name ());
        }
       break;
 
@@ -1367,7 +1357,7 @@ static const struct objfile_key<struct type *,
 static struct type *
 basic_type (int bt, struct objfile *objfile)
 {
-  struct gdbarch *gdbarch = get_objfile_arch (objfile);
+  struct gdbarch *gdbarch = objfile->arch ();
   struct type **map_bt = basic_type_data.get (objfile);
   struct type *tp;
 
@@ -1439,13 +1429,11 @@ basic_type (int bt, struct objfile *objfile)
       break;
 
     case btComplex:
-      tp = init_complex_type (objfile, "complex",
-                             basic_type (btFloat, objfile));
+      tp = init_complex_type ("complex", basic_type (btFloat, objfile));
       break;
 
     case btDComplex:
-      tp = init_complex_type (objfile, "double complex",
-                             basic_type (btFloat, objfile));
+      tp = init_complex_type ("double complex", basic_type (btFloat, objfile));
       break;
 
     case btFixedDec:
@@ -1651,16 +1639,16 @@ parse_type (int fd, union aux_ext *ax, unsigned int aux_index, int *bs,
 
       /* DEC c89 produces cross references to qualified aggregate types,
          dereference them.  */
-      while (TYPE_CODE (tp) == TYPE_CODE_PTR
-            || TYPE_CODE (tp) == TYPE_CODE_ARRAY)
+      while (tp->code () == TYPE_CODE_PTR
+            || tp->code () == TYPE_CODE_ARRAY)
        tp = TYPE_TARGET_TYPE (tp);
 
       /* Make sure that TYPE_CODE(tp) has an expected type code.
          Any type may be returned from cross_ref if file indirect entries
          are corrupted.  */
-      if (TYPE_CODE (tp) != TYPE_CODE_STRUCT
-         && TYPE_CODE (tp) != TYPE_CODE_UNION
-         && TYPE_CODE (tp) != TYPE_CODE_ENUM)
+      if (tp->code () != TYPE_CODE_STRUCT
+         && tp->code () != TYPE_CODE_UNION
+         && tp->code () != TYPE_CODE_ENUM)
        {
          unexpected_type_code_complaint (sym_name);
        }
@@ -1670,27 +1658,27 @@ parse_type (int fd, union aux_ext *ax, unsigned int aux_index, int *bs,
             exception is if we guessed wrong re struct/union/enum.
             But for struct vs. union a wrong guess is harmless, so
             don't complain().  */
-         if ((TYPE_CODE (tp) == TYPE_CODE_ENUM
+         if ((tp->code () == TYPE_CODE_ENUM
               && type_code != TYPE_CODE_ENUM)
-             || (TYPE_CODE (tp) != TYPE_CODE_ENUM
+             || (tp->code () != TYPE_CODE_ENUM
                  && type_code == TYPE_CODE_ENUM))
            {
              bad_tag_guess_complaint (sym_name);
            }
 
-         if (TYPE_CODE (tp) != type_code)
+         if (tp->code () != type_code)
            {
-             TYPE_CODE (tp) = type_code;
+             tp->set_code (type_code);
            }
 
          /* Do not set the tag name if it is a compiler generated tag name
             (.Fxx or .xxfake or empty) for unnamed struct/union/enums.  */
          if (name[0] == '.' || name[0] == '\0')
-           TYPE_NAME (tp) = NULL;
-         else if (TYPE_NAME (tp) == NULL
-                  || strcmp (TYPE_NAME (tp), name) != 0)
-           TYPE_NAME (tp)
-             = obstack_strdup (&mdebugread_objfile->objfile_obstack, name);
+           tp->set_name (NULL);
+         else if (tp->name () == NULL
+                  || strcmp (tp->name (), name) != 0)
+           tp->set_name (obstack_strdup (&mdebugread_objfile->objfile_obstack,
+                                         name));
        }
     }
 
@@ -1710,7 +1698,7 @@ parse_type (int fd, union aux_ext *ax, unsigned int aux_index, int *bs,
       /* Make sure that TYPE_CODE(tp) has an expected type code.
          Any type may be returned from cross_ref if file indirect entries
          are corrupted.  */
-      if (TYPE_CODE (tp) != TYPE_CODE_RANGE)
+      if (tp->code () != TYPE_CODE_RANGE)
        {
          unexpected_type_code_complaint (sym_name);
        }
@@ -1718,15 +1706,15 @@ parse_type (int fd, union aux_ext *ax, unsigned int aux_index, int *bs,
        {
          /* Usually, TYPE_CODE(tp) is already type_code.  The main
             exception is if we guessed wrong re struct/union/enum.  */
-         if (TYPE_CODE (tp) != type_code)
+         if (tp->code () != type_code)
            {
              bad_tag_guess_complaint (sym_name);
-             TYPE_CODE (tp) = type_code;
+             tp->set_code (type_code);
            }
-         if (TYPE_NAME (tp) == NULL
-             || strcmp (TYPE_NAME (tp), name) != 0)
-           TYPE_NAME (tp)
-             = obstack_strdup (&mdebugread_objfile->objfile_obstack, name);
+         if (tp->name () == NULL
+             || strcmp (tp->name (), name) != 0)
+           tp->set_name (obstack_strdup (&mdebugread_objfile->objfile_obstack,
+                                         name));
        }
     }
   if (t->bt == btTypedef)
@@ -1843,7 +1831,7 @@ upgrade_type (int fd, struct type **tpp, int tq, union aux_ext *ax, int bigend,
 
       /* The bounds type should be an integer type, but might be anything
          else due to corrupt aux entries.  */
-      if (TYPE_CODE (indx) != TYPE_CODE_INT)
+      if (indx->code () != TYPE_CODE_INT)
        {
          complaint (_("illegal array index type for %s, assuming int"),
                     sym_name);
@@ -1911,7 +1899,7 @@ upgrade_type (int fd, struct type **tpp, int tq, union aux_ext *ax, int bigend,
 
 static void
 parse_procedure (PDR *pr, struct compunit_symtab *search_symtab,
-                struct partial_symtab *pst)
+                legacy_psymtab *pst)
 {
   struct symbol *s, *i;
   const struct block *b;
@@ -2024,8 +2012,7 @@ parse_procedure (PDR *pr, struct compunit_symtab *search_symtab,
       /* GDB expects the absolute function start address for the
          procedure descriptor in e->pdr.adr.
          As the address in the procedure descriptor is usually relative,
-         we would have to relocate e->pdr.adr with cur_fdr->adr and
-         ANOFFSET (pst->section_offsets, SECT_OFF_TEXT (pst->objfile)).
+         we would have to relocate e->pdr.adr with cur_fdr->adr.
          Unfortunately cur_fdr->adr and e->pdr.adr are both absolute
          in shared libraries on some systems, and on other systems
          e->pdr.adr is sometimes offset by a bogus value.
@@ -2051,7 +2038,7 @@ parse_procedure (PDR *pr, struct compunit_symtab *search_symtab,
 
   if (processing_gcc_compilation == 0
       && found_ecoff_debugging_info == 0
-      && TYPE_CODE (TYPE_TARGET_TYPE (SYMBOL_TYPE (s))) == TYPE_CODE_VOID)
+      && TYPE_TARGET_TYPE (SYMBOL_TYPE (s))->code () == TYPE_CODE_VOID)
     SYMBOL_TYPE (s) = objfile_type (mdebugread_objfile)->nodebug_text_symbol;
 }
 
@@ -2061,11 +2048,8 @@ parse_procedure (PDR *pr, struct compunit_symtab *search_symtab,
 
    This routine clobbers top_stack->cur_block and ->cur_st.  */
 
-static void parse_external (EXTR *, int, struct section_offsets *,
-                           struct objfile *);
-
 static void
-parse_external (EXTR *es, int bigend, struct section_offsets *section_offsets,
+parse_external (EXTR *es, int bigend, const section_offsets &section_offsets,
                struct objfile *objfile)
 {
   union aux_ext *ax;
@@ -2299,7 +2283,7 @@ static void
 parse_partial_symbols (minimal_symbol_reader &reader,
                       struct objfile *objfile)
 {
-  struct gdbarch *gdbarch = get_objfile_arch (objfile);
+  struct gdbarch *gdbarch = objfile->arch ();
   const bfd_size_type external_sym_size = debug_swap->external_sym_size;
   const bfd_size_type external_rfd_size = debug_swap->external_rfd_size;
   const bfd_size_type external_ext_size = debug_swap->external_ext_size;
@@ -2315,7 +2299,7 @@ parse_partial_symbols (minimal_symbol_reader &reader,
   EXTR *ext_in;
   EXTR *ext_in_end;
   SYMR sh;
-  struct partial_symtab *pst;
+  legacy_psymtab *pst;
   int textlow_not_set = 1;
 
   /* List of current psymtab's include files.  */
@@ -2325,7 +2309,7 @@ parse_partial_symbols (minimal_symbol_reader &reader,
   EXTR *extern_tab;
   struct pst_map *fdr_to_pst;
   /* Index within current psymtab dependency list.  */
-  struct partial_symtab **dependency_list;
+  legacy_psymtab **dependency_list;
   int dependencies_used, dependencies_allocated;
   char *name;
   enum language prev_language;
@@ -2354,8 +2338,8 @@ parse_partial_symbols (minimal_symbol_reader &reader,
   dependencies_allocated = 30;
   dependencies_used = 0;
   dependency_list =
-    (struct partial_symtab **) alloca (dependencies_allocated *
-                                      sizeof (struct partial_symtab *));
+    (legacy_psymtab **) alloca (dependencies_allocated *
+                               sizeof (legacy_psymtab *));
 
   set_last_source_file (NULL);
 
@@ -2378,7 +2362,7 @@ parse_partial_symbols (minimal_symbol_reader &reader,
   fdr_to_pst = fdr_to_pst_holder.data ();
   fdr_to_pst++;
   {
-    struct partial_symtab *new_pst = new_psymtab ("", objfile);
+    legacy_psymtab *new_pst = new_psymtab ("", objfile);
 
     fdr_to_pst[-1].pst = new_pst;
     FDR_IDX (new_pst) = -1;
@@ -2596,7 +2580,7 @@ parse_partial_symbols (minimal_symbol_reader &reader,
   /* Pass 3 over files, over local syms: fill in static symbols.  */
   for (f_idx = 0; f_idx < hdr->ifdMax; f_idx++)
     {
-      struct partial_symtab *save_pst;
+      legacy_psymtab *save_pst;
       EXTR *ext_ptr;
       CORE_ADDR textlow;
 
@@ -2614,9 +2598,7 @@ parse_partial_symbols (minimal_symbol_reader &reader,
        textlow = fh->adr;
       else
        textlow = 0;
-      pst = start_psymtab_common (objfile,
-                                 fdr_name (fh),
-                                 textlow);
+      pst = new legacy_psymtab (fdr_name (fh), objfile, textlow);
       pst->read_symtab_private = XOBNEW (&objfile->objfile_obstack, symloc);
       memset (pst->read_symtab_private, 0, sizeof (struct symloc));
 
@@ -2628,7 +2610,8 @@ parse_partial_symbols (minimal_symbol_reader &reader,
       PENDING_LIST (pst) = pending_list;
 
       /* The way to turn this into a symtab is to call...  */
-      pst->read_symtab = mdebug_read_symtab;
+      pst->legacy_read_symtab = mdebug_read_symtab;
+      pst->legacy_expand_psymtab = mdebug_expand_psymtab;
 
       /* Set up language for the pst.
          The language from the FDR is used if it is unambigious (e.g. cfront
@@ -2902,7 +2885,7 @@ parse_partial_symbols (minimal_symbol_reader &reader,
                        {               /* Here if prev stab wasn't N_SO.  */
                          if (pst)
                            {
-                             pst = (struct partial_symtab *) 0;
+                             pst = (legacy_psymtab *) 0;
                              includes_used = 0;
                              dependencies_used = 0;
                            }
@@ -3050,8 +3033,9 @@ parse_partial_symbols (minimal_symbol_reader &reader,
                          namestring = gdbarch_static_transform_name
                                         (gdbarch, namestring);
 
-                       add_psymbol_to_list (namestring, p - namestring, true,
-                                            VAR_DOMAIN, LOC_STATIC,
+                       add_psymbol_to_list (gdb::string_view (namestring,
+                                                              p - namestring),
+                                            true, VAR_DOMAIN, LOC_STATIC,
                                             SECT_OFF_DATA (objfile),
                                             psymbol_placement::STATIC,
                                             sh.value,
@@ -3061,8 +3045,9 @@ parse_partial_symbols (minimal_symbol_reader &reader,
                        /* The addresses in these entries are reported
                           to be wrong.  See the code that reads 'G's
                           for symtabs.  */
-                       add_psymbol_to_list (namestring, p - namestring, true,
-                                            VAR_DOMAIN, LOC_STATIC,
+                       add_psymbol_to_list (gdb::string_view (namestring,
+                                                              p - namestring),
+                                            true, VAR_DOMAIN, LOC_STATIC,
                                             SECT_OFF_DATA (objfile),
                                             psymbol_placement::GLOBAL,
                                             sh.value,
@@ -3080,21 +3065,20 @@ parse_partial_symbols (minimal_symbol_reader &reader,
                            || (p == namestring + 1
                                && namestring[0] != ' '))
                          {
-                           add_psymbol_to_list (namestring, p - namestring, true,
-                                                STRUCT_DOMAIN, LOC_TYPEDEF,
-                                                -1,
-                                                psymbol_placement::STATIC,
-                                                0, psymtab_language, objfile);
+                           add_psymbol_to_list
+                             (gdb::string_view (namestring, p - namestring),
+                              true, STRUCT_DOMAIN, LOC_TYPEDEF, -1,
+                              psymbol_placement::STATIC, 0, psymtab_language,
+                              objfile);
                            if (p[2] == 't')
                              {
                                /* Also a typedef with the same name.  */
-                               add_psymbol_to_list (namestring,
-                                                    p - namestring, true,
-                                                    VAR_DOMAIN, LOC_TYPEDEF,
-                                                    -1,
-                                                    psymbol_placement::STATIC,
-                                                    0, psymtab_language,
-                                                    objfile);
+                               add_psymbol_to_list
+                                 (gdb::string_view (namestring,
+                                                    p - namestring),
+                                  true, VAR_DOMAIN, LOC_TYPEDEF, -1,
+                                  psymbol_placement::STATIC, 0,
+                                  psymtab_language, objfile);
                                p += 1;
                              }
                          }
@@ -3103,11 +3087,12 @@ parse_partial_symbols (minimal_symbol_reader &reader,
                        if (p != namestring)    /* a name is there, not
                                                   just :T...  */
                          {
-                           add_psymbol_to_list (namestring, p - namestring,
-                                                true, VAR_DOMAIN, LOC_TYPEDEF,
-                                                -1,
-                                                psymbol_placement::STATIC,
-                                                0, psymtab_language, objfile);
+                           add_psymbol_to_list
+                             (gdb::string_view (namestring,
+                                                p - namestring),
+                              true, VAR_DOMAIN, LOC_TYPEDEF, -1,
+                              psymbol_placement::STATIC, 0, psymtab_language,
+                              objfile);
                          }
                      check_enum:
                        /* If this is an enumerated type, we need to add
@@ -3168,9 +3153,10 @@ parse_partial_symbols (minimal_symbol_reader &reader,
                                /* Note that the value doesn't matter for
                                   enum constants in psymtabs, just in
                                   symtabs.  */
-                               add_psymbol_to_list (p, q - p, true,
-                                                    VAR_DOMAIN, LOC_CONST,
-                                                    -1,
+                               add_psymbol_to_list (gdb::string_view (p,
+                                                                      q - p),
+                                                    true, VAR_DOMAIN,
+                                                    LOC_CONST, -1,
                                                     psymbol_placement::STATIC,
                                                     0, psymtab_language,
                                                     objfile);
@@ -3187,8 +3173,9 @@ parse_partial_symbols (minimal_symbol_reader &reader,
                        continue;
                      case 'c':
                        /* Constant, e.g. from "const" in Pascal.  */
-                       add_psymbol_to_list (namestring, p - namestring, true,
-                                            VAR_DOMAIN, LOC_CONST, -1,
+                       add_psymbol_to_list (gdb::string_view (namestring,
+                                                              p - namestring),
+                                            true, VAR_DOMAIN, LOC_CONST, -1,
                                             psymbol_placement::STATIC,
                                             0, psymtab_language, objfile);
                        continue;
@@ -3200,8 +3187,9 @@ parse_partial_symbols (minimal_symbol_reader &reader,
                            function_outside_compilation_unit_complaint
                              (copy.c_str ());
                          }
-                       add_psymbol_to_list (namestring, p - namestring, true,
-                                            VAR_DOMAIN, LOC_BLOCK,
+                       add_psymbol_to_list (gdb::string_view (namestring,
+                                                              p - namestring),
+                                            true, VAR_DOMAIN, LOC_BLOCK,
                                             SECT_OFF_TEXT (objfile),
                                             psymbol_placement::STATIC,
                                             sh.value,
@@ -3219,8 +3207,9 @@ parse_partial_symbols (minimal_symbol_reader &reader,
                            function_outside_compilation_unit_complaint
                              (copy.c_str ());
                          }
-                       add_psymbol_to_list (namestring, p - namestring, true,
-                                            VAR_DOMAIN, LOC_BLOCK,
+                       add_psymbol_to_list (gdb::string_view (namestring,
+                                                              p - namestring),
+                                            true, VAR_DOMAIN, LOC_BLOCK,
                                             SECT_OFF_TEXT (objfile),
                                             psymbol_placement::GLOBAL,
                                             sh.value,
@@ -3286,7 +3275,7 @@ parse_partial_symbols (minimal_symbol_reader &reader,
                    if (pst
                        && gdbarch_sofun_address_maybe_missing (gdbarch))
                      {
-                       pst = (struct partial_symtab *) 0;
+                       pst = (legacy_psymtab *) 0;
                        includes_used = 0;
                        dependencies_used = 0;
                      }
@@ -3454,13 +3443,13 @@ parse_partial_symbols (minimal_symbol_reader &reader,
                     symbol table, and the MAIN__ symbol via the minimal
                     symbol table.  */
                  if (sh.st == stProc)
-                   add_psymbol_to_list (sym_name, strlen (sym_name), true,
+                   add_psymbol_to_list (sym_name, true,
                                         VAR_DOMAIN, LOC_BLOCK,
                                         section,
                                         psymbol_placement::GLOBAL,
                                         sh.value, psymtab_language, objfile);
                  else
-                   add_psymbol_to_list (sym_name, strlen (sym_name), true,
+                   add_psymbol_to_list (sym_name, true,
                                         VAR_DOMAIN, LOC_BLOCK,
                                         section,
                                         psymbol_placement::STATIC,
@@ -3527,7 +3516,7 @@ parse_partial_symbols (minimal_symbol_reader &reader,
                      && sh.iss != 0
                      && sh.index != cur_sdx + 2)
                    {
-                     add_psymbol_to_list (sym_name, strlen (sym_name), true,
+                     add_psymbol_to_list (sym_name, true,
                                           STRUCT_DOMAIN, LOC_TYPEDEF, -1,
                                           psymbol_placement::STATIC,
                                           0, psymtab_language, objfile);
@@ -3567,7 +3556,7 @@ parse_partial_symbols (minimal_symbol_reader &reader,
                  continue;
                }
              /* Use this gdb symbol.  */
-             add_psymbol_to_list (sym_name, strlen (sym_name), true,
+             add_psymbol_to_list (sym_name, true,
                                   VAR_DOMAIN, theclass, section,
                                   psymbol_placement::STATIC,
                                   sh.value, psymtab_language, objfile);
@@ -3587,9 +3576,8 @@ parse_partial_symbols (minimal_symbol_reader &reader,
              CORE_ADDR svalue;
              short section;
 
-             if (ext_ptr->ifd != f_idx)
-               internal_error (__FILE__, __LINE__,
-                               _("failed internal consistency check"));
+             gdb_assert (ext_ptr->ifd == f_idx);
+
              psh = &ext_ptr->asym;
 
              /* Do not add undefined symbols to the partial symbol table.  */
@@ -3646,7 +3634,7 @@ parse_partial_symbols (minimal_symbol_reader &reader,
                  break;
                }
              char *sym_name = debug_info->ssext + psh->iss;
-             add_psymbol_to_list (sym_name, strlen (sym_name), true,
+             add_psymbol_to_list (sym_name, true,
                                   VAR_DOMAIN, theclass,
                                   section,
                                   psymbol_placement::GLOBAL,
@@ -3741,12 +3729,12 @@ parse_partial_symbols (minimal_symbol_reader &reader,
 
   /* Remove the dummy psymtab created for -O3 images above, if it is
      still empty, to enable the detection of stripped executables.  */
-  pst = objfile->partial_symtabs->psymtabs;
-  if (pst->next == NULL
-      && pst->number_of_dependencies == 0
-      && pst->n_global_syms == 0
-      && pst->n_static_syms == 0)
-    objfile->partial_symtabs->psymtabs = NULL;
+  partial_symtab *pst_del = objfile->partial_symtabs->psymtabs;
+  if (pst_del->next == NULL
+      && pst_del->number_of_dependencies == 0
+      && pst_del->n_global_syms == 0
+      && pst_del->n_static_syms == 0)
+    objfile->partial_symtabs->discard_psymtab (pst_del);
 }
 
 /* If the current psymbol has an enumerated type, we need to add
@@ -3809,7 +3797,7 @@ handle_psymbol_enumerators (struct objfile *objfile, FDR *fh, int stype,
 
       /* Note that the value doesn't matter for enum constants
          in psymtabs, just in symtabs.  */
-      add_psymbol_to_list (name, strlen (name), true,
+      add_psymbol_to_list (name, true,
                           VAR_DOMAIN, LOC_CONST, -1,
                           psymbol_placement::STATIC, 0,
                           psymtab_language, objfile);
@@ -3844,8 +3832,7 @@ mdebug_next_symbol_text (struct objfile *objfile)
    The flow of control and even the memory allocation differs.  FIXME.  */
 
 static void
-psymtab_to_symtab_1 (struct objfile *objfile,
-                    struct partial_symtab *pst, const char *filename)
+mdebug_expand_psymtab (legacy_psymtab *pst, struct objfile *objfile)
 {
   bfd_size_type external_sym_size;
   bfd_size_type external_pdr_size;
@@ -3857,35 +3844,16 @@ psymtab_to_symtab_1 (struct objfile *objfile,
   struct linetable *lines;
   CORE_ADDR lowest_pdr_addr = 0;
   int last_symtab_ended = 0;
-  struct section_offsets *section_offsets = objfile->section_offsets;
+  const section_offsets &section_offsets = objfile->section_offsets;
 
   if (pst->readin)
     return;
-  pst->readin = 1;
+  pst->readin = true;
 
   /* Read in all partial symtabs on which this one is dependent.
      NOTE that we do have circular dependencies, sigh.  We solved
      that by setting pst->readin before this point.  */
-
-  for (i = 0; i < pst->number_of_dependencies; i++)
-    if (!pst->dependencies[i]->readin)
-      {
-       /* Inform about additional files to be read in.  */
-       if (info_verbose)
-         {
-           fputs_filtered (" ", gdb_stdout);
-           wrap_here ("");
-           fputs_filtered ("and ", gdb_stdout);
-           wrap_here ("");
-           printf_filtered ("%s...",
-                            pst->dependencies[i]->filename);
-           wrap_here ("");     /* Flush output */
-           gdb_flush (gdb_stdout);
-         }
-       /* We only pass the filename for debug purposes.  */
-       psymtab_to_symtab_1 (objfile, pst->dependencies[i],
-                            pst->dependencies[i]->filename);
-      }
+  pst->expand_dependencies (objfile);
 
   /* Do nothing if this is a dummy psymtab.  */
 
@@ -3931,7 +3899,7 @@ psymtab_to_symtab_1 (struct objfile *objfile,
 
   if (processing_gcc_compilation != 0)
     {
-      struct gdbarch *gdbarch = get_objfile_arch (objfile);
+      struct gdbarch *gdbarch = objfile->arch ();
 
       /* This symbol table contains stabs-in-ecoff entries.  */
 
@@ -3975,8 +3943,7 @@ psymtab_to_symtab_1 (struct objfile *objfile,
                      && previous_stab_code != (unsigned char) N_SO
                      && *name == '\000')
                    {
-                     valu += ANOFFSET (section_offsets,
-                                       SECT_OFF_TEXT (objfile));
+                     valu += section_offsets[SECT_OFF_TEXT (objfile)];
                      previous_stab_code = N_SO;
                      cust = end_symtab (valu, SECT_OFF_TEXT (objfile));
                      end_stabs ();
@@ -4023,8 +3990,7 @@ psymtab_to_symtab_1 (struct objfile *objfile,
              else
                {
                  /* Handle encoded stab line number.  */
-                 valu += ANOFFSET (section_offsets,
-                                   SECT_OFF_TEXT (objfile));
+                 valu += section_offsets[SECT_OFF_TEXT (objfile)];
                  record_line (get_current_subfile (), sh.index,
                               gdbarch_addr_bits_remove (gdbarch, valu));
                }
@@ -4483,10 +4449,10 @@ mylookup_symbol (const char *name, const struct block *block,
   inc = name[0];
   ALL_BLOCK_SYMBOLS (block, iter, sym)
     {
-      if (SYMBOL_LINKAGE_NAME (sym)[0] == inc
+      if (sym->linkage_name ()[0] == inc
          && SYMBOL_DOMAIN (sym) == domain
          && SYMBOL_CLASS (sym) == theclass
-         && strcmp (SYMBOL_LINKAGE_NAME (sym), name) == 0)
+         && strcmp (sym->linkage_name (), name) == 0)
        return sym;
     }
 
@@ -4658,12 +4624,12 @@ new_symtab (const char *name, int maxlines, struct objfile *objfile)
 
 /* Allocate a new partial_symtab NAME.  */
 
-static struct partial_symtab *
+static legacy_psymtab *
 new_psymtab (const char *name, struct objfile *objfile)
 {
-  struct partial_symtab *psymtab;
+  legacy_psymtab *psymtab;
 
-  psymtab = allocate_psymtab (name, objfile);
+  psymtab = new legacy_psymtab (name, objfile);
 
   /* Keep a backpointer to the file's symbols.  */
 
@@ -4675,7 +4641,8 @@ new_psymtab (const char *name, struct objfile *objfile)
   PENDING_LIST (psymtab) = pending_list;
 
   /* The way to turn this into a symtab is to call...  */
-  psymtab->read_symtab = mdebug_read_symtab;
+  psymtab->legacy_read_symtab = mdebug_read_symtab;
+  psymtab->legacy_expand_psymtab = mdebug_expand_psymtab;
   return (psymtab);
 }
 
@@ -4754,11 +4721,10 @@ new_block (enum block_type type, enum language language)
 static struct symbol *
 new_symbol (const char *name)
 {
-  struct symbol *s = allocate_symbol (mdebugread_objfile);
+  struct symbol *s = new (&mdebugread_objfile->objfile_obstack) symbol;
 
-  SYMBOL_SET_LANGUAGE (s, psymtab_language,
-                      &mdebugread_objfile->objfile_obstack);
-  SYMBOL_SET_NAMES (s, name, strlen (name), 1, mdebugread_objfile);
+  s->set_language (psymtab_language, &mdebugread_objfile->objfile_obstack);
+  s->compute_and_set_names (name, true, mdebugread_objfile->per_bfd);
   return s;
 }
 
@@ -4770,7 +4736,7 @@ new_type (char *name)
   struct type *t;
 
   t = alloc_type (mdebugread_objfile);
-  TYPE_NAME (t) = name;
+  t->set_name (name);
   INIT_CPLUS_SPECIFIC (t);
   return t;
 }
@@ -4804,8 +4770,9 @@ elfmdebug_build_psymtabs (struct objfile *objfile,
   reader.install ();
 }
 
+void _initialize_mdebugread ();
 void
-_initialize_mdebugread (void)
+_initialize_mdebugread ()
 {
   mdebug_register_index
     = register_symbol_register_impl (LOC_REGISTER, &mdebug_register_funcs);
This page took 0.037971 seconds and 4 git commands to generate.