X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=gas%2Fstabs.c;h=8da1147c561cef285218605799e2616c02a78166;hb=8677059126a84cb9f71371beb8688138a41014fc;hp=f9127f0d5a5fbbee5f3e176f99585ad0de609f74;hpb=1181551ef0a9a7f611a3d1130d2b284280882870;p=binutils-gdb.git diff --git a/gas/stabs.c b/gas/stabs.c index f9127f0d5a5..8da1147c561 100644 --- a/gas/stabs.c +++ b/gas/stabs.c @@ -1,5 +1,5 @@ /* Generic stabs parsing for gas. - Copyright (C) 1989-2017 Free Software Foundation, Inc. + Copyright (C) 1989-2021 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -34,7 +34,6 @@ int outputting_stabs_line_debug = 0; -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. */ @@ -50,7 +49,7 @@ static void generate_asm_file (int, const char *); 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 bfd_boolean in_dot_func_p = FALSE; +static bool in_dot_func_p = false; /* 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, + bool 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) @@ -144,8 +144,7 @@ aout_process_stab (int what, const char *string, int type, int other, int desc) symbol chain. This is to avoid "continuation symbols" (where one 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, - &zero_address_frag); + symbol = symbol_create (string, undefined_section, &zero_address_frag, 0); if (what == 's' || what == 'n') { /* Pick up the value from the input line. */ @@ -170,12 +169,15 @@ aout_process_stab (int what, const char *string, int type, int other, int 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, - const char * stab_secname, - const char * stabstr_secname) +s_stab_generic (int what, + const char *stab_secname, + const char *stabstr_secname, + const char *stab_secname_obstack_end) { long longint; const char *string; @@ -202,10 +204,16 @@ s_stab_generic (int what, 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 +315,6 @@ s_stab_generic (int what, char *p; static segT cached_sec; - static char *cached_secname; dot = frag_now_fix (); @@ -315,7 +322,7 @@ s_stab_generic (int what, 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 +330,12 @@ s_stab_generic (int what, 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 +343,19 @@ s_stab_generic (int what, 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. */ @@ -367,7 +377,7 @@ s_stab_generic (int what, expressionS exp; /* Arrange for a value representing the current location. */ - symbol = symbol_temp_new (saved_seg, dot, saved_frag); + symbol = symbol_temp_new (saved_seg, saved_frag, dot); exp.X_op = O_symbol; exp.X_add_symbol = symbol; @@ -384,6 +394,12 @@ s_stab_generic (int what, } 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 +415,7 @@ s_stab_generic (int what, 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 +424,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,18 +440,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 = concat (stab_secname, "str", (char *) NULL); - 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 @@ -537,12 +541,12 @@ generate_asm_file (int type, const char *file) while (tmp < file_endp) { const char *bslash = strchr (tmp, '\\'); - size_t len = (bslash) ? (size_t) (bslash - tmp + 1) : strlen (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 +563,7 @@ generate_asm_file (int type, const char *file) colon (sym); - if (last_file != NULL) - free (last_file); + free (last_file); last_file = xstrdup (file); free (buf); @@ -649,7 +652,7 @@ stabs_generate_asm_lineno (void) void stabs_generate_asm_func (const char *funcname, const char *startlabname) { - static bfd_boolean void_emitted_p = FALSE; + static bool void_emitted_p = false; char *buf; unsigned int lineno; @@ -658,7 +661,7 @@ stabs_generate_asm_func (const char *funcname, const char *startlabname) temp_ilp ((char *) "\"void:t1=1\",128,0,0,0"); s_stab ('s'); restore_ilp (); - void_emitted_p = TRUE; + void_emitted_p = true; } as_where (&lineno); @@ -672,7 +675,7 @@ stabs_generate_asm_func (const char *funcname, const char *startlabname) free (buf); current_function_label = xstrdup (startlabname); - in_dot_func_p = TRUE; + in_dot_func_p = true; } /* Emit a stab to record the end of a function. */ @@ -697,6 +700,6 @@ stabs_generate_asm_endfunc (const char *funcname ATTRIBUTE_UNUSED, restore_ilp (); free (buf); - in_dot_func_p = FALSE; + in_dot_func_p = false; current_function_label = NULL; }