Make check_for_argument skip whitespace after arg itself

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

diff --git a/gdb/mdebugread.c b/gdb/mdebugread.c
index 6cf2cad182b7ea6cb49fe06e824a6bb95c516798..2b54fef051aa74e01efd3a2880e878f6909f3c23 100644 (file)
--- a/gdb/mdebugread.c
+++ b/gdb/mdebugread.c
@@ -377,7 +377,6 @@ mdebug_build_psymtabs (minimal_symbol_reader &reader,
                           objfile->name);
       printf_unfiltered (_("You should compile with -g2 or "
                           "-g3 for best debugging support.\n"));
-      gdb_flush (gdb_stdout);
     }
 #endif
 }
@@ -1359,14 +1358,15 @@ parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend,
 
 /* Basic types.  */
 
-static const struct objfile_data *basic_type_data;
+static const struct objfile_key<struct type *,
+                               gdb::noop_deleter<struct type *>>
+  basic_type_data;
 
 static struct type *
 basic_type (int bt, struct objfile *objfile)
 {
   struct gdbarch *gdbarch = get_objfile_arch (objfile);
-  struct type **map_bt
-    = (struct type **) objfile_data (objfile, basic_type_data);
+  struct type **map_bt = basic_type_data.get (objfile);
   struct type *tp;
 
   if (bt >= btMax)
@@ -1376,7 +1376,7 @@ basic_type (int bt, struct objfile *objfile)
     {
       map_bt = OBSTACK_CALLOC (&objfile->objfile_obstack,
                               btMax, struct type *);
-      set_objfile_data (objfile, basic_type_data, map_bt);
+      basic_type_data.set (objfile, map_bt);
     }
 
   if (map_bt[bt])
@@ -2765,6 +2765,9 @@ parse_partial_symbols (minimal_symbol_reader &reader,
              /* Handle stabs continuation.  */
              {
                char *stabstring = debug_info->ss + fh->issBase + sh.iss;
+               /* If we need to heap-allocate STABSTRING, this owns
+                  it.  */
+               gdb::unique_xmalloc_ptr<char> stabstring_storage;
                int len = strlen (stabstring);
 
                while (stabstring[len - 1] == '\\')
@@ -2787,14 +2790,19 @@ parse_partial_symbols (minimal_symbol_reader &reader,
                    stabstring2 = debug_info->ss + fh->issBase + sh2.iss;
                    len2 = strlen (stabstring2);
 
-                   /* Concatinate stabstring2 with stabstring1.  */
-                   if (stabstring
-                    && stabstring != debug_info->ss + fh->issBase + sh.iss)
-                     stabstring
-                       = (char *) xrealloc (stabstring, len + len2 + 1);
+                   /* Concatenate stabstring2 with stabstring1.  */
+                   if (stabstring_storage != nullptr)
+                     {
+                       stabstring_storage.reset
+                         ((char *) xrealloc (stabstring_storage.release (),
+                                             len + len2 + 1));
+                       stabstring = stabstring_storage.get ();
+                     }
                    else
                      {
-                       stabstring = (char *) xmalloc (len + len2 + 1);
+                       stabstring_storage.reset
+                         ((char *) xmalloc (len + len2 + 1));
+                       stabstring = stabstring_storage.get ();
                        strcpy (stabstring, stabstring1);
                      }
                    strcpy (stabstring + len, stabstring2);
@@ -3330,9 +3338,6 @@ parse_partial_symbols (minimal_symbol_reader &reader,
                               hex_string (type_code)); /* CUR_SYMBOL_TYPE */
                    continue;
                  }
-               if (stabstring
-                   && stabstring != debug_info->ss + fh->issBase + sh.iss)
-                 xfree (stabstring);
              }
              /* end - Handle continuation */
            }
@@ -3679,7 +3684,7 @@ parse_partial_symbols (minimal_symbol_reader &reader,
          && save_pst->text_low_valid
          && !(objfile->flags & OBJF_REORDERED))
        {
-         for (partial_symtab *iter : objfile_psymtabs (objfile))
+         for (partial_symtab *iter : objfile->psymtabs ())
            {
              if (save_pst != iter
                  && save_pst->raw_text_low () >= iter->raw_text_low ()
@@ -3709,8 +3714,8 @@ parse_partial_symbols (minimal_symbol_reader &reader,
       /* Skip the first file indirect entry as it is a self dependency for
          source files or a reverse .h -> .c dependency for header files.  */
       pst->number_of_dependencies = 0;
-      pst->dependencies = XOBNEWVEC (&objfile->objfile_obstack,
-                                    partial_symtab *, (fh->crfd - 1));
+      pst->dependencies
+       = objfile->partial_symtabs->allocate_dependencies (fh->crfd - 1);
       for (s_idx = 1; s_idx < fh->crfd; s_idx++)
        {
          RFDT rh;
@@ -3739,11 +3744,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.  */
-  if (objfile->psymtabs->next == NULL
-      && objfile->psymtabs->number_of_dependencies == 0
-      && objfile->psymtabs->n_global_syms == 0
-      && objfile->psymtabs->n_static_syms == 0)
-    objfile->psymtabs = NULL;
+  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;
 }
 
 /* If the current psymbol has an enumerated type, we need to add
@@ -4500,7 +4506,7 @@ static void
 add_symbol (struct symbol *s, struct symtab *symtab, struct block *b)
 {
   symbol_set_symtab (s, symtab);
-  dict_add_symbol (BLOCK_DICT (b), s);
+  mdict_add_symbol (BLOCK_MULTIDICT (b), s);
 }
 
 /* Add a new block B to a symtab S.  */
@@ -4728,7 +4734,7 @@ new_bvect (int nblocks)
 }
 
 /* Allocate and zero a new block of language LANGUAGE, and set its
-   BLOCK_DICT.  If function is non-zero, assume the block is
+   BLOCK_MULTIDICT.  If function is non-zero, assume the block is
    associated to a function, and make sure that the symbols are stored
    linearly; otherwise, store them hashed.  */
 
@@ -4741,9 +4747,9 @@ new_block (enum block_type type, enum language language)
   struct block *retval = XCNEW (struct block);
 
   if (type == FUNCTION_BLOCK)
-    BLOCK_DICT (retval) = dict_create_linear_expandable (language);
+    BLOCK_MULTIDICT (retval) = mdict_create_linear_expandable (language);
   else
-    BLOCK_DICT (retval) = dict_create_hashed_expandable (language);
+    BLOCK_MULTIDICT (retval) = mdict_create_hashed_expandable (language);
 
   return retval;
 }
@@ -4806,8 +4812,6 @@ elfmdebug_build_psymtabs (struct objfile *objfile,
 void
 _initialize_mdebugread (void)
 {
-  basic_type_data = register_objfile_data ();
-
   mdebug_register_index
     = register_symbol_register_impl (LOC_REGISTER, &mdebug_register_funcs);
   mdebug_regparm_index