X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gas%2Fstabs.c;h=10e1461499d772d75c06c85e520574823660e07c;hb=4b4da1607aeed19ac399963a3aa12b0417e477ae;hp=d8f66b45f4979ef12f1d93f2b608942ede4d4ee4;hpb=d0352a18a504a4e7b761f6b3264cf11347d8d056;p=deliverable%2Fbinutils-gdb.git diff --git a/gas/stabs.c b/gas/stabs.c index d8f66b45f4..10e1461499 100644 --- a/gas/stabs.c +++ b/gas/stabs.c @@ -1,6 +1,6 @@ /* Generic stabs parsing for gas. - Copyright (C) 1989, 90, 91, 93, 94, 95, 96, 97, 98, 1999 - Free Software Foundation, Inc. + Copyright 1989, 1990, 1991, 1993, 1995, 1996, 1997, 1998, 2000, 2001 + 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -16,8 +16,8 @@ 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. */ +Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA +02110-1301, USA. */ #include "as.h" #include "obstack.h" @@ -25,12 +25,17 @@ 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" -static void s_stab_generic PARAMS ((int, char *, char *)); -static void generate_asm_file PARAMS ((int, char *)); +/* Holds whether the assembler is generating stabs line debugging + information or not. Potentially used by md_cleanup function. */ + +int outputting_stabs_line_debug = 0; + +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 @@ -75,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; @@ -112,7 +115,7 @@ get_stab_string_offset (string, stabstr_secname) } if (length > 0) - { /* Ordinary case. */ + { /* Ordinary case. */ p = frag_more (length + 1); strcpy (p, string); @@ -147,11 +150,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 @@ -171,16 +173,13 @@ 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 -s_stab_generic (what, stab_secname, stabstr_secname) - int what; - char *stab_secname; - char *stabstr_secname; +static void +s_stab_generic (int what, char *stab_secname, char *stabstr_secname) { long longint; - char *string; + char *string, *saved_string_obstack_end; int type; int other; int desc; @@ -194,18 +193,25 @@ s_stab_generic (what, stab_secname, stabstr_secname) 'd' indicating which type of .stab this is. */ if (what != 's') - string = ""; + { + string = ""; + saved_string_obstack_end = 0; + } else { int length; string = demand_copy_C_string (&length); + /* 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; SKIP_WHITESPACE (); if (*input_line_pointer == ',') input_line_pointer++; else { - as_warn (_(".stabs: Missing comma")); + as_warn (_(".stab%c: missing comma"), what); ignore_rest_of_line (); return; } @@ -213,7 +219,7 @@ s_stab_generic (what, stab_secname, stabstr_secname) if (get_absolute_expression_and_terminator (&longint) != ',') { - as_warn (_(".stab%c: Missing comma"), what); + as_warn (_(".stab%c: missing comma"), what); ignore_rest_of_line (); return; } @@ -221,18 +227,26 @@ s_stab_generic (what, stab_secname, stabstr_secname) if (get_absolute_expression_and_terminator (&longint) != ',') { - as_warn (_(".stab%c: Missing comma"), what); + as_warn (_(".stab%c: missing comma"), what); ignore_rest_of_line (); return; } 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 != ',') { - as_warn (_(".stab%c: Missing comma"), what); + as_warn (_(".stab%c: missing comma"), what); ignore_rest_of_line (); return; } @@ -330,8 +344,9 @@ s_stab_generic (what, stab_secname, stabstr_secname) stroff = get_stab_string_offset (string, stabstr_secname); if (what == 's') { - /* release the string */ - obstack_free (¬es, string); + /* Release the string, if nobody else has used the obstack. */ + if (saved_string_obstack_end == notes.next_free) + obstack_free (¬es, string); } /* At least for now, stabs in a special stab section are always @@ -350,13 +365,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; @@ -383,20 +396,18 @@ s_stab_generic (what, stab_secname, stabstr_secname) demand_empty_rest_of_line (); } -/* Regular stab directive. */ +/* Regular stab directive. */ void -s_stab (what) - int what; +s_stab (int 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) - int what; +s_xstab (int what) { int length; char *stab_secname, *stabstr_secname; @@ -438,7 +449,7 @@ s_xstab (what) /* Frob invented at RMS' request. Set the n_desc of a symbol. */ -void +void s_desc (ignore) int ignore ATTRIBUTE_UNUSED; { @@ -456,7 +467,7 @@ s_desc (ignore) if (*input_line_pointer != ',') { *p = 0; - as_bad (_("Expected comma after name \"%s\""), name); + as_bad (_("expected comma after \"%s\""), name); *p = c; ignore_rest_of_line (); } @@ -477,12 +488,21 @@ 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) + { + char *dir, *dir2; + + dir = getpwd (); + dir2 = alloca (strlen (dir) + 2); + sprintf (dir2, "%s%s", dir, "/"); + generate_asm_file (N_SO, dir2); + } generate_asm_file (N_SO, file); } @@ -490,66 +510,74 @@ 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; char *hold; - char *buf = xmalloc (2 * strlen (file) + 10); char sym[30]; + char *buf; + char *tmp = file; + char *endp = file + strlen (file); + char *bufp; + + if (last_file != NULL + && strcmp (last_file, file) == 0) + return; /* 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 existing stabs hook, which expect to see a string, rather than inventing new ones. */ - hold = input_line_pointer; - if (last_file == NULL - || strcmp (last_file, file) != 0) + sprintf (sym, "%sF%d", FAKE_LABEL_NAME, label_count); + ++label_count; + + /* 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++ = '"'; + + while (tmp < endp) { - char *tmp = file; - char *endp = file + strlen(file); - char *bufp = buf; - - sprintf (sym, "%sF%d", FAKE_LABEL_NAME, label_count); - ++label_count; - - *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); + char *bslash = strchr (tmp, '\\'); + size_t len = (bslash) ? (size_t) (bslash - tmp + 1) : strlen (tmp); - if (last_file != NULL) - free (last_file); - last_file = xstrdup (file); + /* 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++ = '\\'; } - input_line_pointer = hold; + sprintf (bufp, "\",%d,0,0,%s\n", type, sym); + + input_line_pointer = buf; + s_stab ('s'); + colon (sym); + + if (last_file != NULL) + free (last_file); + last_file = xstrdup (file); + free (buf); + + input_line_pointer = hold; } /* Generate stabs debugging information for the current line. This is 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; @@ -557,6 +585,9 @@ stabs_generate_asm_lineno () unsigned int lineno; char *buf; char sym[30]; + /* 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 @@ -567,6 +598,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 + && strcmp (file, prev_file) == 0) + { + /* Same file/line as last time. */ + return; + } + else + { + /* Remember file/line for next time. */ + prev_lineno = lineno; + if (strcmp (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); @@ -588,15 +647,14 @@ stabs_generate_asm_lineno () colon (sym); input_line_pointer = hold; + outputting_stabs_line_debug = 0; } /* Emit a function stab. 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; @@ -626,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;