X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=ld%2Fldmisc.c;h=8fab22825f7add6f3aa29f374bbf3a269a43685d;hb=feb129926a8d12656f1ca4b7a8bb10268d3af4fb;hp=a3ec88b01bab4333b10d21b0925991fd340d2a54;hpb=fcf276c4958f7cc906ec389f003aa2a713c98528;p=deliverable%2Fbinutils-gdb.git diff --git a/ld/ldmisc.c b/ld/ldmisc.c index a3ec88b01b..8fab22825f 100644 --- a/ld/ldmisc.c +++ b/ld/ldmisc.c @@ -1,6 +1,6 @@ /* ldmisc.c - Copyright (C) 1991 Free Software Foundation, Inc. - + Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 98, 1999 + Free Software Foundation, Inc. Written by Steve Chamberlain of Cygnus Support. This file is part of GLD, the Gnu Linker. @@ -16,25 +16,33 @@ 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 GLD; see the file COPYING. If not, write to -the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ +along with GLD; see the file COPYING. If not, write to the Free +Software Foundation, 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. */ #include "bfd.h" #include "sysdep.h" +#include "libiberty.h" +#include "demangle.h" + +#ifdef ANSI_PROTOTYPES +#include +#define USE_STDARG 1 +#else #include -#include +#define USE_STDARG 0 +#endif #include "ld.h" #include "ldmisc.h" #include "ldexp.h" #include "ldlang.h" +#include "ldgram.h" #include "ldlex.h" -#include "ldsym.h" #include "ldmain.h" #include "ldfile.h" -/* VARARGS*/ -static void finfo (); +static void vfinfo PARAMS ((FILE *, const char *, va_list)); /* %% literal % @@ -44,440 +52,487 @@ static void finfo (); %E current bfd error or errno %I filename from a lang_input_statement_type %B filename from a bfd - %T symbol table entry + %T symbol name %X no object output, fail return %V hex bfd_vma %v hex bfd_vma, no leading zeros - %C Clever filename:linenumber + %W hex bfd_vma with 0x with no leading zeros taking up 8 spaces + %C clever filename:linenumber with function + %D like %C, but no function name + %G like %D, but only function name %R info about a relent %s arbitrary string, like printf %d integer, like printf + %u integer, like printf */ -static char * -demangle(string, remove_underscore) -char *string; -int remove_underscore; +char * +demangle (string) + const char *string; { char *res; - if (remove_underscore && output_bfd) - { - if (bfd_get_symbol_leading_char(output_bfd) == string[0]) - string++; - } - /* Note that there's a memory leak here, we keep buying memory - for demangled names, and never free. But if you have so many - errors that you run out of VM with the error messages, then - there's something up */ - res = cplus_demangle(string, DMGL_ANSI|DMGL_PARAMS); - return res ? res : string; + + if (output_bfd != NULL + && bfd_get_symbol_leading_char (output_bfd) == string[0]) + ++string; + + /* This is a hack for better error reporting on XCOFF, or the MS PE */ + /* format. Xcoff has a single '.', while the NT PE for PPC has '..'. */ + /* So we remove all of them. */ + while(string[0] == '.') + ++string; + + res = cplus_demangle (string, DMGL_ANSI | DMGL_PARAMS); + return res ? res : xstrdup (string); } static void -vfinfo(fp, fmt, arg) +vfinfo (fp, fmt, arg) FILE *fp; - char *fmt; + const char *fmt; va_list arg; { boolean fatal = false; - while (*fmt) - { - while (*fmt != '%' && *fmt != '\0') + while (*fmt != '\0') { - putc(*fmt, fp); - fmt++; - } - - if (*fmt == '%') - { - fmt ++; - switch (*fmt++) - { - default: - fprintf(fp,"%%%c", fmt[-1]); - break; - - case '%': - /* literal % */ - putc('%', fp); - break; - - case 'X': - /* no object output, fail return */ - config.make_executable = false; - break; - - case 'V': - /* hex bfd_vma */ + while (*fmt != '%' && *fmt != '\0') { - bfd_vma value = va_arg(arg, bfd_vma); - fprintf_vma(fp, value); + putc (*fmt, fp); + fmt++; } - break; - case 'v': - /* hex bfd_vma, no leading zeros */ + if (*fmt == '%') { - char buf[100]; - char *p = buf; - bfd_vma value = va_arg (arg, bfd_vma); - sprintf_vma (p, value); - while (*p == '0') - p++; - if (!*p) - p--; - fputs (p, fp); - } - break; - - case 'T': - /* symbol table entry */ - { - asymbol *symbol = va_arg(arg, asymbol *); - if (symbol) - { - asection *section = symbol->section; - char *cplusname = demangle(symbol->name, 1); - CONST char *section_name = section->name; - if (section != &bfd_und_section) - { - fprintf(fp,"%s (%s)", cplusname, section_name); - } - else - { - fprintf(fp,"%s", cplusname); - } - } - else - { - fprintf(fp,"no symbol"); - } - } - break; - - case 'B': - /* filename from a bfd */ - { - bfd *abfd = va_arg(arg, bfd *); - if (abfd->my_archive) { - fprintf(fp,"%s(%s)", abfd->my_archive->filename, - abfd->filename); - } - else { - fprintf(fp,"%s", abfd->filename); - } - } - break; - - case 'F': - /* error is fatal */ - fatal = true; - break; - - case 'P': - /* print program name */ - fprintf(fp,"%s", program_name); - break; - - case 'E': - /* current bfd error or errno */ - fprintf(fp, bfd_errmsg(bfd_error)); - break; - - case 'I': - /* filename from a lang_input_statement_type */ - { - lang_input_statement_type *i = - va_arg(arg,lang_input_statement_type *); + fmt ++; + switch (*fmt++) + { + default: + fprintf (fp,"%%%c", fmt[-1]); + break; + + case '%': + /* literal % */ + putc ('%', fp); + break; + + case 'X': + /* no object output, fail return */ + config.make_executable = false; + break; + + case 'V': + /* hex bfd_vma */ + { + bfd_vma value = va_arg (arg, bfd_vma); + fprintf_vma (fp, value); + } + break; + + case 'v': + /* hex bfd_vma, no leading zeros */ + { + char buf[100]; + char *p = buf; + bfd_vma value = va_arg (arg, bfd_vma); + sprintf_vma (p, value); + while (*p == '0') + p++; + if (!*p) + p--; + fputs (p, fp); + } + break; + + case 'W': + /* hex bfd_vma with 0x with no leading zeroes taking up + 8 spaces. */ + { + char buf[100]; + bfd_vma value; + char *p; + int len; + + value = va_arg (arg, bfd_vma); + sprintf_vma (buf, value); + for (p = buf; *p == '0'; ++p) + ; + if (*p == '\0') + --p; + len = strlen (p); + while (len < 8) + { + putc (' ', fp); + ++len; + } + fprintf (fp, "0x%s", p); + } + break; + + case 'T': + /* Symbol name. */ + { + const char *name = va_arg (arg, const char *); + + if (name == (const char *) NULL || *name == 0) + fprintf (fp, _("no symbol")); + else if (! demangling) + fprintf (fp, "%s", name); + else + { + char *demangled; + + demangled = demangle (name); + fprintf (fp, "%s", demangled); + free (demangled); + } + } + break; + + case 'B': + /* filename from a bfd */ + { + bfd *abfd = va_arg (arg, bfd *); + if (abfd->my_archive) + fprintf (fp, "%s(%s)", abfd->my_archive->filename, + abfd->filename); + else + fprintf (fp, "%s", abfd->filename); + } + break; + + case 'F': + /* error is fatal */ + fatal = true; + break; + + case 'P': + /* print program name */ + fprintf (fp, "%s", program_name); + break; + + case 'E': + /* current bfd error or errno */ + fprintf (fp, bfd_errmsg (bfd_get_error ())); + break; + + case 'I': + /* filename from a lang_input_statement_type */ + { + lang_input_statement_type *i; + + i = va_arg (arg, lang_input_statement_type *); + if (bfd_my_archive (i->the_bfd) != NULL) + fprintf (fp, "(%s)", + bfd_get_filename (bfd_my_archive (i->the_bfd))); + fprintf (fp, "%s", i->local_sym_name); + if (bfd_my_archive (i->the_bfd) == NULL + && strcmp (i->local_sym_name, i->filename) != 0) + fprintf (fp, " (%s)", i->filename); + } + break; + + case 'S': + /* print script file and linenumber */ + if (parsing_defsym) + fprintf (fp, "--defsym %s", lex_string); + else if (ldfile_input_filename != NULL) + fprintf (fp, "%s:%u", ldfile_input_filename, lineno); + else + fprintf (fp, _("built in linker script:%u"), lineno); + break; + + case 'R': + /* Print all that's interesting about a relent */ + { + arelent *relent = va_arg (arg, arelent *); - fprintf(fp,"%s", i->local_sym_name); - } - break; - - case 'S': - /* print script file and linenumber */ - { - if (ldfile_input_filename == (char *)NULL) { - fprintf(fp,"command line"); - } - else { - fprintf(fp,"%s:%u", ldfile_input_filename, lineno ); - } - } - break; - - case 'R': - /* Print all that's interesting about a relent */ - { - arelent *relent = va_arg(arg, arelent *); + lfinfo (fp, "%s+0x%v (type %s)", + (*(relent->sym_ptr_ptr))->name, + relent->addend, + relent->howto->name); + } + break; - finfo (fp, "%s+0x%v (type %s)", - (*(relent->sym_ptr_ptr))->name, - relent->addend, - relent->howto->name); - } - break; - - case 'C': - /* Clever filename:linenumber with function name if possible, - or section name as a last resort */ - { - CONST char *filename; - CONST char *functionname; - char *cplus_name; - - unsigned int linenumber; - bfd *abfd = va_arg(arg, bfd *); - asection *section = va_arg(arg, asection *); - asymbol **symbols = va_arg(arg, asymbol **); - bfd_vma offset = va_arg(arg, bfd_vma); - - if (bfd_find_nearest_line(abfd, - section, - symbols, - offset, - &filename, - &functionname, - &linenumber)) - { - if (filename == (char *)NULL) - filename = abfd->filename; - if (functionname != (char *)NULL) - { - cplus_name = demangle(functionname, 1); - fprintf(fp,"%s:%u: %s", filename, linenumber, cplus_name); - } - - else if (linenumber != 0) - fprintf(fp,"%s:%u", filename, linenumber); - else - finfo (fp, "%s(%s+0x%v)", filename, section->name, offset); - - } - else - finfo (fp, "%s(%s+0x%v)", abfd->filename, section->name, offset); - } - break; + case 'C': + case 'D': + case 'G': + /* Clever filename:linenumber with function name if possible, + or section name as a last resort. The arguments are a BFD, + a section, and an offset. */ + { + static bfd *last_bfd; + static char *last_file = NULL; + static char *last_function = NULL; + bfd *abfd; + asection *section; + bfd_vma offset; + lang_input_statement_type *entry; + asymbol **asymbols; + const char *filename; + const char *functionname; + unsigned int linenumber; + boolean discard_last; + + abfd = va_arg (arg, bfd *); + section = va_arg (arg, asection *); + offset = va_arg (arg, bfd_vma); + + entry = (lang_input_statement_type *) abfd->usrdata; + if (entry != (lang_input_statement_type *) NULL + && entry->asymbols != (asymbol **) NULL) + asymbols = entry->asymbols; + else + { + long symsize; + long symbol_count; + + symsize = bfd_get_symtab_upper_bound (abfd); + if (symsize < 0) + einfo (_("%B%F: could not read symbols\n"), abfd); + asymbols = (asymbol **) xmalloc (symsize); + symbol_count = bfd_canonicalize_symtab (abfd, asymbols); + if (symbol_count < 0) + einfo (_("%B%F: could not read symbols\n"), abfd); + if (entry != (lang_input_statement_type *) NULL) + { + entry->asymbols = asymbols; + entry->symbol_count = symbol_count; + } + } + + discard_last = true; + if (bfd_find_nearest_line (abfd, section, asymbols, offset, + &filename, &functionname, + &linenumber)) + { + if (functionname != NULL && fmt[-1] == 'G') + { + lfinfo (fp, "%B:", abfd); + if (filename != NULL + && strcmp (filename, bfd_get_filename (abfd)) != 0) + fprintf (fp, "%s:", filename); + lfinfo (fp, "%T", functionname); + } + else if (functionname != NULL && fmt[-1] == 'C') + { + if (filename == (char *) NULL) + filename = abfd->filename; + + if (last_bfd == NULL + || last_file == NULL + || last_function == NULL + || last_bfd != abfd + || strcmp (last_file, filename) != 0 + || strcmp (last_function, functionname) != 0) + { + /* We use abfd->filename in this initial line, + in case filename is a .h file or something + similarly unhelpful. */ + lfinfo (fp, _("%B: In function `%T':\n"), + abfd, functionname); + + last_bfd = abfd; + if (last_file != NULL) + free (last_file); + last_file = buystring (filename); + if (last_function != NULL) + free (last_function); + last_function = buystring (functionname); + } + discard_last = false; + if (linenumber != 0) + fprintf (fp, "%s:%u", filename, linenumber); + else + lfinfo (fp, "%s(%s+0x%v)", filename, section->name, + offset); + } + else if (filename == NULL + || strcmp (filename, abfd->filename) == 0) + { + lfinfo (fp, "%B(%s+0x%v)", abfd, section->name, + offset); + if (linenumber != 0) + lfinfo (fp, ":%u", linenumber); + } + else if (linenumber != 0) + lfinfo (fp, "%B:%s:%u", abfd, filename, linenumber); + else + lfinfo (fp, "%B(%s+0x%v):%s", abfd, section->name, + offset, filename); + } + else + lfinfo (fp, "%B(%s+0x%v)", abfd, section->name, offset); + + if (discard_last) + { + last_bfd = NULL; + if (last_file != NULL) + { + free (last_file); + last_file = NULL; + } + if (last_function != NULL) + { + free (last_function); + last_function = NULL; + } + } + } + break; - case 's': - /* arbitrary string, like printf */ - fprintf(fp,"%s", va_arg(arg, char *)); - break; - - case 'd': - /* integer, like printf */ - fprintf(fp,"%d", va_arg(arg, int)); - break; - } + case 's': + /* arbitrary string, like printf */ + fprintf (fp, "%s", va_arg (arg, char *)); + break; + + case 'd': + /* integer, like printf */ + fprintf (fp, "%d", va_arg (arg, int)); + break; + + case 'u': + /* unsigned integer, like printf */ + fprintf (fp, "%u", va_arg (arg, unsigned int)); + break; + } + } } - } if (fatal == true) - { - if (output_filename) - { - if (output_bfd && output_bfd->iostream) - fclose((FILE *)(output_bfd->iostream)); - if (delete_output_file_on_failure) - unlink (output_filename); - } - exit(1); - } + xexit(1); } /* Format info message and print on stdout. */ -/* (You would think this should be called just "info", but then you would - hosed by LynxOS, which defines that name in its libc.) */ +/* (You would think this should be called just "info", but then you + would hosed by LynxOS, which defines that name in its libc.) */ -void info_msg(va_alist) -va_dcl +void +#if USE_STDARG +info_msg (const char *fmt, ...) +#else +info_msg (va_alist) + va_dcl +#endif { - char *fmt; va_list arg; - va_start(arg); - fmt = va_arg(arg, char *); - vfinfo(stdout, fmt, arg); - va_end(arg); -} -/* ('e' for error.) Format info message and print on stderr. */ +#if ! USE_STDARG + const char *fmt; -void einfo(va_alist) -va_dcl -{ - char *fmt; - va_list arg; - va_start(arg); - fmt = va_arg(arg, char *); - vfinfo(stderr, fmt, arg); - va_end(arg); + va_start (arg); + fmt = va_arg (arg, const char *); +#else + va_start (arg, fmt); +#endif + + vfinfo (stdout, fmt, arg); + va_end (arg); } -/* Warn about a symbol NEWSYM being multiply defined with another symbol OLDSYM. - MESSAGE1 and MESSAGE2 should look something like: - "%C: warning: multiple commons of `%s'\n" - "%C: warning: previous common here\n" */ +/* ('e' for error.) Format info message and print on stderr. */ void -multiple_warn (message1, newsym, message2, oldsym) - char *message1; - asymbol *newsym; - char *message2; - asymbol *oldsym; +#if USE_STDARG +einfo (const char *fmt, ...) +#else +einfo (va_alist) + va_dcl +#endif { - lang_input_statement_type *stat; - asymbol **stat_symbols; - - stat = (lang_input_statement_type *) bfd_asymbol_bfd (newsym)->usrdata; - stat_symbols = stat ? stat->asymbols : 0; + va_list arg; - einfo (message1, - bfd_asymbol_bfd (newsym), newsym->section, stat_symbols, newsym->value, - demangle (newsym->name, 1)); +#if ! USE_STDARG + const char *fmt; - stat = (lang_input_statement_type *) bfd_asymbol_bfd (oldsym)->usrdata; - stat_symbols = stat ? stat->asymbols : 0; + va_start (arg); + fmt = va_arg (arg, const char *); +#else + va_start (arg, fmt); +#endif - einfo (message2, - bfd_asymbol_bfd (oldsym), oldsym->section, stat_symbols, oldsym->value); + vfinfo (stderr, fmt, arg); + va_end (arg); } void -info_assert(file, line) - char *file; +info_assert (file, line) + const char *file; unsigned int line; { - einfo("%F%P: internal error %s %d\n", file,line); -} - -/* Return a newly-allocated string - whose contents concatenate those of S1, S2, S3. */ - -char * -concat (s1, s2, s3) - CONST char *s1; - CONST char *s2; - CONST char *s3; -{ - size_t len1 = strlen (s1); - size_t len2 = strlen (s2); - size_t len3 = strlen (s3); - char *result = ldmalloc (len1 + len2 + len3 + 1); - - if (len1 != 0) - memcpy(result, s1, len1); - if (len2 != 0) - memcpy(result+len1, s2, len2); - if (len3 != 0) - memcpy(result+len1+len2, s2, len3); - *(result + len1 + len2 + len3) = 0; - - return result; -} - - -PTR -ldmalloc (size) - size_t size; -{ - PTR result = malloc ((int)size); - - if (result == (char *)NULL && size != 0) - einfo("%F%P: virtual memory exhausted\n"); - - return result; -} - -PTR -xmalloc (size) - int size; -{ -return ldmalloc(size); + einfo (_("%F%P: internal error %s %d\n"), file, line); } - -PTR -ldrealloc (ptr, size) - PTR ptr; - size_t size; -{ - PTR result = realloc (ptr, (int)size); - - if (result == (char *)NULL && size != 0) - einfo("%F%P: virtual memory exhausted\n"); - - return result; -} - -PTR -xrealloc (ptr, size) - PTR ptr; - size_t size; -{ -return ldrealloc(ptr, size); -} - - char * buystring (x) CONST char *CONST x; { size_t l = strlen(x)+1; - char *r = ldmalloc(l); + char *r = xmalloc(l); memcpy(r, x,l); return r; } - /* ('m' for map) Format info message and print on map. */ -void minfo(va_alist) -va_dcl +void +#if USE_STDARG +minfo (const char *fmt, ...) +#else +minfo (va_alist) + va_dcl +#endif { - char *fmt; va_list arg; - va_start(arg); - fmt = va_arg(arg, char *); - vfinfo(config.map_file, fmt, arg); - va_end(arg); -} +#if ! USE_STDARG + const char *fmt; + va_start (arg); + fmt = va_arg (arg, const char *); +#else + va_start (arg, fmt); +#endif -static void -finfo (va_alist) + vfinfo (config.map_file, fmt, arg); + va_end (arg); +} + +void +#if USE_STDARG +lfinfo (FILE *file, const char *fmt, ...) +#else +lfinfo (va_alist) va_dcl +#endif { - char *fmt; - FILE *file; va_list arg; + +#if ! USE_STDARG + FILE *file; + const char *fmt; + va_start (arg); file = va_arg (arg, FILE *); - fmt = va_arg (arg, char *); + fmt = va_arg (arg, const char *); +#else + va_start (arg, fmt); +#endif + vfinfo (file, fmt, arg); va_end (arg); } - - - -/*---------------------------------------------------------------------- - Functions to print the link map - */ + +/* Functions to print the link map. */ void print_space () { - fprintf(config.map_file, " "); + fprintf (config.map_file, " "); } + void print_nl () { - fprintf(config.map_file, "\n"); -} -void -print_address (value) - bfd_vma value; -{ - fprintf_vma(config.map_file, value); + fprintf (config.map_file, "\n"); }