backout m32rx stuff, not ready to be checked in

[deliverable/binutils-gdb.git] / gas / messages.c

diff --git a/gas/messages.c b/gas/messages.c
index 90e1f9589e514786f628cc83e0ae42b24b2ffa12..cb544136bddc66110b166685938d4b3ed8fb6e24 100644 (file)
--- a/gas/messages.c
+++ b/gas/messages.c
@@ -1,11 +1,11 @@
 /* messages.c - error reporter -
 /* messages.c - error reporter -

-   Copyright (C) 1987, 1991 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1991, 1992 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
 
    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 1, or (at your option)
+   the Free Software Foundation; either version 2, or (at your option)

    any later version.
 
    GAS is distributed in the hope that it will be useful,
    any later version.
 
    GAS is distributed in the hope that it will be useful,


@@ -17,13 +17,17 @@
    along with GAS; see the file COPYING.  If not, write to
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
 
    along with GAS; see the file COPYING.  If not, write to
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
 

-/* $Id$ */
-
-#include <stdio.h> /* define stderr */
+#include <stdio.h>

 #include <errno.h>
 
 #include "as.h"
 
 #include <errno.h>
 
 #include "as.h"
 

+#ifndef __STDC__
+#ifndef NO_STDARG
+#define NO_STDARG
+#endif
+#endif
+

 #ifndef NO_STDARG
 #include <stdarg.h>
 #else
 #ifndef NO_STDARG
 #include <stdarg.h>
 #else


@@ -32,6 +36,12 @@
 #endif /* NO_VARARGS */
 #endif /* NO_STDARG */
 
 #endif /* NO_VARARGS */
 #endif /* NO_STDARG */
 

+extern char *strerror ();
+
+static void as_show_where PARAMS ((void));
+static void as_warn_internal PARAMS ((char *, unsigned int, char *));
+static void as_bad_internal PARAMS ((char *, unsigned int, char *));
+

 /*
  * Despite the rest of the comments in this file, (FIXME-SOON),
  * here is the current scheme for error messages etc:
 /*
  * Despite the rest of the comments in this file, (FIXME-SOON),
  * here is the current scheme for error messages etc:


@@ -70,322 +80,508 @@
  * continues as though no error occurred.
  */
 
  * continues as though no error occurred.
  */
 

-/*
-  ERRORS
-
-  JF: this is now bogus.  We now print more standard error messages
-  that try to look like everyone else's.
+static void
+identify (file)
+     char *file;
+{
+  static int identified;
+  if (identified)
+    return;
+  identified++;

 
 

-  We print the error message 1st, beginning in column 1.
-  All ancillary info starts in column 2 on lines after the
-  key error text.
-  We try to print a location in logical and physical file
-  just after the main error text.
-  Caller then prints any appendices after that, begining all
-  lines with at least 1 space.
+  if (!file)
+    {
+      unsigned int x;
+      as_where (&file, &x);
+    }

 
 

-  Optionally, we may die.
-  There is no need for a trailing '\n' in your error text format
-  because we supply one.
+  fprintf (stderr, "%s: Assembler messages:\n", file);
+}

 
 

-  as_warn(fmt,args)  Like fprintf(stderr,fmt,args) but also call errwhere().
+static int warning_count;      /* Count of number of warnings issued */

 
 

-  as_fatal(fmt,args) Like as_warn() but exit with a fatal status.
+int 
+had_warnings ()
+{
+  return (warning_count);
+}                              /* had_err() */

 
 

- */
+/* Nonzero if we've hit a 'bad error', and should not write an obj file,
+   and exit with a nonzero error code */

 
 

-static int warning_count = 0; /* Count of number of warnings issued */
+static int error_count;

 
 

-int had_warnings() {
-       return(warning_count);
-} /* had_err() */
+int 
+had_errors ()
+{
+  return (error_count);
+}                              /* had_errors() */

 
 

