ia64-hpux patches from Steve Ellcey.

[deliverable/binutils-gdb.git] / gas / stabs.c

diff --git a/gas/stabs.c b/gas/stabs.c
index db7e1bfb6d3906dcaa1d64890b9c4275f3c3a386..d9998f1a4cb5d77e87a46d92d9881a0af0767fd1 100644 (file)
--- a/gas/stabs.c
+++ b/gas/stabs.c
@@ -1,5 +1,5 @@
 /* Generic stabs parsing for gas.
-   Copyright (C) 1989, 90, 91, 93, 94, 95, 96, 97, 1998
+   Copyright (C) 1989, 90, 91, 93, 94, 95, 96, 97, 98, 99, 2000
    Free Software Foundation, Inc.
 
 This file is part of GAS, the GNU Assembler.
@@ -17,7 +17,7 @@ the GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GAS; see the file COPYING.  If not, write to the Free
 Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA. */
+02111-1307, USA.  */
 
 #include "as.h"
 #include "obstack.h"
@@ -25,7 +25,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "ecoff.h"
 
 /* We need this, despite the apparent object format dependency, since
-   it defines stab types, which all object formats can use now. */
+   it defines stab types, which all object formats can use now.  */
 
 #include "aout/stab_gnu.h"
 
@@ -112,7 +112,7 @@ get_stab_string_offset (string, stabstr_secname)
     }
 
   if (length > 0)
-    {                          /* Ordinary case. */
+    {                          /* Ordinary case.  */
       p = frag_more (length + 1);
       strcpy (p, string);
 
@@ -131,9 +131,8 @@ get_stab_string_offset (string, stabstr_secname)
 #define OBJ_PROCESS_STAB(SEG,W,S,T,O,D)        aout_process_stab(W,S,T,O,D)
 #endif
 
-static void aout_process_stab PARAMS ((int, const char *, int, int, int));
-
-static void
+/* Here instead of obj-aout.c because other formats use it too.  */
+void
 aout_process_stab (what, string, type, other, desc)
      int what;
      const char *string;
@@ -152,14 +151,14 @@ aout_process_stab (what, string, type, other, desc)
   if (what == 's' || what == 'n')
     {
       /* Pick up the value from the input line.  */
-      symbol->sy_frag = &zero_address_frag;
+      symbol_set_frag (symbol, &zero_address_frag);
       pseudo_set (symbol);
     }
   else
     {
       /* .stabd sets the name to NULL.  Why?  */
       S_SET_NAME (symbol, NULL);
-      symbol->sy_frag = frag_now;
+      symbol_set_frag (symbol, frag_now);
       S_SET_VALUE (symbol, (valueT) frag_now_fix ());
     }
 
@@ -172,9 +171,9 @@ aout_process_stab (what, string, type, other, desc)
 #endif
 
 /* This can handle different kinds of stabs (s,n,d) and different
-   kinds of stab sections. */
+   kinds of stab sections.  */
 
-static void 
+static void
 s_stab_generic (what, stab_secname, stabstr_secname)
      int what;
      char *stab_secname;
@@ -384,7 +383,7 @@ s_stab_generic (what, stab_secname, stabstr_secname)
   demand_empty_rest_of_line ();
 }
 
-/* Regular stab directive. */
+/* Regular stab directive.  */
 
 void
 s_stab (what)
@@ -393,7 +392,7 @@ s_stab (what)
   s_stab_generic (what, STAB_SECTION_NAME, STAB_STRING_SECTION_NAME);
 }
 
-/* "Extended stabs", used in Solaris only now. */
+/* "Extended stabs", used in Solaris only now.  */
 
 void
 s_xstab (what)
@@ -439,9 +438,9 @@ s_xstab (what)
 
 /* Frob invented at RMS' request. Set the n_desc of a symbol.  */
 
-void 
+void
 s_desc (ignore)
-     int ignore;
+     int ignore ATTRIBUTE_UNUSED;
 {
   char *name;
   char c;
@@ -498,7 +497,7 @@ generate_asm_file (type, file)
   static char *last_file;
   static int label_count;
   char *hold;
-  char buf[100];
+  char *buf = xmalloc (2 * strlen (file) + 10);
   char sym[30];
 
   /* Rather than try to do this in some efficient fashion, we just
@@ -511,10 +510,28 @@ generate_asm_file (type, file)
   if (last_file == NULL
       || strcmp (last_file, file) != 0)
     {
+      char *tmp = file;
+      char *endp = file + strlen(file);
+      char *bufp = buf;
+
       sprintf (sym, "%sF%d", FAKE_LABEL_NAME, label_count);
       ++label_count;
 
-      sprintf (buf, "\"%s\",%d,0,0,%s\n", file, type, sym);
+      *bufp++ = '"';
+      while (tmp < endp)
+        {
+          char *bslash = strchr (tmp, '\\');
+          int len = (bslash ? (bslash - tmp + 1) : strlen (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);
+          tmp += len;
+          bufp += len;
+          if (bslash != NULL)
+            *bufp++ = '\\';
+        }
+      sprintf (bufp, "\",%d,0,0,%s\n", type, sym);
       input_line_pointer = buf;
       s_stab ('s');
       colon (sym);
@@ -525,6 +542,7 @@ generate_asm_file (type, file)
     }
 
   input_line_pointer = hold;
+  free (buf);
 }
 
 /* Generate stabs debugging information for the current line.  This is
@@ -609,7 +627,7 @@ stabs_generate_asm_func (funcname, startlabname)
 
 void
 stabs_generate_asm_endfunc (funcname, startlabname)
-     const char *funcname;
+     const char *funcname ATTRIBUTE_UNUSED;
      const char *startlabname;
 {
   static int label_count;