X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gas%2Fecoff.c;h=bacc89fe3af6e8611f39fea88f229c6b4e0878f7;hb=eb7b504651ff7b44a7328cd967629d8f1d114a4b;hp=eb3beb3ed15a48528db6adb2511b4c5084818df5;hpb=6f2750feaf2827ef8a1a0a5b2f90c1e9a6cabbd1;p=deliverable%2Fbinutils-gdb.git diff --git a/gas/ecoff.c b/gas/ecoff.c index eb3beb3ed1..bacc89fe3a 100644 --- a/gas/ecoff.c +++ b/gas/ecoff.c @@ -1,5 +1,5 @@ /* ECOFF debugging support. - Copyright (C) 1993-2016 Free Software Foundation, Inc. + Copyright (C) 1993-2019 Free Software Foundation, Inc. Contributed by Cygnus Support. This file was put together by Ian Lance Taylor . A good deal of it comes directly from mips-tfile.c, by Michael @@ -185,7 +185,7 @@ Each file table has offsets for where the line numbers, local strings, local symbols, and procedure table starts from within the - global tables, and the indexs are reset to 0 for each of those + global tables, and the indices are reset to 0 for each of those tables for the file. The procedure table contains the binary equivalents of the .ent @@ -618,7 +618,7 @@ #26 48 0x00000030 struct no name { ifd = -1, index = 1048575 } */ -/* Redefinition of of storage classes as an enumeration for better +/* Redefinition of storage classes as an enumeration for better debugging. */ typedef enum sc { @@ -1422,7 +1422,7 @@ static symint_t add_aux_sym_tir (type_info_t *t, thash_t **hash_tbl); static tag_t *get_tag (const char *tag, localsym_t *sym, bt_t basic_type); static void add_unknown_tag (tag_t *ptag); -static void add_procedure (char *func); +static void add_procedure (char *func, int aent); static void add_file (const char *file_name, int indx, int fake); #ifdef ECOFF_DEBUG static char *sc_to_string (sc_t storage_class); @@ -2109,10 +2109,11 @@ add_unknown_tag (tag_t *ptag /* pointer to tag information */) } /* Add a procedure to the current file's list of procedures, and record - this is the current procedure. */ + this is the current procedure. If AENT, then only set the requested + symbol's function type. */ static void -add_procedure (char *func /* func name */) +add_procedure (char *func /* func name */, int aent) { varray_t *vp; proc_t *new_proc_ptr; @@ -2123,6 +2124,13 @@ add_procedure (char *func /* func name */) fputc ('\n', stderr); #endif + /* Set the BSF_FUNCTION flag for the symbol. */ + sym = symbol_find_or_make (func); + symbol_get_bfdsym (sym)->flags |= BSF_FUNCTION; + + if (aent) + return; + if (cur_file_ptr == (efdr_t *) NULL) as_fatal (_("no current file pointer")); @@ -2143,10 +2151,6 @@ add_procedure (char *func /* func name */) new_proc_ptr->pdr.lnLow = -1; new_proc_ptr->pdr.lnHigh = -1; - /* Set the BSF_FUNCTION flag for the symbol. */ - sym = symbol_find_or_make (func); - symbol_get_bfdsym (sym)->flags |= BSF_FUNCTION; - /* Push the start of the function. */ new_proc_ptr->sym = add_ecoff_symbol ((const char *) NULL, st_Proc, sc_Text, sym, (bfd_vma) 0, (symint_t) 0, @@ -2196,12 +2200,9 @@ add_file (const char *file_name, int indx ATTRIBUTE_UNUSED, int fake) want to use the actual file name. */ if (file_name == (const char *) NULL) { - char *file; - if (first_file != (efdr_t *) NULL) as_fatal (_("fake .file after real one")); - as_where (&file, (unsigned int *) NULL); - file_name = (const char *) file; + file_name = as_where ((unsigned int *) NULL); /* Automatically generate ECOFF debugging information, since I think that's what other ECOFF assemblers do. We don't do @@ -2226,7 +2227,7 @@ add_file (const char *file_name, int indx ATTRIBUTE_UNUSED, int fake) if (stabs_seen) { (void) add_ecoff_symbol (file_name, st_Nil, sc_Nil, - symbol_new ("L0\001", now_seg, + symbol_new (FAKE_LABEL_NAME, now_seg, (valueT) frag_now_fix (), frag_now), (bfd_vma) 0, 0, ECOFF_MARK_STAB (N_SOL)); @@ -3019,11 +3020,15 @@ ecoff_directive_end (int ignore ATTRIBUTE_UNUSED) as_warn (_(".end directive names unknown symbol")); else (void) add_ecoff_symbol ((const char *) NULL, st_End, sc_Text, - symbol_new ("L0\001", now_seg, + symbol_new (FAKE_LABEL_NAME, now_seg, (valueT) frag_now_fix (), frag_now), (bfd_vma) 0, (symint_t) 0, (symint_t) 0); +#ifdef md_flush_pending_output + md_flush_pending_output (); +#endif + cur_proc_ptr = (proc_t *) NULL; (void) restore_line_pointer (name_end); @@ -3033,7 +3038,7 @@ ecoff_directive_end (int ignore ATTRIBUTE_UNUSED) /* Parse .ent directives. */ void -ecoff_directive_ent (int ignore ATTRIBUTE_UNUSED) +ecoff_directive_ent (int aent) { char *name; char name_end; @@ -3041,7 +3046,7 @@ ecoff_directive_ent (int ignore ATTRIBUTE_UNUSED) if (cur_file_ptr == (efdr_t *) NULL) add_file ((const char *) NULL, 0, 1); - if (cur_proc_ptr != (proc_t *) NULL) + if (!aent && cur_proc_ptr != (proc_t *) NULL) { as_warn (_("second .ent directive found before .end directive")); demand_empty_rest_of_line (); @@ -3052,13 +3057,13 @@ ecoff_directive_ent (int ignore ATTRIBUTE_UNUSED) if (name == input_line_pointer) { - as_warn (_(".ent directive has no name")); + as_warn (_("%s directive has no name"), aent ? ".aent" : ".ent"); (void) restore_line_pointer (name_end); demand_empty_rest_of_line (); return; } - add_procedure (name); + add_procedure (name, aent); (void) restore_line_pointer (name_end); @@ -3259,7 +3264,7 @@ ecoff_directive_loc (int ignore ATTRIBUTE_UNUSED) if (stabs_seen) { (void) add_ecoff_symbol ((char *) NULL, st_Label, sc_Text, - symbol_new ("L0\001", now_seg, + symbol_new (FAKE_LABEL_NAME, now_seg, (valueT) frag_now_fix (), frag_now), (bfd_vma) 0, 0, lineno); @@ -3321,7 +3326,7 @@ mark_stabs (int ignore ATTRIBUTE_UNUSED) { if (! stabs_seen) { - /* Add a dummy @stabs dymbol. */ + /* Add a dummy @stabs symbol. */ stabs_seen = 1; (void) add_ecoff_symbol (stabs_symbol, st_Nil, sc_Info, (symbolS *) NULL, @@ -3613,7 +3618,7 @@ ecoff_add_bytes (char **buf, if (need < PAGE_SIZE) need = PAGE_SIZE; want = (*bufend - *buf) + need; - *buf = (char *) xrealloc (*buf, want); + *buf = XRESIZEVEC (char, *buf, want); *bufend = *buf + want; return *buf + at; } @@ -3695,8 +3700,7 @@ ecoff_build_lineno (const struct ecoff_debug_swap *backend, && first_proc_ptr != (proc_t *) NULL && local_first_lineno != (lineno_list_t *) NULL && ((S_GET_VALUE (first_proc_ptr->sym->as_sym) - + bfd_get_section_vma (stdoutput, - S_GET_SEGMENT (first_proc_ptr->sym->as_sym))) + + bfd_section_vma (S_GET_SEGMENT (first_proc_ptr->sym->as_sym))) != 0)) { first.file = local_first_lineno->file; @@ -3976,8 +3980,7 @@ ecoff_build_symbols (const struct ecoff_debug_swap *backend, else sym_ptr->ecoff_sym.asym.value = (S_GET_VALUE (as_sym) - + bfd_get_section_vma (stdoutput, - S_GET_SEGMENT (as_sym)) + + bfd_section_vma (S_GET_SEGMENT (as_sym)) + sym_ptr->addend); sym_ptr->ecoff_sym.weakext = S_IS_WEAK (as_sym); @@ -4099,10 +4102,10 @@ ecoff_build_symbols (const struct ecoff_debug_swap *backend, /* If an st_end symbol has an associated gas symbol, then it is a local label created for a .bend or .end directive. Stabs line - numbers will have \001 in the names. */ + numbers will have FAKE_LABEL_CHAR in the names. */ if (local && sym_ptr->ecoff_sym.asym.st != st_End - && strchr (sym_ptr->name, '\001') == 0) + && strchr (sym_ptr->name, FAKE_LABEL_CHAR) == 0) sym_ptr->ecoff_sym.asym.iss = add_string (&fil_ptr->strings, fil_ptr->str_hash, @@ -4305,8 +4308,7 @@ ecoff_build_procs (const struct ecoff_debug_swap *backend, adr_sym = proc_ptr->sym->as_sym; adr = (S_GET_VALUE (adr_sym) - + bfd_get_section_vma (stdoutput, - S_GET_SEGMENT (adr_sym))); + + bfd_section_vma (S_GET_SEGMENT (adr_sym))); if (first) { /* This code used to force the adr of the very @@ -4694,7 +4696,7 @@ ecoff_build_debug (HDRR *hdr, /* Build the symbolic information. */ offset = 0; - buf = (char *) xmalloc (PAGE_SIZE); + buf = XNEWVEC (char, PAGE_SIZE); bufend = buf + PAGE_SIZE; /* Build the line number information. */ @@ -4853,7 +4855,7 @@ allocate_scope (void) #else - ptr = (scope_t *) xmalloc (sizeof (scope_t)); + ptr = XNEW (scope_t); #endif @@ -4902,7 +4904,7 @@ allocate_vlinks (void) #else - ptr = (vlinks_t *) xmalloc (sizeof (vlinks_t)); + ptr = XNEW (vlinks_t); #endif @@ -4936,7 +4938,7 @@ allocate_shash (void) #else - ptr = (shash_t *) xmalloc (sizeof (shash_t)); + ptr = XNEW (shash_t); #endif @@ -4970,7 +4972,7 @@ allocate_thash (void) #else - ptr = (thash_t *) xmalloc (sizeof (thash_t)); + ptr = XNEW (thash_t); #endif @@ -5010,7 +5012,7 @@ allocate_tag (void) #else - ptr = (tag_t *) xmalloc (sizeof (tag_t)); + ptr = XNEW (tag_t); #endif @@ -5059,7 +5061,7 @@ allocate_forward (void) #else - ptr = (forward_t *) xmalloc (sizeof (forward_t)); + ptr = XNEW (forward_t); #endif @@ -5099,7 +5101,7 @@ allocate_thead (void) #else - ptr = (thead_t *) xmalloc (sizeof (thead_t)); + ptr = XNEW (thead_t); #endif @@ -5146,7 +5148,7 @@ allocate_lineno_list (void) #else - ptr = (lineno_list_t *) xmalloc (sizeof (lineno_list_t)); + ptr = XNEW (lineno_list_t); #endif @@ -5181,10 +5183,10 @@ void ecoff_generate_asm_lineno (void) { unsigned int lineno; - char *filename; + const char *filename; lineno_list_t *list; - as_where (&filename, &lineno); + filename = as_where (&lineno); if (current_stabs_filename == (char *) NULL || filename_cmp (current_stabs_filename, filename))