-/* Nonzero if we've hit a 'bad error', and should not write an obj file,
-   and exit with a nonzero error code */

 
 

-static int error_count = 0;
+/* Print the current location to stderr.  */

 
 

-int had_errors() {
-       return(error_count);
-} /* had_errors() */
+static void
+as_show_where ()
+{
+  char *file;
+  unsigned int line;

 
 

+  as_where (&file, &line);
+  identify (file);
+  fprintf (stderr, "%s:%u: ", file, line);
+}

 
 /*
  *                     a s _ p e r r o r
  *
  * Like perror(3), but with more info.
  */
 
 /*
  *                     a s _ p e r r o r
  *
  * Like perror(3), but with more info.
  */

-void as_perror(gripe, filename)
-char *gripe;           /* Unpunctuated error theme. */
-char *filename;
-{
-       extern int sys_nerr;
-       extern char *sys_errlist[];

 
 

-       as_where();
-       fprintf(stderr,gripe,filename);
+void 
+as_perror (gripe, filename)
+     const char *gripe;                /* Unpunctuated error theme. */
+     const char *filename;
+{
+  const char *errtxt;

 
 

-       if (errno > sys_nerr)
-           fprintf(stderr, "Unknown error #%d.\n", errno);
-       else
-           fprintf(stderr, "%s.\n", sys_errlist[errno]);
-       errno = 0; /* After reporting, clear it. */
-} /* as_perror() */
+  as_show_where ();
+  fprintf (stderr, gripe, filename);
+#ifdef BFD_ASSEMBLER
+  errtxt = bfd_errmsg (bfd_get_error ());
+#else
+  errtxt = strerror (errno);
+#endif
+  fprintf (stderr, ": %s\n", errtxt);
+  errno = 0;
+#ifdef BFD_ASSEMBLER
+  bfd_set_error (bfd_error_no_error);
+#endif
+}

 
 /*
  *                     a s _ t s k t s k ()
  *
 
 /*
  *                     a s _ t s k t s k ()
  *

- * Send to stderr a string (with bell) (JF: Bell is obnoxious!) as a warning, and locate warning
+ * Send to stderr a string as a warning, and locate warning

  * in input file(s).
  * Please only use this for when we have some recovery action.
  * Please explain in string (which may have '\n's) what recovery was done.
  */
 
 #ifndef NO_STDARG
  * in input file(s).
  * Please only use this for when we have some recovery action.
  * Please explain in string (which may have '\n's) what recovery was done.
  */
 
 #ifndef NO_STDARG

-void as_tsktsk(Format)
-const char *Format;
+void 
+as_tsktsk (const char *format,...)

 {
 {

-       va_list args;
-       
-       as_where();
-       va_start(args, Format);
-       vfprintf(stderr, Format, args);
-       va_end(args);
-       (void) putc('\n', stderr);
-} /* as_tsktsk() */
+  va_list args;
+
+  as_show_where ();
+  va_start (args, format);
+  vfprintf (stderr, format, args);
+  va_end (args);
+  (void) putc ('\n', stderr);
+}                              /* as_tsktsk() */
+

 #else
 #ifndef NO_VARARGS
 #else
 #ifndef NO_VARARGS

-void as_tsktsk(Format,va_alist)
-char *Format;
-va_dcl
+void 
+as_tsktsk (format, va_alist)
+     char *format;
+     va_dcl

 {
 {

-       va_list args;
-       
-       as_where();
-       va_start(args);
-       vfprintf(stderr, Format, args);
-       va_end(args);
-       (void) putc('\n', stderr);
-} /* as_tsktsk() */
+  va_list args;
+
+  as_show_where ();
+  va_start (args);
+  vfprintf (stderr, format, args);
+  va_end (args);
+  (void) putc ('\n', stderr);
+}                              /* as_tsktsk() */
+

 #else
 /*VARARGS1 */
 #else
 /*VARARGS1 */

