X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gas%2Fmessages.c;h=83bda87919931154a1716a4e8ba65e0688ae72f9;hb=71780f455fbf35ed4c48e94b4228c55c11a213c8;hp=866565dee2a7a8ff888aeddea55e1bcb126476ee;hpb=2159ac21e244ff361e244b0fa03219b96dbc4673;p=deliverable%2Fbinutils-gdb.git diff --git a/gas/messages.c b/gas/messages.c index 866565dee2..83bda87919 100644 --- a/gas/messages.c +++ b/gas/messages.c @@ -1,12 +1,10 @@ /* messages.c - error reporter - - Copyright 1987, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 2000, 2001, - 2003, 2004 - Free Software Foundation, Inc. + Copyright (C) 1987-2020 Free Software Foundation, Inc. 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) + 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, @@ -16,37 +14,23 @@ 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. */ + Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA + 02110-1301, USA. */ #include "as.h" +#include -#include -#ifdef HAVE_ERRNO_H -#include +/* If the system doesn't provide strsignal, we get it defined in + libiberty but no declaration is supplied. Because, reasons. */ +#if !defined (HAVE_STRSIGNAL) && !defined (strsignal) +extern const char *strsignal (int); #endif -#ifdef USE_STDARG -#include -#endif - -#ifdef USE_VARARGS -#include -#endif - -#if !defined (USE_STDARG) && !defined (USE_VARARGS) -/* Roll our own. */ -#define va_alist REST -#define va_dcl -typedef int * va_list; -#define va_start(ARGS) ARGS = &REST -#define va_end(ARGS) -#endif - -static void identify (char *); +static void identify (const char *); static void as_show_where (void); -static void as_warn_internal (char *, unsigned int, char *); -static void as_bad_internal (char *, unsigned int, char *); +static void as_warn_internal (const char *, unsigned int, char *); +static void as_bad_internal (const char *, unsigned int, char *); +static void signal_crash (int) ATTRIBUTE_NORETURN; /* Despite the rest of the comments in this file, (FIXME-SOON), here is the current scheme for error messages etc: @@ -82,10 +66,13 @@ static void as_bad_internal (char *, unsigned int, char *); as_tsktsk() is used when we see a minor error for which our error recovery action is almost certainly correct. In this case, we print a message and then assembly - continues as though no error occurred. */ + continues as though no error occurred. + + as_abort () is used for logic failure (assert or abort, signal). +*/ static void -identify (char *file) +identify (const char *file) { static int identified; @@ -96,7 +83,7 @@ identify (char *file) if (!file) { unsigned int x; - as_where (&file, &x); + file = as_where (&x); } if (file) @@ -129,37 +116,18 @@ had_errors (void) static void as_show_where (void) { - char *file; + const char *file; unsigned int line; - as_where (&file, &line); + file = as_where (&line); identify (file); if (file) - fprintf (stderr, "%s:%u: ", file, line); -} - -/* Like perror(3), but with more info. */ - -void -as_perror (const char *gripe, /* Unpunctuated error theme. */ - const char *filename) -{ - const char *errtxt; - int saved_errno = errno; - - as_show_where (); - fprintf (stderr, gripe, filename); - errno = saved_errno; -#ifdef BFD_ASSEMBLER - errtxt = bfd_errmsg (bfd_get_error ()); -#else - errtxt = xstrerror (errno); -#endif - fprintf (stderr, ": %s\n", errtxt); - errno = 0; -#ifdef BFD_ASSEMBLER - bfd_set_error (bfd_error_no_error); -#endif + { + if (line != 0) + fprintf (stderr, "%s:%u: ", file, line); + else + fprintf (stderr, "%s: ", file); + } } /* Send to stderr a string as a warning, and locate warning @@ -168,7 +136,6 @@ as_perror (const char *gripe, /* Unpunctuated error theme. */ Please explain in string (which may have '\n's) what recovery was done. */ -#ifdef USE_STDARG void as_tsktsk (const char *format, ...) { @@ -180,38 +147,27 @@ as_tsktsk (const char *format, ...) va_end (args); (void) putc ('\n', stderr); } -#else -void -as_tsktsk (format, va_alist) - const char *format; - va_dcl -{ - va_list args; - - as_show_where (); - va_start (args); - vfprintf (stderr, format, args); - va_end (args); - (void) putc ('\n', stderr); -} -#endif /* not NO_STDARG */ /* The common portion of as_warn and as_warn_where. */ static void -as_warn_internal (char *file, unsigned int line, char *buffer) +as_warn_internal (const char *file, unsigned int line, char *buffer) { ++warning_count; if (file == NULL) - as_where (&file, &line); + file = as_where (&line); identify (file); if (file) - fprintf (stderr, "%s:%u: ", file, line); - fprintf (stderr, _("Warning: ")); - fputs (buffer, stderr); - (void) putc ('\n', stderr); + { + if (line != 0) + fprintf (stderr, "%s:%u: %s%s\n", file, line, _("Warning: "), buffer); + else + fprintf (stderr, "%s: %s%s\n", file, _("Warning: "), buffer); + } + else + fprintf (stderr, "%s%s\n", _("Warning: "), buffer); #ifndef NO_LISTING listing_warning (buffer); #endif @@ -223,7 +179,6 @@ as_warn_internal (char *file, unsigned int line, char *buffer) Please explain in string (which may have '\n's) what recovery was done. */ -#ifdef USE_STDARG void as_warn (const char *format, ...) { @@ -233,37 +188,18 @@ as_warn (const char *format, ...) if (!flag_no_warnings) { va_start (args, format); - vsprintf (buffer, format, args); + vsnprintf (buffer, sizeof (buffer), format, args); va_end (args); as_warn_internal ((char *) NULL, 0, buffer); } } -#else -void -as_warn (format, va_alist) - const char *format; - va_dcl -{ - va_list args; - char buffer[2000]; - - if (!flag_no_warnings) - { - va_start (args); - vsprintf (buffer, format, args); - va_end (args); - as_warn_internal ((char *) NULL, 0, buffer); - } -} -#endif /* not NO_STDARG */ /* Like as_bad but the file name and line number are passed in. Unfortunately, we have to repeat the function in order to handle the varargs correctly and portably. */ -#ifdef USE_STDARG void -as_warn_where (char *file, unsigned int line, const char *format, ...) +as_warn_where (const char *file, unsigned int line, const char *format, ...) { va_list args; char buffer[2000]; @@ -271,60 +207,43 @@ as_warn_where (char *file, unsigned int line, const char *format, ...) if (!flag_no_warnings) { va_start (args, format); - vsprintf (buffer, format, args); + vsnprintf (buffer, sizeof (buffer), format, args); va_end (args); as_warn_internal (file, line, buffer); } } -#else -void -as_warn_where (file, line, format, va_alist) - char *file; - unsigned int line; - const char *format; - va_dcl -{ - va_list args; - char buffer[2000]; - - if (!flag_no_warnings) - { - va_start (args); - vsprintf (buffer, format, args); - va_end (args); - as_warn_internal (file, line, buffer); - } -} -#endif /* not NO_STDARG */ /* The common portion of as_bad and as_bad_where. */ static void -as_bad_internal (char *file, unsigned int line, char *buffer) +as_bad_internal (const char *file, unsigned int line, char *buffer) { ++error_count; if (file == NULL) - as_where (&file, &line); + file = as_where (&line); identify (file); if (file) - fprintf (stderr, "%s:%u: ", file, line); - fprintf (stderr, _("Error: ")); - fputs (buffer, stderr); - (void) putc ('\n', stderr); + { + if (line != 0) + fprintf (stderr, "%s:%u: %s%s\n", file, line, _("Error: "), buffer); + else + fprintf (stderr, "%s: %s%s\n", file, _("Error: "), buffer); + } + else + fprintf (stderr, "%s%s\n", _("Error: "), buffer); #ifndef NO_LISTING listing_error (buffer); #endif } /* Send to stderr a string as a warning, and locate warning in input - file(s). Please us when there is no recovery, but we want to + file(s). Please use when there is no recovery, but we want to continue processing but not produce an object file. Please explain in string (which may have '\n's) what recovery was done. */ -#ifdef USE_STDARG void as_bad (const char *format, ...) { @@ -332,72 +251,34 @@ as_bad (const char *format, ...) char buffer[2000]; va_start (args, format); - vsprintf (buffer, format, args); - va_end (args); - - as_bad_internal ((char *) NULL, 0, buffer); -} - -#else -void -as_bad (format, va_alist) - const char *format; - va_dcl -{ - va_list args; - char buffer[2000]; - - va_start (args); - vsprintf (buffer, format, args); + vsnprintf (buffer, sizeof (buffer), format, args); va_end (args); as_bad_internal ((char *) NULL, 0, buffer); } -#endif /* not NO_STDARG */ /* Like as_bad but the file name and line number are passed in. Unfortunately, we have to repeat the function in order to handle the varargs correctly and portably. */ -#ifdef USE_STDARG void -as_bad_where (char *file, unsigned int line, const char *format, ...) +as_bad_where (const char *file, unsigned int line, const char *format, ...) { va_list args; char buffer[2000]; va_start (args, format); - vsprintf (buffer, format, args); + vsnprintf (buffer, sizeof (buffer), format, args); va_end (args); as_bad_internal (file, line, buffer); } -#else -void -as_bad_where (file, line, format, va_alist) - char *file; - unsigned int line; - const char *format; - va_dcl -{ - va_list args; - char buffer[2000]; - - va_start (args); - vsprintf (buffer, format, args); - va_end (args); - - as_bad_internal (file, line, buffer); -} -#endif /* not NO_STDARG */ - /* Send to stderr a string as a fatal message, and print location of error in input file(s). Please only use this for when we DON'T have some recovery action. It xexit()s with a warning status. */ -#ifdef USE_STDARG void as_fatal (const char *format, ...) { @@ -412,81 +293,69 @@ as_fatal (const char *format, ...) /* Delete the output file, if it exists. This will prevent make from thinking that a file was created and hence does not need rebuilding. */ if (out_file_name != NULL) - unlink (out_file_name); - xexit (EXIT_FAILURE); -} -#else -void -as_fatal (format, va_alist) - char *format; - va_dcl -{ - va_list args; - - as_show_where (); - va_start (args); - fprintf (stderr, _("Fatal error: ")); - vfprintf (stderr, format, args); - (void) putc ('\n', stderr); - va_end (args); + unlink_if_ordinary (out_file_name); xexit (EXIT_FAILURE); } -#endif /* not NO_STDARG */ -/* Indicate assertion failure. - Arguments: Filename, line number, optional function name. */ +/* Indicate internal constency error. + Arguments: Filename, line number, optional function name. + FILENAME may be NULL, which we use for crash-via-signal. */ void -as_assert (const char *file, int line, const char *fn) +as_abort (const char *file, int line, const char *fn) { as_show_where (); - fprintf (stderr, _("Internal error!\n")); - if (fn) - fprintf (stderr, _("Assertion failure in %s at %s line %d.\n"), - fn, file, line); + + if (!file) + fprintf (stderr, _("Internal error (%s).\n"), fn ? fn : "unknown"); + else if (fn) + fprintf (stderr, _("Internal error in %s at %s:%d.\n"), fn, file, line); else - fprintf (stderr, _("Assertion failure at %s line %d.\n"), file, line); + fprintf (stderr, _("Internal error at %s:%d.\n"), file, line); + fprintf (stderr, _("Please report this bug.\n")); + xexit (EXIT_FAILURE); } -/* as_abort: Print a friendly message saying how totally hosed we are, - and exit without producing a core file. */ +/* Handler for fatal signals, such as SIGSEGV. */ -void -as_abort (const char *file, int line, const char *fn) +static void +signal_crash (int signo) { - as_show_where (); - if (fn) - fprintf (stderr, _("Internal error, aborting at %s line %d in %s\n"), - file, line, fn); - else - fprintf (stderr, _("Internal error, aborting at %s line %d\n"), - file, line); - fprintf (stderr, _("Please report this bug.\n")); - xexit (EXIT_FAILURE); + /* Reset, to prevent unbounded recursion. */ + signal (signo, SIG_DFL); + + as_abort (NULL, 0, strsignal (signo)); } -/* Support routines. */ +/* Register signal handlers, for less abrubt crashes. */ void -fprint_value (FILE *file, valueT val) +signal_init (void) { - if (sizeof (val) <= sizeof (long)) - { - fprintf (file, "%ld", (long) val); - return; - } -#ifdef BFD_ASSEMBLER - if (sizeof (val) <= sizeof (bfd_vma)) - { - fprintf_vma (file, val); - return; - } +#ifdef SIGSEGV + signal (SIGSEGV, signal_crash); +#endif +#ifdef SIGILL + signal (SIGILL, signal_crash); +#endif +#ifdef SIGBUS + signal (SIGBUS, signal_crash); +#endif +#ifdef SIGABRT + signal (SIGABRT, signal_crash); +#endif +#if defined SIGIOT && (!defined SIGABRT || SIGABRT != SIGIOT) + signal (SIGIOT, signal_crash); +#endif +#ifdef SIGFPE + signal (SIGFPE, signal_crash); #endif - abort (); } +/* Support routines. */ + void sprint_value (char *buf, valueT val) { @@ -495,13 +364,11 @@ sprint_value (char *buf, valueT val) sprintf (buf, "%ld", (long) val); return; } -#ifdef BFD_ASSEMBLER if (sizeof (val) <= sizeof (bfd_vma)) { sprintf_vma (buf, val); return; } -#endif abort (); } @@ -509,39 +376,52 @@ sprint_value (char *buf, valueT val) #define HEX_MIN_THRESHOLD -(HEX_MAX_THRESHOLD) static void -as_internal_value_out_of_range (char * prefix, - offsetT val, - offsetT min, - offsetT max, - char * file, - unsigned line, - int bad) +as_internal_value_out_of_range (const char *prefix, + offsetT val, + offsetT min, + offsetT max, + const char *file, + unsigned line, + int bad) { const char * err; if (prefix == NULL) prefix = ""; -#ifdef BFD_ASSEMBLER + if (val >= min && val <= max) + { + addressT right = max & -max; + + if (max <= 1) + abort (); + + /* xgettext:c-format */ + err = _("%s out of domain (%" BFD_VMA_FMT "d is not a multiple of %" \ + BFD_VMA_FMT "d)"); + if (bad) + as_bad_where (file, line, err, prefix, val, right); + else + as_warn_where (file, line, err, prefix, val, right); + return; + } + if ( val < HEX_MAX_THRESHOLD && min < HEX_MAX_THRESHOLD && max < HEX_MAX_THRESHOLD && val > HEX_MIN_THRESHOLD && min > HEX_MIN_THRESHOLD && max > HEX_MIN_THRESHOLD) -#endif { /* xgettext:c-format */ - err = _("%s out of range (%d is not between %d and %d)"); + err = _("%s out of range (%" BFD_VMA_FMT "d is not between %" \ + BFD_VMA_FMT "d and %" BFD_VMA_FMT "d)"); if (bad) - as_bad_where (file, line, err, - prefix, (int) val, (int) min, (int) max); + as_bad_where (file, line, err, prefix, val, min, max); else - as_warn_where (file, line, err, - prefix, (int) val, (int) min, (int) max); + as_warn_where (file, line, err, prefix, val, min, max); } -#ifdef BFD_ASSEMBLER else { char val_buf [sizeof (val) * 3 + 2]; @@ -551,9 +431,9 @@ as_internal_value_out_of_range (char * prefix, if (sizeof (val) > sizeof (bfd_vma)) abort (); - sprintf_vma (val_buf, val); - sprintf_vma (min_buf, min); - sprintf_vma (max_buf, max); + sprintf_vma (val_buf, (bfd_vma) val); + sprintf_vma (min_buf, (bfd_vma) min); + sprintf_vma (max_buf, (bfd_vma) max); /* xgettext:c-format. */ err = _("%s out of range (0x%s is not between 0x%s and 0x%s)"); @@ -563,26 +443,25 @@ as_internal_value_out_of_range (char * prefix, else as_warn_where (file, line, err, prefix, val_buf, min_buf, max_buf); } -#endif } void -as_warn_value_out_of_range (char * prefix, - offsetT value, - offsetT min, - offsetT max, - char * file, +as_warn_value_out_of_range (const char *prefix, + offsetT value, + offsetT min, + offsetT max, + const char *file, unsigned line) { as_internal_value_out_of_range (prefix, value, min, max, file, line, 0); } void -as_bad_value_out_of_range (char * prefix, - offsetT value, - offsetT min, - offsetT max, - char * file, +as_bad_value_out_of_range (const char *prefix, + offsetT value, + offsetT min, + offsetT max, + const char *file, unsigned line) { as_internal_value_out_of_range (prefix, value, min, max, file, line, 1);