include/opcode/

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

diff --git a/gas/messages.c b/gas/messages.c
index 99e20a1a8140281790a2f270d49c3babd3948f12..5736bac7164cb402908be25a7efee69b329fae53 100644 (file)
--- a/gas/messages.c
+++ b/gas/messages.c
@@ -1,5 +1,6 @@
 /* messages.c - error reporter -
 /* messages.c - error reporter -

-   Copyright 1987, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 2000, 2001, 2003
+   Copyright 1987, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 2000, 2001,
+   2003, 2004, 2005, 2006, 2007

    Free Software Foundation, Inc.
    This file is part of GAS, the GNU Assembler.
 
    Free Software Foundation, Inc.
    This file is part of GAS, the GNU Assembler.
 


@@ -15,33 +16,11 @@
 
    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
 
    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 "as.h"
 

-#include <stdio.h>
-#ifdef HAVE_ERRNO_H
-#include <errno.h>
-#endif
-
-#ifdef USE_STDARG
-#include <stdarg.h>
-#endif
-
-#ifdef USE_VARARGS
-#include <varargs.h>
-#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 as_show_where (void);
 static void as_warn_internal (char *, unsigned int, char *);
 static void identify (char *);
 static void as_show_where (void);
 static void as_warn_internal (char *, unsigned int, char *);


@@ -137,30 +116,6 @@ as_show_where (void)
     fprintf (stderr, "%s:%u: ", file, line);
 }
 
     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
-}
-

 /* 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.
 /* 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.


@@ -232,7 +187,7 @@ as_warn (const char *format, ...)
   if (!flag_no_warnings)
     {
       va_start (args, 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);
     }
       va_end (args);
       as_warn_internal ((char *) NULL, 0, buffer);
     }


@@ -249,7 +204,7 @@ as_warn (format, va_alist)
   if (!flag_no_warnings)
     {
       va_start (args);
   if (!flag_no_warnings)
     {
       va_start (args);

-      vsprintf (buffer, format, args);
+      vsnprintf (buffer, sizeof (buffer), format, args);

       va_end (args);
       as_warn_internal ((char *) NULL, 0, buffer);
     }
       va_end (args);
       as_warn_internal ((char *) NULL, 0, buffer);
     }


@@ -270,7 +225,7 @@ as_warn_where (char *file, unsigned int line, const char *format, ...)
   if (!flag_no_warnings)
     {
       va_start (args, 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);
     }
       va_end (args);
       as_warn_internal (file, line, buffer);
     }


@@ -289,7 +244,7 @@ as_warn_where (file, line, format, va_alist)
   if (!flag_no_warnings)
     {
       va_start (args);
   if (!flag_no_warnings)
     {
       va_start (args);

-      vsprintf (buffer, format, args);
+      vsnprintf (buffer, sizeof (buffer), format, args);

       va_end (args);
       as_warn_internal (file, line, buffer);
     }
       va_end (args);
       as_warn_internal (file, line, buffer);
     }


@@ -331,7 +286,7 @@ as_bad (const char *format, ...)
   char buffer[2000];
 
   va_start (args, format);
   char buffer[2000];
 
   va_start (args, format);

-  vsprintf (buffer, format, args);
+  vsnprintf (buffer, sizeof (buffer), format, args);

   va_end (args);
 
   as_bad_internal ((char *) NULL, 0, buffer);
   va_end (args);
 
   as_bad_internal ((char *) NULL, 0, buffer);


@@ -347,7 +302,7 @@ as_bad (format, va_alist)
   char buffer[2000];
 
   va_start (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);
   va_end (args);
 
   as_bad_internal ((char *) NULL, 0, buffer);


@@ -366,7 +321,7 @@ as_bad_where (char *file, unsigned int line, const char *format, ...)
   char buffer[2000];
 
   va_start (args, format);
   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);
   va_end (args);
 
   as_bad_internal (file, line, buffer);


@@ -384,7 +339,7 @@ as_bad_where (file, line, format, va_alist)
   char buffer[2000];
 
   va_start (args);
   char buffer[2000];
 
   va_start (args);

-  vsprintf (buffer, format, args);
+  vsnprintf (buffer, sizeof (buffer), format, args);

   va_end (args);
 
   as_bad_internal (file, line, buffer);
   va_end (args);
 
   as_bad_internal (file, line, buffer);


@@ -411,7 +366,7 @@ 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)
   /* 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);
+    unlink_if_ordinary (out_file_name);

   xexit (EXIT_FAILURE);
 }
 #else
   xexit (EXIT_FAILURE);
 }
 #else


@@ -468,24 +423,6 @@ as_abort (const char *file, int line, const char *fn)
 
 /* Support routines.  */
 
 
 /* Support routines.  */
 

-void
-fprint_value (FILE *file, valueT val)
-{
-  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;
-    }
-#endif
-  abort ();
-}
-

 void
 sprint_value (char *buf, valueT val)
 {
 void
 sprint_value (char *buf, valueT val)
 {


@@ -494,13 +431,11 @@ sprint_value (char *buf, valueT val)
       sprintf (buf, "%ld", (long) val);
       return;
     }
       sprintf (buf, "%ld", (long) val);
       return;
     }

-#ifdef BFD_ASSEMBLER

   if (sizeof (val) <= sizeof (bfd_vma))
     {
       sprintf_vma (buf, val);
       return;
     }
   if (sizeof (val) <= sizeof (bfd_vma))
     {
       sprintf_vma (buf, val);
       return;
     }

-#endif

   abort ();
 }
 
   abort ();
 }
 


@@ -521,24 +456,40 @@ as_internal_value_out_of_range (char *    prefix,
   if (prefix == NULL)
     prefix = "";
 
   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 (%d is not a multiple of %d");
+      if (bad)
+       as_bad_where (file, line, err,
+                     prefix, (int) val, (int) right);
+      else
+       as_warn_where (file, line, err,
+                      prefix, (int) val, (int) right);
+    }
+

   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)
   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)");
 
       if (bad)
     {
       /* xgettext:c-format  */
       err = _("%s out of range (%d is not between %d and %d)");
 
       if (bad)

-       as_bad_where (file, line, err, prefix, val, min, max);
+       as_bad_where (file, line, err,
+                     prefix, (int) val, (int) min, (int) max);

       else
       else

-       as_warn_where (file, line, err, prefix, val, min, max);
+       as_warn_where (file, line, err,
+                      prefix, (int) val, (int) min, (int) max);

     }
     }

-#ifdef BFD_ASSEMBLER

   else
     {
       char val_buf [sizeof (val) * 3 + 2];
   else
     {
       char val_buf [sizeof (val) * 3 + 2];


@@ -560,7 +511,6 @@ as_internal_value_out_of_range (char *    prefix,
       else
        as_warn_where (file, line, err, prefix, val_buf, min_buf, max_buf);
     }
       else
        as_warn_where (file, line, err, prefix, val_buf, min_buf, max_buf);
     }

-#endif

 }
 
 void
 }
 
 void