-as_tsktsk(Format,args)
-char *Format;
+as_tsktsk (format, args)
+     char *format;

 {
 {

-       as_where();
-       _doprnt (Format, &args, stderr);
-       (void)putc ('\n', stderr);
-       /* as_where(); */
-} /* as_tsktsk */
+  as_show_where ();
+  _doprnt (format, &args, stderr);
+  (void) putc ('\n', stderr);
+}                              /* as_tsktsk */
+

 #endif /* not NO_VARARGS */
 #endif /* not NO_STDARG */
 
 #endif /* not NO_VARARGS */
 #endif /* not NO_STDARG */
 

-#ifdef DONTDEF
-void as_tsktsk(Format,aa,ab,ac,ad,ae,af,ag,ah,ai,aj,ak,al,am,an)
-char *format;
+/* The common portion of as_warn and as_warn_where.  */
+
+static void
+as_warn_internal (file, line, buffer)
+     char *file;
+     unsigned int line;
+     char *buffer;

 {
 {

-       as_where();
-       fprintf(stderr,Format,aa,ab,ac,ad,ae,af,ag,ah,ai,aj,ak,al,am,an);
-       (void)putc('\n',stderr);
-} /* as_tsktsk() */
+  ++warning_count;
+
+  if (file == NULL)
+    as_where (&file, &line);
+
+  identify (file);
+  fprintf (stderr, "%s:%u: Warning: ", file, line);
+  fputs (buffer, stderr);
+  (void) putc ('\n', stderr);
+#ifndef NO_LISTING
+  listing_warning (buffer);

 #endif
 #endif

+}
+

 /*
  *                     a s _ w a r n ()
  *
 /*
  *                     a s _ w a r n ()
  *

- * Send to stderr a string (with bell) (JF: Bell is obnoxious!) as a warning, and locate warning
+ * Send to stderr a string as a warning, and locate warning

  * in input file(s).
  * Please only use this for when we have some recovery action.
  * Please explain in string (which may have '\n's) what recovery was done.
  */
 
 #ifndef NO_STDARG
  * in input file(s).
  * Please only use this for when we have some recovery action.
  * Please explain in string (which may have '\n's) what recovery was done.
  */
 
 #ifndef NO_STDARG

-void as_warn(Format)
-const char *Format;
+void 
+as_warn (const char *format,...)

 {
 {

-       va_list args;
-       
-       if(!flagseen['W']) {
-               ++warning_count;
-               as_where();
-               va_start(args, Format);
-               vfprintf(stderr, Format, args);
-               va_end(args);
-               (void) putc('\n', stderr);
-       }
-} /* as_warn() */
+  va_list args;
+  char buffer[200];
+
+  if (!flagseen['W'])
+    {
+      va_start (args, format);
+      vsprintf (buffer, format, args);
+      va_end (args);
+      as_warn_internal ((char *) NULL, 0, buffer);
+    }
+}                              /* as_warn() */
+

 #else
 #ifndef NO_VARARGS
 #else
 #ifndef NO_VARARGS

-void as_warn(Format,va_alist)
-char *Format;
-va_dcl
+void 
+as_warn (format, va_alist)
+     char *format;
+     va_dcl

 {
 {

-       va_list args;
-       
-       if(!flagseen['W']) {
-               ++warning_count;
-               as_where();
-               va_start(args);
-               vfprintf(stderr, Format, args);
-               va_end(args);
-               (void) putc('\n', stderr);
-       }
-} /* as_warn() */
+  va_list args;
+  char buffer[200];
+
+  if (!flagseen['W'])
+    {
+      va_start (args);
+      vsprintf (buffer, format, args);
+      va_end (args);
+      as_warn_internal ((char *) NULL, 0, buffer);
+    }
+}                              /* as_warn() */
+

 #else
 /*VARARGS1 */
 #else
 /*VARARGS1 */

