X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gas%2Fstabs.c;h=c962bb4fdf78a5c685281976f6bd7609b14b7d61;hb=5c5055683b980c71e96b642565418ffdefc6f171;hp=2d87387c51c5476c60585089df694fc965b9e358;hpb=2b0f37619f797bf640b2d45acb615817dd202954;p=deliverable%2Fbinutils-gdb.git

diff --git a/gas/stabs.c b/gas/stabs.c
index 2d87387c51..c962bb4fdf 100644
--- a/gas/stabs.c
+++ b/gas/stabs.c
@@ -1,5 +1,5 @@
 /* Generic stabs parsing for gas.
-   Copyright (C) 1989-2016 Free Software Foundation, Inc.
+   Copyright (C) 1989-2020 Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
 
@@ -34,7 +34,6 @@
 
 int outputting_stabs_line_debug = 0;
 
-static void s_stab_generic (int, const char *, const char *);
 static void generate_asm_file (int, const char *);
 
 /* Allow backends to override the names used for the stab sections.  */
@@ -46,13 +45,13 @@ static void generate_asm_file (int, const char *);
 #define STAB_STRING_SECTION_NAME ".stabstr"
 #endif
 
-/* Non-zero if we're in the middle of a .func function, in which case
+/* True if we're in the middle of a .func function, in which case
    stabs_generate_asm_lineno emits function relative line number stabs.
    Otherwise it emits line number stabs with absolute addresses.  Note that
    both cases only apply to assembler code assembled with -gstabs.  */
-static int in_dot_func_p;
+static bfd_boolean in_dot_func_p = FALSE;
 
-/* Label at start of current function if in_dot_func_p != 0.  */
+/* Label at start of current function if in_dot_func_p != FALSE.  */
 static const char *current_function_label;
 
 /*
@@ -80,7 +79,8 @@ static const char *current_function_label;
 #endif
 
 unsigned int
-get_stab_string_offset (const char *string, const char *stabstr_secname)
+get_stab_string_offset (const char *string, const char *stabstr_secname,
+			bfd_boolean free_stabstr_secname)
 {
   unsigned int length;
   unsigned int retval;
@@ -97,8 +97,10 @@ get_stab_string_offset (const char *string, const char *stabstr_secname)
   save_seg = now_seg;
   save_subseg = now_subseg;
 
-  /* Create the stab string section.  */
+  /* Create the stab string section, if it doesn't already exist.  */
   seg = subseg_new (stabstr_secname, 0);
+  if (free_stabstr_secname && seg->name != stabstr_secname)
+    free ((char *) stabstr_secname);
 
   retval = seg_info (seg)->stabu.stab_string_size;
   if (retval <= 0)
@@ -107,9 +109,7 @@ get_stab_string_offset (const char *string, const char *stabstr_secname)
       p = frag_more (1);
       *p = 0;
       retval = seg_info (seg)->stabu.stab_string_size = 1;
-      bfd_set_section_flags (stdoutput, seg, SEC_READONLY | SEC_DEBUGGING);
-      if (seg->name == stabstr_secname)
-	seg->name = xstrdup (stabstr_secname);
+      bfd_set_section_flags (seg, SEC_READONLY | SEC_DEBUGGING);
     }
 
   if (length > 0)
@@ -170,12 +170,15 @@ aout_process_stab (int what, const char *string, int type, int other, int desc)
 #endif
 
 /* This can handle different kinds of stabs (s,n,d) and different
-   kinds of stab sections.  */
+   kinds of stab sections.  If STAB_SECNAME_OBSTACK_END is non-NULL,
+   then STAB_SECNAME and STABSTR_SECNAME will be freed if possible
+   before this function returns (the former by obstack_free).  */
 
 static void
