X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gas%2Fstabs.c;h=916594c5d2f0c6bcab20ea0e8fbc6bb6cef011d7;hb=854594f5ce00381eb0ed57e3c7fa08b5971eabec;hp=38bbc24687dcea42cbf3f625f8bc38a782bf5616;hpb=411863a44d47767443870273ecd7d6f51c84fcac;p=deliverable%2Fbinutils-gdb.git diff --git a/gas/stabs.c b/gas/stabs.c index 38bbc24687..916594c5d2 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-2016 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, const char *, const char *); +static void generate_asm_file (int, const 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) @@ -138,10 +134,7 @@ get_stab_string_offset (string, stabstr_secname) /* 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; - int type, other, desc; +aout_process_stab (int what, const char *string, int type, int other, int desc) { /* Put the stab information in the symbol table. */ symbolS *symbol; @@ -152,11 +145,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 +161,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,13 +173,13 @@ 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, + const char * stab_secname, + const char * stabstr_secname) { long longint; - char *string, *saved_string_obstack_end; + const char *string; + char *saved_string_obstack_end; int type; int other; int desc; @@ -337,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 @@ -371,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; @@ -407,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); } @@ -416,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; @@ -441,9 +429,7 @@ s_xstab (what) the stab section name. */ if (saved_secname == 0 || strcmp (saved_secname, stab_secname)) { - stabstr_secname = (char *) xmalloc (strlen (stab_secname) + 4); - strcpy (stabstr_secname, stab_secname); - strcat (stabstr_secname, "str"); + stabstr_secname = concat (stab_secname, "str", (char *) NULL); if (saved_secname) { free (saved_secname); @@ -460,8 +446,7 @@ s_xstab (what) /* Frob invented at RMS' request. Set the n_desc of a symbol. */ void -s_desc (ignore) - int ignore ATTRIBUTE_UNUSED; +s_desc (int ignore ATTRIBUTE_UNUSED) { char *name; char c; @@ -469,11 +454,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; @@ -498,12 +482,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; + const char *file; unsigned int lineno; - as_where (&file, &lineno); + file = as_where (&lineno); + if (use_gnu_debug_info_extensions) + { + const char *dir; + char *dir2; + + dir = remap_debug_filename (getpwd ()); + dir2 = concat (dir, "/", NULL); + generate_asm_file (N_SO, dir2); + free (dir2); + xfree ((char *) dir); + } generate_asm_file (N_SO, file); } @@ -511,21 +506,19 @@ 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, const char *file) { static char *last_file; static int label_count; char *hold; char sym[30]; char *buf; - char *tmp = file; - char *endp = file + strlen (file); - char *bufp = buf; + const char *tmp = file; + const 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 @@ -540,13 +533,13 @@ 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 = XNEWVEC (char, 2 * strlen (file) + strlen (sym) + 12); *bufp++ = '"'; - while (tmp < endp) + while (tmp < file_endp) { - char *bslash = strchr (tmp, '\\'); + const char *bslash = strchr (tmp, '\\'); size_t len = (bslash) ? (size_t) (bslash - tmp + 1) : strlen (tmp); /* Double all backslashes, since demand_copy_C_string (used by @@ -580,11 +573,11 @@ 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; - char *file; + const char *file; unsigned int lineno; char *buf; char sym[30]; @@ -599,7 +592,7 @@ stabs_generate_asm_lineno () hold = input_line_pointer; - as_where (&file, &lineno); + file = as_where (&lineno); /* Don't emit sequences of stabs for the same line. */ if (prev_file == NULL) @@ -609,7 +602,7 @@ stabs_generate_asm_lineno () prev_lineno = lineno; } else if (lineno == prev_lineno - && strcmp (file, prev_file) == 0) + && filename_cmp (file, prev_file) == 0) { /* Same file/line as last time. */ return; @@ -618,7 +611,7 @@ stabs_generate_asm_lineno () { /* Remember file/line for next time. */ prev_lineno = lineno; - if (strcmp (file, prev_file) != 0) + if (filename_cmp (file, prev_file) != 0) { free (prev_file); prev_file = xstrdup (file); @@ -636,13 +629,13 @@ stabs_generate_asm_lineno () if (in_dot_func_p) { - buf = (char *) alloca (100 + strlen (current_function_label)); + buf = XNEWVEC (char, 100 + strlen (current_function_label)); sprintf (buf, "%d,0,%d,%s-%s\n", N_SLINE, lineno, sym, current_function_label); } else { - buf = (char *) alloca (100); + buf = XNEWVEC (char, 100); sprintf (buf, "%d,0,%d,%s\n", N_SLINE, lineno, sym); } input_line_pointer = buf; @@ -651,32 +644,31 @@ stabs_generate_asm_lineno () input_line_pointer = hold; outputting_stabs_line_debug = 0; + free (buf); } /* 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; char *buf; - char *file; unsigned int lineno; if (! void_emitted_p) { - input_line_pointer = "\"void:t1=1\",128,0,0,0"; + input_line_pointer = (char *) "\"void:t1=1\",128,0,0,0"; s_stab ('s'); void_emitted_p = 1; } - as_where (&file, &lineno); - asprintf (&buf, "\"%s:F1\",%d,0,%d,%s", - funcname, N_FUN, lineno + 1, startlabname); + 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; s_stab ('s'); free (buf); @@ -689,9 +681,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; @@ -702,7 +693,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);