-as_warn(Format,args)
-char *Format;
+as_warn (format, args)
+     char *format;

 {
 {

-       /* -W supresses warning messages. */
-       if (! flagseen ['W']) {
-               ++warning_count;
-               as_where();
-               _doprnt (Format, &args, stderr);
-               (void)putc ('\n', stderr);
-               /* as_where(); */
-       }
-} /* as_warn() */
+  if (!flagseen['W'])
+    {
+      ++warning_count;
+      as_show_where ();
+      fprintf (stderr, "Warning: ");
+      _doprnt (format, &args, stderr);
+      (void) putc ('\n', stderr);
+    }
+}                              /* as_warn() */
+

 #endif /* not NO_VARARGS */
 #endif /* not NO_STDARG */
 
 #endif /* not NO_VARARGS */
 #endif /* not NO_STDARG */
 

-#ifdef DONTDEF
-void as_warn(Format,aa,ab,ac,ad,ae,af,ag,ah,ai,aj,ak,al,am,an)
-char *format;
+/* as_warn_where, 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.  */
+
+#ifndef NO_STDARG
+void 
+as_warn_where (char *file, unsigned int line, const char *format,...)
+{
+  va_list args;
+  char buffer[200];
+
+  if (!flagseen['W'])
+    {
+      va_start (args, format);
+      vsprintf (buffer, format, args);
+      va_end (args);
+      as_warn_internal (file, line, buffer);
+    }
+}                              /* as_warn() */
+
+#else
+#ifndef NO_VARARGS
+void 
+as_warn_where (file, line, format, va_alist)
+     char *file;
+     unsigned int line;
+     char *format;
+     va_dcl
+{
+  va_list args;
+  char buffer[200];
+
+  if (!flagseen['W'])
+    {
+      va_start (args);
+      vsprintf (buffer, format, args);
+      va_end (args);
+      as_warn_internal (file, line, buffer);
+    }
+}                              /* as_warn() */
+
+#else
+/*VARARGS1 */
+as_warn_where (file, line, format, args)
+     char *file;
+     unsigned int line;
+     char *format;

 {
 {

-       if(!flagseen['W']) {
-               ++warning_count;
-               as_where();
-               fprintf(stderr,Format,aa,ab,ac,ad,ae,af,ag,ah,ai,aj,ak,al,am,an);
-               (void)putc('\n',stderr);
-       }
-} /* as_warn() */
+  if (!flagseen['W'])
+    {
+      ++warning_count;
+      identify (file);
+      fprintf (stderr, "%s:%u: Warning: ", file, line);
+      _doprnt (format, &args, stderr);
+      (void) putc ('\n', stderr);
+    }
+}                              /* as_warn() */
+
+#endif /* not NO_VARARGS */
+#endif /* not NO_STDARG */
+
+/* The common portion of as_bad and as_bad_where.  */
+
+static void
+as_bad_internal (file, line, buffer)
+     char *file;
+     unsigned int line;
+     char *buffer;
+{
+  ++error_count;
+
+  if (file == NULL)
+    as_where (&file, &line);
+
+  identify (file);
+  fprintf (stderr, "%s:%u: Error: ", file, line);
+  fputs (buffer, stderr);
+  (void) putc ('\n', stderr);
+#ifndef NO_LISTING
+  listing_error (buffer);

 #endif
 #endif

+}
+

 /*
  *                     a s _ b a d ()
  *
 /*
  *                     a s _ b a d ()
  *

- * Send to stderr a string (with bell) (JF: Bell is obnoxious!) as a warning,
- * and locate warning in input file(s).
+ * 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 continue processing
  * but not produce an object file.
  * Please explain in string (which may have '\n's) what recovery was done.
  */
 
 #ifndef NO_STDARG
  * Please us 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.
  */
 
 #ifndef NO_STDARG