-s_stab_generic (int          what,
-		const char * stab_secname,
-	       	const char * stabstr_secname)
+s_stab_generic (int what,
+		const char *stab_secname,
+		const char *stabstr_secname,
+		const char *stab_secname_obstack_end)
 {
   long longint;
   const char *string;
@@ -202,10 +205,16 @@ s_stab_generic (int          what,
       int length;
 
       string = demand_copy_C_string (&length);
+      if (string == NULL)
+	{
+	  as_warn (_(".stab%c: missing string"), what);
+	  ignore_rest_of_line ();
+	  return;
+	}
       /* FIXME: We should probably find some other temporary storage
 	 for string, rather than leaking memory if someone else
 	 happens to use the notes obstack.  */
-      saved_string_obstack_end = notes.next_free;
+      saved_string_obstack_end = obstack_next_free (&notes);
       SKIP_WHITESPACE ();
       if (*input_line_pointer == ',')
 	input_line_pointer++;
@@ -307,7 +316,6 @@ s_stab_generic (int          what,
       char *p;
 
       static segT cached_sec;
-      static char *cached_secname;
 
       dot = frag_now_fix ();
 
@@ -315,7 +323,7 @@ s_stab_generic (int          what,
       md_flush_pending_output ();
 #endif
 
-      if (cached_secname && !strcmp (cached_secname, stab_secname))
+      if (cached_sec && strcmp (cached_sec->name, stab_secname) == 0)
 	{
 	  seg = cached_sec;
 	  subseg_set (seg, 0);
@@ -323,15 +331,12 @@ s_stab_generic (int          what,
       else
 	{
 	  seg = subseg_new (stab_secname, 0);
-	  if (cached_secname)
-	    free (cached_secname);
-	  cached_secname = xstrdup (stab_secname);
 	  cached_sec = seg;
 	}
 
       if (! seg_info (seg)->hadone)
 	{
-	  bfd_set_section_flags (stdoutput, seg,
+	  bfd_set_section_flags (seg,
 				 SEC_READONLY | SEC_RELOC | SEC_DEBUGGING);
 #ifdef INIT_STAB_SECTION
 	  INIT_STAB_SECTION (seg);
@@ -339,13 +344,19 @@ s_stab_generic (int          what,
 	  seg_info (seg)->hadone = 1;
 	}
 
-      stroff = get_stab_string_offset (string, stabstr_secname);
-      if (what == 's')
-	{
-	  /* Release the string, if nobody else has used the obstack.  */
-	  if (saved_string_obstack_end == notes.next_free)
-	    obstack_free (&notes, string);
-	}
+      stroff = get_stab_string_offset (string, stabstr_secname,
+				       stab_secname_obstack_end != NULL);
+
+      /* Release the string, if nobody else has used the obstack.  */
+      if (saved_string_obstack_end != NULL
+	  && saved_string_obstack_end == obstack_next_free (&notes))
+	obstack_free (&notes, string);
+      /* Similarly for the section name.  This must be done before
+	 creating symbols below, which uses the notes obstack.  */
+      if (seg->name != stab_secname
+	  && stab_secname_obstack_end != NULL
+	  && stab_secname_obstack_end == obstack_next_free (&notes))
+	obstack_free (&notes, stab_secname);
 
       /* At least for now, stabs in a special stab section are always
 	 output as 12 byte blocks of information.  */
@@ -384,6 +395,12 @@ s_stab_generic (int          what,
     }
   else
     {
+      if (stab_secname_obstack_end != NULL)
+	{
+	  free ((char *) stabstr_secname);
+	  if (stab_secname_obstack_end == obstack_next_free (&notes))
+	    obstack_free (&notes, stab_secname);
+	}
 #ifdef OBJ_PROCESS_STAB
       OBJ_PROCESS_STAB (0, what, string, type, other, desc);
 #else
@@ -399,7 +416,7 @@ s_stab_generic (int          what,
 void
 s_stab (int what)
 {
-  s_stab_generic (what, STAB_SECTION_NAME, STAB_STRING_SECTION_NAME);
+  s_stab_generic (what, STAB_SECTION_NAME, STAB_STRING_SECTION_NAME, NULL);
 }
 
 /* "Extended stabs", used in Solaris only now.  */
@@ -408,13 +425,10 @@ void
 s_xstab (int what)
 {
   int length;
-  char *stab_secname, *stabstr_secname;
-  static char *saved_secname, *saved_strsecname;
+  char *stab_secname, *stabstr_secname, *stab_secname_obstack_end;
 
-  /* @@ MEMORY LEAK: This allocates a copy of the string, but in most
-     cases it will be the same string, so we could release the storage
-     back to the obstack it came from.  */
   stab_secname = demand_copy_C_string (&length);
+  stab_secname_obstack_end = obstack_next_free (&notes);
   SKIP_WHITESPACE ();
   if (*input_line_pointer == ',')
     input_line_pointer++;
@@ -427,18 +441,9 @@ s_xstab (int what)
 
   /* To get the name of the stab string section, simply add "str" to
      the stab section name.  */
-  if (saved_secname == 0 || strcmp (saved_secname, stab_secname))
-    {
-      stabstr_secname = concat (stab_secname, "str", (char *) NULL);
-      if (saved_secname)
-	{
-	  free (saved_secname);
-	  free (saved_strsecname);
-	}
-      saved_secname = stab_secname;
-      saved_strsecname = stabstr_secname;
-    }
-  s_stab_generic (what, saved_secname, saved_strsecname);
+  stabstr_secname = concat (stab_secname, "str", (char *) NULL);
+  s_stab_generic (what, stab_secname, stabstr_secname,
+		  stab_secname_obstack_end);
 }
 
 #ifdef S_SET_DESC
@@ -510,7 +515,6 @@ generate_asm_file (int type, const char *file)
 {
   static char *last_file;
   static int label_count;
-  char *hold;
   char sym[30];
   char *buf;
   const char *tmp = file;
@@ -525,8 +529,6 @@ generate_asm_file (int type, const char *file)
      generate a string and then parse it again.  That lets us use the
      existing stabs hook, which expect to see a string, rather than
      inventing new ones.  */
-  hold = input_line_pointer;
-
   sprintf (sym, "%sF%d", FAKE_LABEL_NAME, label_count);
   ++label_count;
 
@@ -540,12 +542,12 @@ generate_asm_file (int type, const char *file)
   while (tmp < file_endp)
     {
       const char *bslash = strchr (tmp, '\\');
-      size_t len = (bslash) ? (size_t) (bslash - tmp + 1) : strlen (tmp);
+      size_t len = bslash != NULL ? bslash - tmp + 1 : file_endp - tmp;
 
       /* Double all backslashes, since demand_copy_C_string (used by
 	 s_stab to extract the part in quotes) will try to replace them as
 	 escape sequences.  backslash may appear in a filespec.  */
-      strncpy (bufp, tmp, len);
+      memcpy (bufp, tmp, len);
 
       tmp += len;
       bufp += len;
@@ -556,17 +558,16 @@ generate_asm_file (int type, const char *file)
 
   sprintf (bufp, "\",%d,0,0,%s\n", type, sym);
 
-  input_line_pointer = buf;
+  temp_ilp (buf);
   s_stab ('s');
+  restore_ilp ();
+
   colon (sym);
 
-  if (last_file != NULL)
-    free (last_file);
+  free (last_file);
   last_file = xstrdup (file);
 
   free (buf);
-
-  input_line_pointer = hold;
 }
 
 /* Generate stabs debugging information for the current line.  This is
@@ -576,7 +577,6 @@ void
 stabs_generate_asm_lineno (void)
 {
   static int label_count;
-  char *hold;
   const char *file;
   unsigned int lineno;
   char *buf;
@@ -590,8 +590,6 @@ stabs_generate_asm_lineno (void)
      existing stabs hook, which expect to see a string, rather than
      inventing new ones.  */
 
-  hold = input_line_pointer;
-
   file = as_where (&lineno);
 
   /* Don't emit sequences of stabs for the same line.  */
@@ -638,11 +636,13 @@ stabs_generate_asm_lineno (void)
       buf = XNEWVEC (char, 100);
       sprintf (buf, "%d,0,%d,%s\n", N_SLINE, lineno, sym);
     }
-  input_line_pointer = buf;
+
+  temp_ilp (buf);
   s_stab ('n');
+  restore_ilp ();
+
   colon (sym);
 
-  input_line_pointer = hold;
   outputting_stabs_line_debug = 0;
   free (buf);
 }
@@ -653,29 +653,30 @@ stabs_generate_asm_lineno (void)
 void
 stabs_generate_asm_func (const char *funcname, const char *startlabname)
 {
-  static int void_emitted_p;
-  char *hold = input_line_pointer;
+  static bfd_boolean void_emitted_p = FALSE;
   char *buf;
   unsigned int lineno;
 
   if (! void_emitted_p)
     {
-      input_line_pointer = (char *) "\"void:t1=1\",128,0,0,0";
+      temp_ilp ((char *) "\"void:t1=1\",128,0,0,0");
       s_stab ('s');
-      void_emitted_p = 1;
+      restore_ilp ();
+      void_emitted_p = TRUE;
     }
 
   as_where (&lineno);
   if (asprintf (&buf, "\"%s:F1\",%d,0,%d,%s",
 		funcname, N_FUN, lineno + 1, startlabname) == -1)
     as_fatal ("%s", xstrerror (errno));
-  input_line_pointer = buf;
+
+  temp_ilp (buf);
   s_stab ('s');
+  restore_ilp ();
   free (buf);
 
-  input_line_pointer = hold;
   current_function_label = xstrdup (startlabname);
-  in_dot_func_p = 1;
+  in_dot_func_p = TRUE;
 }
 
 /* Emit a stab to record the end of a function.  */
@@ -685,7 +686,6 @@ stabs_generate_asm_endfunc (const char *funcname ATTRIBUTE_UNUSED,
 			    const char *startlabname)
 {
   static int label_count;
-  char *hold = input_line_pointer;
   char *buf;
   char sym[30];
 
@@ -695,11 +695,12 @@ stabs_generate_asm_endfunc (const char *funcname ATTRIBUTE_UNUSED,
 
   if (asprintf (&buf, "\"\",%d,0,0,%s-%s", N_FUN, sym, startlabname) == -1)
     as_fatal ("%s", xstrerror (errno));
-  input_line_pointer = buf;
+
+  temp_ilp (buf);
   s_stab ('s');
+  restore_ilp ();
   free (buf);
 
-  input_line_pointer = hold;
-  in_dot_func_p = 0;
+  in_dot_func_p = FALSE;
   current_function_label = NULL;
 }