X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gas%2Fstabs.c;h=de37f0ae9379a3bfd4ac17c79fcea2ce2b10ba14;hb=202e762b322444344827acbf98162fcb2910e0dd;hp=69cca1de4b1ee04ca31c5b1d7ba825213c26f171;hpb=05f4ab67ff65655e11139d273fd53a602347a6c5;p=deliverable%2Fbinutils-gdb.git diff --git a/gas/stabs.c b/gas/stabs.c index 69cca1de4b..de37f0ae93 100644 --- a/gas/stabs.c +++ b/gas/stabs.c @@ -1,6 +1,5 @@ /* Generic stabs parsing for gas. - Copyright 1989, 1990, 1991, 1993, 1995, 1996, 1997, 1998, 2000, 2001 - 2002, 2003, 2004, 2005, 2007 Free Software Foundation, Inc. + Copyright (C) 1989-2020 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -20,6 +19,7 @@ 02110-1301, USA. */ #include "as.h" +#include "filenames.h" #include "obstack.h" #include "subsegs.h" #include "ecoff.h" @@ -34,8 +34,7 @@ int outputting_stabs_line_debug = 0; -static void s_stab_generic (int, char *, char *); -static void generate_asm_file (int, char *); +static void generate_asm_file (int, const char *); /* Allow backends to override the names used for the stab sections. */ #ifndef STAB_SECTION_NAME @@ -46,13 +45,13 @@ static void generate_asm_file (int, 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) @@ -134,10 +134,7 @@ get_stab_string_offset (const char *string, const char *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; @@ -173,13 +170,19 @@ 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. 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, char *stab_secname, char *stabstr_secname) +s_stab_generic (int what, + const char *stab_secname, + const char *stabstr_secname, + const char *stab_secname_obstack_end) { long longint; - char *string, *saved_string_obstack_end; + const char *string; + char *saved_string_obstack_end; int type; int other; int desc; @@ -202,10 +205,16 @@ s_stab_generic (int what, char *stab_secname, char *stabstr_secname) 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 (¬es); SKIP_WHITESPACE (); if (*input_line_pointer == ',') input_line_pointer++; @@ -307,7 +316,6 @@ s_stab_generic (int what, char *stab_secname, char *stabstr_secname) char *p; static segT cached_sec; - static char *cached_secname; dot = frag_now_fix (); @@ -315,7 +323,7 @@ s_stab_generic (int what, char *stab_secname, char *stabstr_secname) 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, char *stab_secname, char *stabstr_secname) 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, char *stab_secname, char *stabstr_secname) 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 (¬es, 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 (¬es)) + obstack_free (¬es, 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 (¬es)) + obstack_free (¬es, 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, char *stab_secname, char *stabstr_secname) } else { + if (stab_secname_obstack_end != NULL) + { + free ((char *) stabstr_secname); + if (stab_secname_obstack_end == obstack_next_free (¬es)) + obstack_free (¬es, 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, char *stab_secname, char *stabstr_secname) 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 (¬es); SKIP_WHITESPACE (); if (*input_line_pointer == ',') input_line_pointer++; @@ -427,20 +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 = (char *) xmalloc (strlen (stab_secname) + 4); - strcpy (stabstr_secname, stab_secname); - strcat (stabstr_secname, "str"); - 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 @@ -448,8 +451,7 @@ s_xstab (int 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; @@ -457,11 +459,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; @@ -488,19 +489,20 @@ s_desc (ignore) void 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 = alloca (strlen (dir) + 2); - sprintf (dir2, "%s%s", dir, "/"); + dir2 = concat (dir, "/", NULL); generate_asm_file (N_SO, dir2); + free (dir2); + xfree ((char *) dir); } generate_asm_file (N_SO, file); } @@ -509,46 +511,43 @@ stabs_generate_asm_file (void) TYPE is one of N_SO, N_SOL. */ static void -generate_asm_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); + 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 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; /* 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, '\\'); - size_t len = (bslash) ? (size_t) (bslash - tmp + 1) : strlen (tmp); + const char *bslash = strchr (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; @@ -559,8 +558,10 @@ generate_asm_file (int type, 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) @@ -568,8 +569,6 @@ generate_asm_file (int type, char *file) last_file = xstrdup (file); free (buf); - - input_line_pointer = hold; } /* Generate stabs debugging information for the current line. This is @@ -579,8 +578,7 @@ void stabs_generate_asm_lineno (void) { static int label_count; - char *hold; - char *file; + const char *file; unsigned int lineno; char *buf; char sym[30]; @@ -593,19 +591,17 @@ stabs_generate_asm_lineno (void) existing stabs hook, which expect to see a string, rather than inventing new ones. */ - 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) { - /* First time thru. */ + /* First time through. */ prev_file = xstrdup (file); 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; @@ -614,7 +610,7 @@ stabs_generate_asm_lineno (void) { /* 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); @@ -632,21 +628,24 @@ stabs_generate_asm_lineno (void) 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; + + temp_ilp (buf); s_stab ('n'); + restore_ilp (); + colon (sym); - input_line_pointer = hold; outputting_stabs_line_debug = 0; + free (buf); } /* Emit a function stab. @@ -655,30 +654,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; - char *file; unsigned int lineno; if (! void_emitted_p) { - input_line_pointer = "\"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 (&file, &lineno); + 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. */ @@ -688,7 +687,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]; @@ -698,11 +696,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; }