-void as_bad(Format)
-const char *Format;
+void 
+as_bad (const char *format,...)

 {
 {

-       va_list args;
-
-       ++error_count;
-       as_where();
-       va_start(args, Format);
-       vfprintf(stderr, Format, args);
-       va_end(args);
-       (void) putc('\n', stderr);
-} /* as_bad() */
+  va_list args;
+  char buffer[200];
+
+  va_start (args, format);
+  vsprintf (buffer, format, args);
+  va_end (args);
+
+  as_bad_internal ((char *) NULL, 0, buffer);
+}
+

 #else
 #ifndef NO_VARARGS
 #else
 #ifndef NO_VARARGS

-void as_bad(Format,va_alist)
-char *Format;
-va_dcl
+void 
+as_bad (format, va_alist)
+     char *format;
+     va_dcl

 {
 {

-       va_list args;
-
-       ++error_count;
-       as_where();
-       va_start(args);
-       vfprintf(stderr, Format, args);
-       va_end(args);
-       (void) putc('\n', stderr);
-} /* as_bad() */
+  va_list args;
+  char buffer[200];
+
+  va_start (args);
+  vsprintf (buffer, format, args);
+  va_end (args);
+
+  as_bad_internal ((char *) NULL, 0, buffer);
+}
+

 #else
 /*VARARGS1 */
 #else
 /*VARARGS1 */

-as_bad(Format,args)
-char *Format;
+as_bad (format, args)
+     char *format;

 {
 {

-       ++error_count;
-       as_where();
-       _doprnt (Format, &args, stderr);
-       (void)putc ('\n', stderr);
-       /* as_where(); */
-} /* as_bad() */
+  ++error_count;
+
+  as_show_where ();
+  fprintf (stderr, "Error: ");
+  _doprnt (format, &args, stderr);
+  (void) putc ('\n', stderr);
+}                              /* as_bad() */
+

 #endif /* not NO_VARARGS */
 #endif /* not NO_STDARG */
 
 #endif /* not NO_VARARGS */
 #endif /* not NO_STDARG */
 

-#ifdef DONTDEF
-void as_bad(Format,aa,ab,ac,ad,ae,af,ag,ah,ai,aj,ak,al,am,an)
-char *format;
+/* as_bad_where, 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.  */
+
+#ifndef NO_STDARG
+void 
+as_bad_where (char *file, unsigned int line, const char *format,...)

 {
 {

-       ++error_count;
-       as_where();
-       fprintf(stderr,Format,aa,ab,ac,ad,ae,af,ag,ah,ai,aj,ak,al,am,an);
-       (void)putc('\n',stderr);
-} /* as_bad() */
-#endif
+  va_list args;
+  char buffer[200];
+
+  va_start (args, format);
+  vsprintf (buffer, format, args);
+  va_end (args);
+
+  as_bad_internal (file, line, buffer);
+}
+
+#else
+#ifndef NO_VARARGS
+void 
+as_bad_where (file, line, format, va_alist)
+     char *file;
+     unsigned int line;
+     char *format;
+     va_dcl
+{
+  va_list args;
+  char buffer[200];
+
+  va_start (args);
+  vsprintf (buffer, format, args);
+  va_end (args);
+
+  as_bad_internal (file, line, buffer);
+}
+
+#else
+/*VARARGS1 */
+as_bad_where (file, line, format, args)
+     char *file;
+     unsigned int line;
+     char *format;
+{
+  ++error_count;
+
+  identify (file);
+  fprintf (stderr, "%s:%u: Error: ", file, line);
+  _doprnt (format, &args, stderr);
+  (void) putc ('\n', stderr);
+}                              /* as_bad() */
+
+#endif /* not NO_VARARGS */
+#endif /* not NO_STDARG */

 
 /*
  *                     a s _ f a t a l ()
  *
 
 /*
  *                     a s _ f a t a l ()
  *

- * Send to stderr a string (with bell) (JF: Bell is obnoxious!) as a fatal
- * message, and locate stdsource in input file(s).
+ * 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 exit()s with a warning status.
  */
 
 #ifndef NO_STDARG
  * Please only use this for when we DON'T have some recovery action.
  * It exit()s with a warning status.
  */
 
 #ifndef NO_STDARG

