X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;ds=sidebyside;f=gas%2Fstabs.c;h=9e055c4c1c6776ed7e4b2cd08df757ba1d15dc0e;hb=f9acce4a4f411e78ebca90995c598ed231b104a3;hp=cd5a705ff23ef209ea25c45a01bb773499341f8e;hpb=0e389e770d54185d8107db1972d3ae0576d0fa1d;p=deliverable%2Fbinutils-gdb.git diff --git a/gas/stabs.c b/gas/stabs.c index cd5a705ff2..9e055c4c1c 100644 --- a/gas/stabs.c +++ b/gas/stabs.c @@ -1,25 +1,25 @@ /* Generic stabs parsing for gas. - Copyright 1989, 1990, 1991, 1993, 1995, 1996, 1997, 1998, 2000, 2001 - Free Software Foundation, Inc. + Copyright (C) 1989-2015 Free Software Foundation, Inc. -This file is part of GAS, the GNU Assembler. + This file is part of GAS, the GNU Assembler. -GAS is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as -published by the Free Software Foundation; either version 2, -or (at your option) any later version. + GAS is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 3, + or (at your option) any later version. -GAS is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See -the GNU General Public License for more details. + GAS is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See + 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. */ + 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, 51 Franklin Street - Fifth Floor, Boston, MA + 02110-1301, USA. */ #include "as.h" +#include "filenames.h" #include "obstack.h" #include "subsegs.h" #include "ecoff.h" @@ -34,8 +34,8 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA int outputting_stabs_line_debug = 0; -static void s_stab_generic PARAMS ((int, char *, char *)); -static void generate_asm_file PARAMS ((int, char *)); +static void s_stab_generic (int, char *, char *); +static void generate_asm_file (int, char *); /* Allow backends to override the names used for the stab sections. */ #ifndef STAB_SECTION_NAME @@ -80,9 +80,7 @@ static const char *current_function_label; #endif unsigned int -get_stab_string_offset (string, stabstr_secname) - const char *string; - const char *stabstr_secname; +get_stab_string_offset (const char *string, const char *stabstr_secname) { unsigned int length; unsigned int retval; @@ -109,11 +107,9 @@ get_stab_string_offset (string, stabstr_secname) p = frag_more (1); *p = 0; retval = seg_info (seg)->stabu.stab_string_size = 1; -#ifdef BFD_ASSEMBLER bfd_set_section_flags (stdoutput, seg, SEC_READONLY | SEC_DEBUGGING); if (seg->name == stabstr_secname) seg->name = xstrdup (stabstr_secname); -#endif } if (length > 0) @@ -152,11 +148,10 @@ aout_process_stab (what, string, type, other, desc) ends in "\" and the debug info is continued in the next .stabs directive) from being separated by other random symbols. */ symbol = symbol_create (string, undefined_section, 0, - (struct frag *) NULL); + &zero_address_frag); if (what == 's' || what == 'n') { /* Pick up the value from the input line. */ - symbol_set_frag (symbol, &zero_address_frag); pseudo_set (symbol); } else @@ -169,6 +164,8 @@ aout_process_stab (what, string, type, other, desc) symbol_append (symbol, symbol_lastP, &symbol_rootP, &symbol_lastP); + symbol_get_bfdsym (symbol)->flags |= BSF_DEBUGGING; + S_SET_TYPE (symbol, type); S_SET_OTHER (symbol, other); S_SET_DESC (symbol, desc); @@ -179,10 +176,7 @@ aout_process_stab (what, string, type, other, desc) kinds of stab sections. */ static void -s_stab_generic (what, stab_secname, stabstr_secname) - int what; - char *stab_secname; - char *stabstr_secname; +s_stab_generic (int what, char *stab_secname, char *stabstr_secname) { long longint; char *string, *saved_string_obstack_end; @@ -240,6 +234,14 @@ s_stab_generic (what, stab_secname, stabstr_secname) other = longint; desc = get_absolute_expression (); + + if ((desc > 0xffff) || (desc < -0x8000)) + /* This could happen for example with a source file with a huge + number of lines. The only cure is to use a different debug + format, probably DWARF. */ + as_warn (_(".stab%c: description field '%x' too big, try a different debug format"), + what, desc); + if (what == 's' || what == 'n') { if (*input_line_pointer != ',') @@ -329,10 +331,8 @@ s_stab_generic (what, stab_secname, stabstr_secname) if (! seg_info (seg)->hadone) { -#ifdef BFD_ASSEMBLER bfd_set_section_flags (stdoutput, seg, SEC_READONLY | SEC_RELOC | SEC_DEBUGGING); -#endif #ifdef INIT_STAB_SECTION INIT_STAB_SECTION (seg); #endif @@ -343,7 +343,7 @@ s_stab_generic (what, stab_secname, stabstr_secname) if (what == 's') { /* Release the string, if nobody else has used the obstack. */ - if (saved_string_obstack_end == notes.next_free) + if (saved_string_obstack_end == notes.next_free) obstack_free (¬es, string); } @@ -363,13 +363,11 @@ s_stab_generic (what, stab_secname, stabstr_secname) } else { - const char *fake; symbolS *symbol; expressionS exp; /* Arrange for a value representing the current location. */ - fake = FAKE_LABEL_NAME; - symbol = symbol_new (fake, saved_seg, dot, saved_frag); + symbol = symbol_temp_new (saved_seg, dot, saved_frag); exp.X_op = O_symbol; exp.X_add_symbol = symbol; @@ -399,8 +397,7 @@ s_stab_generic (what, stab_secname, stabstr_secname) /* Regular stab directive. */ void -s_stab (what) - int what; +s_stab (int what) { s_stab_generic (what, STAB_SECTION_NAME, STAB_STRING_SECTION_NAME); } @@ -408,8 +405,7 @@ s_stab (what) /* "Extended stabs", used in Solaris only now. */ void -s_xstab (what) - int what; +s_xstab (int what) { int length; char *stab_secname, *stabstr_secname; @@ -461,11 +457,10 @@ s_desc (ignore) symbolS *symbolP; int temp; - name = input_line_pointer; - c = get_symbol_end (); + c = get_symbol_name (&name); p = input_line_pointer; *p = c; - SKIP_WHITESPACE (); + SKIP_WHITESPACE_AFTER_NAME (); if (*input_line_pointer != ',') { *p = 0; @@ -490,12 +485,23 @@ s_desc (ignore) /* Generate stabs debugging information to denote the main source file. */ void -stabs_generate_asm_file () +stabs_generate_asm_file (void) { char *file; unsigned int lineno; as_where (&file, &lineno); + if (use_gnu_debug_info_extensions) + { + const char *dir; + char *dir2; + + dir = remap_debug_filename (getpwd ()); + dir2 = (char *) alloca (strlen (dir) + 2); + sprintf (dir2, "%s%s", dir, "/"); + generate_asm_file (N_SO, dir2); + xfree ((char *) dir); + } generate_asm_file (N_SO, file); } @@ -503,9 +509,7 @@ stabs_generate_asm_file () TYPE is one of N_SO, N_SOL. */ static void -generate_asm_file (type, file) - int type; - char *file; +generate_asm_file (int type, char *file) { static char *last_file; static int label_count; @@ -513,11 +517,11 @@ generate_asm_file (type, file) char sym[30]; char *buf; char *tmp = file; - char *endp = file + strlen (file); - char *bufp = buf; + char *file_endp = file + strlen (file); + char *bufp; if (last_file != NULL - && strcmp (last_file, file) == 0) + && filename_cmp (last_file, file) == 0) return; /* Rather than try to do this in some efficient fashion, we just @@ -532,11 +536,11 @@ generate_asm_file (type, file) /* Allocate enough space for the file name (possibly extended with doubled up backslashes), the symbol name, and the other characters that make up a stabs file directive. */ - bufp = buf = xmalloc (2 * strlen (file) + strlen (sym) + 12); + bufp = buf = (char *) xmalloc (2 * strlen (file) + strlen (sym) + 12); *bufp++ = '"'; - while (tmp < endp) + while (tmp < file_endp) { char *bslash = strchr (tmp, '\\'); size_t len = (bslash) ? (size_t) (bslash - tmp + 1) : strlen (tmp); @@ -572,7 +576,7 @@ generate_asm_file (type, file) used to produce debugging information for an assembler file. */ void -stabs_generate_asm_lineno () +stabs_generate_asm_lineno (void) { static int label_count; char *hold; @@ -580,10 +584,9 @@ stabs_generate_asm_lineno () unsigned int lineno; char *buf; char sym[30]; - - /* Let the world know that we are in the middle of generating a - piece of stabs line debugging information. */ - outputting_stabs_line_debug = 1; + /* Remember the last file/line and avoid duplicates. */ + static unsigned int prev_lineno = -1; + static char *prev_file = NULL; /* Rather than try to do this in some efficient fashion, we just generate a string and then parse it again. That lets us use the @@ -594,6 +597,34 @@ stabs_generate_asm_lineno () as_where (&file, &lineno); + /* Don't emit sequences of stabs for the same line. */ + if (prev_file == NULL) + { + /* First time thru. */ + prev_file = xstrdup (file); + prev_lineno = lineno; + } + else if (lineno == prev_lineno + && filename_cmp (file, prev_file) == 0) + { + /* Same file/line as last time. */ + return; + } + else + { + /* Remember file/line for next time. */ + prev_lineno = lineno; + if (filename_cmp (file, prev_file) != 0) + { + free (prev_file); + prev_file = xstrdup (file); + } + } + + /* Let the world know that we are in the middle of generating a + piece of stabs line debugging information. */ + outputting_stabs_line_debug = 1; + generate_asm_file (N_SOL, file); sprintf (sym, "%sL%d", FAKE_LABEL_NAME, label_count); @@ -622,9 +653,7 @@ stabs_generate_asm_lineno () All assembler functions are assumed to have return type `void'. */ void -stabs_generate_asm_func (funcname, startlabname) - const char *funcname; - const char *startlabname; +stabs_generate_asm_func (const char *funcname, const char *startlabname) { static int void_emitted_p; char *hold = input_line_pointer; @@ -640,8 +669,9 @@ stabs_generate_asm_func (funcname, startlabname) } as_where (&file, &lineno); - asprintf (&buf, "\"%s:F1\",%d,0,%d,%s", - funcname, N_FUN, lineno + 1, startlabname); + 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; s_stab ('s'); free (buf); @@ -654,9 +684,8 @@ stabs_generate_asm_func (funcname, startlabname) /* Emit a stab to record the end of a function. */ void -stabs_generate_asm_endfunc (funcname, startlabname) - const char *funcname ATTRIBUTE_UNUSED; - const char *startlabname; +stabs_generate_asm_endfunc (const char *funcname ATTRIBUTE_UNUSED, + const char *startlabname) { static int label_count; char *hold = input_line_pointer; @@ -667,7 +696,8 @@ stabs_generate_asm_endfunc (funcname, startlabname) ++label_count; colon (sym); - asprintf (&buf, "\"\",%d,0,0,%s-%s", N_FUN, sym, startlabname); + if (asprintf (&buf, "\"\",%d,0,0,%s-%s", N_FUN, sym, startlabname) == -1) + as_fatal ("%s", xstrerror (errno)); input_line_pointer = buf; s_stab ('s'); free (buf);