-void as_fatal(Format)
-const char *Format;
+void 
+as_fatal (const char *format,...)

 {
 {

-       va_list args;
-
-       as_where();
-       va_start(args, Format);
-       fprintf (stderr, "FATAL:");
-       vfprintf(stderr, Format, args);
-       (void) putc('\n', stderr);
-       va_end(args);
-       exit(42);
-} /* as_fatal() */
+  va_list args;
+
+  as_show_where ();
+  va_start (args, format);
+  fprintf (stderr, "Fatal error:");
+  vfprintf (stderr, format, args);
+  (void) putc ('\n', stderr);
+  va_end (args);
+  exit (33);
+}                              /* as_fatal() */
+

 #else
 #ifndef NO_VARARGS
 #else
 #ifndef NO_VARARGS

-void as_fatal(Format,va_alist)
-char *Format;
-va_dcl
+void 
+as_fatal (format, va_alist)
+     char *format;
+     va_dcl

 {
 {

-       va_list args;
-
-       as_where();
-       va_start(args);
-       fprintf (stderr, "FATAL:");
-       vfprintf(stderr, Format, args);
-       (void) putc('\n', stderr);
-       va_end(args);
-       exit(42);
-} /* as_fatal() */
+  va_list args;
+
+  as_show_where ();
+  va_start (args);
+  fprintf (stderr, "Fatal error:");
+  vfprintf (stderr, format, args);
+  (void) putc ('\n', stderr);
+  va_end (args);
+  exit (33);
+}                              /* as_fatal() */
+

 #else
 /*VARARGS1 */
 #else
 /*VARARGS1 */

-as_fatal(Format, args)
-char *Format;
+as_fatal (format, args)
+     char *format;

 {
 {

-       as_where();
-       fprintf(stderr,"FATAL:");
-       _doprnt (Format, &args, stderr);
-       (void)putc ('\n', stderr);
-       /* as_where(); */
-       exit(42);                       /* What is a good exit status? */
-} /* as_fatal() */
+  as_show_where ();
+  fprintf (stderr, "Fatal error:");
+  _doprnt (format, &args, stderr);
+  (void) putc ('\n', stderr);
+  exit (33);                   /* What is a good exit status? */
+}                              /* as_fatal() */
+

 #endif /* not NO_VARARGS */
 #endif /* not NO_STDARG */
 
 #endif /* not NO_VARARGS */
 #endif /* not NO_STDARG */
 

-#ifdef DONTDEF
-void as_fatal(Format,aa,ab,ac,ad,ae,af,ag,ah,ai,aj,ak,al,am,an)
-char *Format;
+void
+fprint_value (file, val)
+     FILE *file;
+     valueT val;
+{
+  if (sizeof (val) <= sizeof (long))
+    {
+      fprintf (file, "%ld", val);
+      return;
+    }
+#ifdef BFD_ASSEMBLER
+  if (sizeof (val) <= sizeof (bfd_vma))
+    {
+      fprintf_vma (file, val);
+      return;
+    }
+#endif
+  abort ();
+}
+
+void
+sprint_value (buf, val)
+     char *buf;
+     valueT val;

 {
 {

-       as_where();
-       fprintf (stderr, "FATAL:");
-       fprintf(stderr, Format,aa,ab,ac,ad,ae,af,ag,ah,ai,aj,ak,al,am,an);
-       (void) putc('\n', stderr);
-       exit(42);
-} /* as_fatal() */
+  if (sizeof (val) <= sizeof (long))
+    {
+      sprintf (buf, "%ld", val);
+      return;
+    }
+#ifdef BFD_ASSEMBLER
+  if (sizeof (val) <= sizeof (bfd_vma))
+    {
+      sprintf_vma (buf, val);
+      return;
+    }

 #endif
 #endif

+  abort ();
+}

 
 

-/* end: messages.c */
+/* end of messages.c */