opcodes: blackfin: constify register names

[deliverable/binutils-gdb.git] / gas / input-scrub.c

diff --git a/gas/input-scrub.c b/gas/input-scrub.c
index 8c5957bcbb3f9a649b6c0b02e00c95c732178351..e1ff5cc0a505d48840692c326811709ce19938b4 100644 (file)
--- a/gas/input-scrub.c
+++ b/gas/input-scrub.c
@@ -1,12 +1,13 @@
 /* input_scrub.c - Break up input buffers into whole numbers of lines.
 /* input_scrub.c - Break up input buffers into whole numbers of lines.

-   Copyright (C) 1987, 90, 91, 92, 93, 94, 95, 96, 97, 2000
+   Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
+   2000, 2001, 2003, 2005, 2006, 2007, 2008

    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
    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,
    any later version.
 
    GAS is distributed in the hope that it will be useful,


@@ -16,10 +17,9 @@
 
    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 <errno.h>             /* Need this to make errno declaration right */

 #include "as.h"
 #include "input-file.h"
 #include "sb.h"
 #include "as.h"
 #include "input-file.h"
 #include "sb.h"


@@ -32,7 +32,7 @@
  * were broken across buffers, and return a buffer of full lines to
  * the caller.
  * The last partial line begins the next buffer we build and return to caller.
  * were broken across buffers, and return a buffer of full lines to
  * the caller.
  * The last partial line begins the next buffer we build and return to caller.

- * The buffer returned to caller is preceeded by BEFORE_STRING and followed
+ * The buffer returned to caller is preceded by BEFORE_STRING and followed

  * by AFTER_STRING, as sentinels. The last character before AFTER_STRING
  * is a newline.
  * Also looks after line numbers, for e.g. error messages.
  * by AFTER_STRING, as sentinels. The last character before AFTER_STRING
  * is a newline.
  * Also looks after line numbers, for e.g. error messages.


@@ -56,17 +56,22 @@
 #define BEFORE_SIZE (1)
 #define AFTER_SIZE  (1)
 
 #define BEFORE_SIZE (1)
 #define AFTER_SIZE  (1)
 

+#ifndef TC_EOL_IN_INSN
+#define TC_EOL_IN_INSN(P) 0
+#endif
+

 static char *buffer_start;     /*->1st char of full buffer area.  */
 static char *partial_where;    /*->after last full line in buffer.  */
 static int partial_size;       /* >=0. Number of chars in partial line in buffer.  */
 static char *buffer_start;     /*->1st char of full buffer area.  */
 static char *partial_where;    /*->after last full line in buffer.  */
 static int partial_size;       /* >=0. Number of chars in partial line in buffer.  */

+
+/* Because we need AFTER_STRING just after last full line, it clobbers
+   1st part of partial line. So we preserve 1st part of partial line
+   here.  */

 static char save_source[AFTER_SIZE];
 static char save_source[AFTER_SIZE];

-/* Because we need AFTER_STRING just after last */
-/* full line, it clobbers 1st part of partial */
-/* line. So we preserve 1st part of partial */
-/* line here.  */
-static unsigned int buffer_length;     /* What is the largest size buffer that */
-/* input_file_give_next_buffer() could */
-/* return to us? */
+
+/* What is the largest size buffer that input_file_give_next_buffer()
+   could return to us?  */
+static unsigned int buffer_length;

 
 /* The index into an sb structure we are reading from.  -1 if none.  */
 static int sb_index = -1;
 
 /* The index into an sb structure we are reading from.  -1 if none.  */
 static int sb_index = -1;


@@ -101,28 +106,26 @@ static line_numberT physical_input_line;
 static int logical_input_line;
 
 /* Struct used to save the state of the input handler during include files */
 static int logical_input_line;
 
 /* Struct used to save the state of the input handler during include files */

-struct input_save
-  {
-    char *buffer_start;
-    char *partial_where;
-    int partial_size;
-    char save_source[AFTER_SIZE];
-    unsigned int buffer_length;
-    char *physical_input_file;
-    char *logical_input_file;
-    line_numberT physical_input_line;
-    int logical_input_line;
-    int sb_index;
-    sb from_sb;
-    int from_sb_is_expansion;       /* Should we do a conditional check? */
-    struct input_save *next_saved_file;        /* Chain of input_saves */
-    char *input_file_save;     /* Saved state of input routines */
-    char *saved_position;      /* Caller's saved position in buf */
-  };
-
-static struct input_save *input_scrub_push PARAMS ((char *saved_position));
-static char *input_scrub_pop PARAMS ((struct input_save *arg));
-static void as_1_char PARAMS ((unsigned int c, FILE * stream));
+struct input_save {
+  char *              buffer_start;
+  char *              partial_where;
+  int                 partial_size;
+  char                save_source[AFTER_SIZE];
+  unsigned int        buffer_length;
+  char *              physical_input_file;
+  char *              logical_input_file;
+  line_numberT        physical_input_line;
+  int                 logical_input_line;
+  int                 sb_index;
+  sb                  from_sb;
+  int                 from_sb_is_expansion; /* Should we do a conditional check?  */
+  struct input_save * next_saved_file; /* Chain of input_saves.  */
+  char *              input_file_save; /* Saved state of input routines.  */
+  char *              saved_position;  /* Caller's saved position in buf.  */
+};
+
+static struct input_save *input_scrub_push (char *saved_position);
+static char *input_scrub_pop (struct input_save *arg);

 
 /* Saved information about the file that .include'd this one.  When we hit EOF,
    we automatically pop to that file.  */
 
 /* Saved information about the file that .include'd this one.  When we hit EOF,
    we automatically pop to that file.  */


@@ -132,9 +135,9 @@ static struct input_save *next_saved_file;
 /* Push the state of input reading and scrubbing so that we can #include.
    The return value is a 'void *' (fudged for old compilers) to a save
    area, which can be restored by passing it to input_scrub_pop().  */
 /* Push the state of input reading and scrubbing so that we can #include.
    The return value is a 'void *' (fudged for old compilers) to a save
    area, which can be restored by passing it to input_scrub_pop().  */

+

 static struct input_save *
 static struct input_save *

-input_scrub_push (saved_position)
-     char *saved_position;
+input_scrub_push (char *saved_position)

 {
   register struct input_save *saved;
 
 {
   register struct input_save *saved;
 


@@ -162,15 +165,15 @@ input_scrub_push (saved_position)
   buffer_length = input_file_buffer_size ();
   sb_index = -1;
 
   buffer_length = input_file_buffer_size ();
   sb_index = -1;
 

-  buffer_start = xmalloc ((BEFORE_SIZE + buffer_length + buffer_length + AFTER_SIZE));
+  buffer_start = (char *) xmalloc ((BEFORE_SIZE + buffer_length
+                                    + buffer_length + AFTER_SIZE));

   memcpy (buffer_start, BEFORE_STRING, (int) BEFORE_SIZE);
 
   return saved;
   memcpy (buffer_start, BEFORE_STRING, (int) BEFORE_SIZE);
 
   return saved;

-}                              /* input_scrub_push() */
+}

 
 static char *
 
 static char *

-input_scrub_pop (saved)
-     struct input_save *saved;
+input_scrub_pop (struct input_save *saved)

 {
   char *saved_position;
 
 {
   char *saved_position;
 


@@ -196,18 +199,19 @@ input_scrub_pop (saved)
   return saved_position;
 }
 \f
   return saved_position;
 }
 \f

-

 void
 void

-input_scrub_begin ()
+input_scrub_begin (void)

 {
   know (strlen (BEFORE_STRING) == BEFORE_SIZE);
 {
   know (strlen (BEFORE_STRING) == BEFORE_SIZE);

-  know (strlen (AFTER_STRING) == AFTER_SIZE || (AFTER_STRING[0] == '\0' && AFTER_SIZE == 1));
+  know (strlen (AFTER_STRING) == AFTER_SIZE
+       || (AFTER_STRING[0] == '\0' && AFTER_SIZE == 1));

 
   input_file_begin ();
 
   buffer_length = input_file_buffer_size ();
 
 
   input_file_begin ();
 
   buffer_length = input_file_buffer_size ();
 

-  buffer_start = xmalloc ((BEFORE_SIZE + buffer_length + buffer_length + AFTER_SIZE));
+  buffer_start = (char *) xmalloc ((BEFORE_SIZE + buffer_length
+                                    + buffer_length + AFTER_SIZE));

   memcpy (buffer_start, BEFORE_STRING, (int) BEFORE_SIZE);
 
   /* Line number things.  */
   memcpy (buffer_start, BEFORE_STRING, (int) BEFORE_SIZE);
 
   /* Line number things.  */


@@ -219,7 +223,7 @@ input_scrub_begin ()
 }
 
 void
 }
 
 void

-input_scrub_end ()
+input_scrub_end (void)

 {
   if (buffer_start)
     {
 {
   if (buffer_start)
     {


@@ -229,11 +233,11 @@ input_scrub_end ()
     }
 }
 
     }
 }
 

-/* Start reading input from a new file.  */
+/* Start reading input from a new file.
+   Return start of caller's part of buffer.  */

 
 

-char *                         /* Return start of caller's part of buffer.  */
-input_scrub_new_file (filename)
-     char *filename;
+char *
+input_scrub_new_file (char *filename)

 {
   input_file_open (filename, !flag_no_comments);
   physical_input_file = filename[0] ? filename : _("{standard input}");
 {
   input_file_open (filename, !flag_no_comments);
   physical_input_file = filename[0] ? filename : _("{standard input}");


@@ -248,9 +252,7 @@ input_scrub_new_file (filename)
    input_scrub_new_file.  */
 
 char *
    input_scrub_new_file.  */
 
 char *

-input_scrub_include_file (filename, position)
-     char *filename;
-     char *position;
+input_scrub_include_file (char *filename, char *position)

 {
   next_saved_file = input_scrub_push (position);
   return input_scrub_new_file (filename);
 {
   next_saved_file = input_scrub_push (position);
   return input_scrub_new_file (filename);


@@ -260,10 +262,7 @@ input_scrub_include_file (filename, position)
    expanding a macro.  */
 
 void
    expanding a macro.  */
 
 void

-input_scrub_include_sb (from, position, is_expansion)
-     sb *from;
-     char *position;
-     int is_expansion;
+input_scrub_include_sb (sb *from, char *position, int is_expansion)

 {
   if (macro_nest > max_macro_nest)
     as_fatal (_("macros nested too deeply"));
 {
   if (macro_nest > max_macro_nest)
     as_fatal (_("macros nested too deeply"));


@@ -285,7 +284,13 @@ input_scrub_include_sb (from, position, is_expansion)
       /* Add the sentinel required by read.c.  */
       sb_add_char (&from_sb, '\n');
     }
       /* Add the sentinel required by read.c.  */
       sb_add_char (&from_sb, '\n');
     }

-  sb_add_sb (&from_sb, from);
+  sb_scrub_and_add_sb (&from_sb, from);
+
+  /* Make sure the parser looks at defined contents when it scans for
+     e.g. end-of-line at the end of a macro.  */
+  sb_add_char (&from_sb, 0);
+  from_sb.len--;
+

   sb_index = 1;
 
   /* These variables are reset by input_scrub_push.  Restore them
   sb_index = 1;
 
   /* These variables are reset by input_scrub_push.  Restore them


@@ -295,14 +300,13 @@ input_scrub_include_sb (from, position, is_expansion)
 }
 
 void
 }
 
 void

-input_scrub_close ()
+input_scrub_close (void)

 {
   input_file_close ();
 }
 
 char *
 {
   input_file_close ();
 }
 
 char *

-input_scrub_next_buffer (bufp)
-     char **bufp;
+input_scrub_next_buffer (char **bufp)

 {
   register char *limit;                /*->just after last char of buffer.  */
 
 {
   register char *limit;                /*->just after last char of buffer.  */
 


@@ -311,16 +315,17 @@ input_scrub_next_buffer (bufp)
       if (sb_index >= from_sb.len)
        {
          sb_kill (&from_sb);
       if (sb_index >= from_sb.len)
        {
          sb_kill (&from_sb);

-          if (from_sb_is_expansion
+         if (from_sb_is_expansion

              )
              )

-            {
-              cond_finish_check (macro_nest);
+           {
+             cond_finish_check (macro_nest);

 #ifdef md_macro_end
 #ifdef md_macro_end

-              /* allow the target to clean up per-macro expansion data */
-              md_macro_end ();
+             /* Allow the target to clean up per-macro expansion
+                data.  */
+             md_macro_end ();

 #endif
 #endif

-            }
-          --macro_nest;
+           }
+         --macro_nest;

          partial_where = NULL;
          if (next_saved_file != NULL)
            *bufp = input_scrub_pop (next_saved_file);
          partial_where = NULL;
          if (next_saved_file != NULL)
            *bufp = input_scrub_pop (next_saved_file);


@@ -338,8 +343,8 @@ input_scrub_next_buffer (bufp)
 
   if (partial_size)
     {
 
   if (partial_size)
     {

-      memcpy (buffer_start + BEFORE_SIZE, partial_where,
-             (unsigned int) partial_size);
+      memmove (buffer_start + BEFORE_SIZE, partial_where,
+              (unsigned int) partial_size);

       memcpy (buffer_start + BEFORE_SIZE, save_source, AFTER_SIZE);
     }
   limit = input_file_give_next_buffer (buffer_start
       memcpy (buffer_start + BEFORE_SIZE, save_source, AFTER_SIZE);
     }
   limit = input_file_give_next_buffer (buffer_start


@@ -348,8 +353,9 @@ input_scrub_next_buffer (bufp)
   if (limit)
     {
       register char *p;                /* Find last newline.  */
   if (limit)
     {
       register char *p;                /* Find last newline.  */

-
-      for (p = limit - 1; *p != '\n'; --p)
+      /* Terminate the buffer to avoid confusing TC_EOL_IN_INSN.  */
+      *limit = '\0';
+      for (p = limit - 1; *p != '\n' || TC_EOL_IN_INSN (p); --p)

        ;
       ++p;
 
        ;
       ++p;
 


@@ -359,10 +365,10 @@ input_scrub_next_buffer (bufp)
 
          limoff = limit - buffer_start;
          buffer_length += input_file_buffer_size ();
 
          limoff = limit - buffer_start;
          buffer_length += input_file_buffer_size ();

-         buffer_start = xrealloc (buffer_start,
-                                  (BEFORE_SIZE
-                                   + 2 * buffer_length
-                                   + AFTER_SIZE));
+         buffer_start = (char *) xrealloc (buffer_start,
+                                            (BEFORE_SIZE
+                                             + 2 * buffer_length
+                                             + AFTER_SIZE));

          *bufp = buffer_start + BEFORE_SIZE;
          limit = input_file_give_next_buffer (buffer_start + limoff);
 
          *bufp = buffer_start + BEFORE_SIZE;
          limit = input_file_give_next_buffer (buffer_start + limoff);
 


@@ -375,7 +381,9 @@ input_scrub_next_buffer (bufp)
              return NULL;
            }
 
              return NULL;
            }
 

-         for (p = limit - 1; *p != '\n'; --p)
+         /* Terminate the buffer to avoid confusing TC_EOL_IN_INSN.  */
+         *limit = '\0';
+         for (p = limit - 1; *p != '\n' || TC_EOL_IN_INSN (p); --p)

            ;
          ++p;
        }
            ;
          ++p;
        }


@@ -390,7 +398,7 @@ input_scrub_next_buffer (bufp)
       partial_where = 0;
       if (partial_size > 0)
        {
       partial_where = 0;
       if (partial_size > 0)
        {

-         as_warn (_("Partial line at end of file ignored"));
+         as_warn (_("partial line at end of file ignored"));

        }
 
       /* Tell the listing we've finished the file.  */
        }
 
       /* Tell the listing we've finished the file.  */


@@ -404,21 +412,19 @@ input_scrub_next_buffer (bufp)
        }
     }
   return (partial_where);
        }
     }
   return (partial_where);

-}                              /* input_scrub_next_buffer() */
+}

 \f
 \f

-/*
- * The remaining part of this file deals with line numbers, error
- * messages and so on.
- */
+/* The remaining part of this file deals with line numbers, error
+   messages and so on.  Return TRUE if we opened any file.  */

 
 int
 
 int

-seen_at_least_1_file ()                /* TRUE if we opened any file.  */
+seen_at_least_1_file (void)

 {
   return (physical_input_file != NULL);
 }
 
 void
 {
   return (physical_input_file != NULL);
 }
 
 void

-bump_line_counters ()
+bump_line_counters (void)

 {
   if (sb_index < 0)
     {
 {
   if (sb_index < 0)
     {


@@ -428,26 +434,43 @@ bump_line_counters ()
     }
 }
 \f
     }
 }
 \f

-/*
- *                     new_logical_line()
- *
- * Tells us what the new logical line number and file are.
- * If the line_number is -1, we don't change the current logical line
- * number.  If it is -2, we decrement the logical line number (this is
- * to support the .appfile pseudo-op inserted into the stream by
- * do_scrub_chars).
- * If the fname is NULL, we don't change the current logical file name.
- * Returns nonzero if the filename actually changes.
- */
+/* Tells us what the new logical line number and file are.
+   If the line_number is -1, we don't change the current logical line
+   number.  If it is -2, we decrement the logical line number (this is
+   to support the .appfile pseudo-op inserted into the stream by
+   do_scrub_chars).
+   If the fname is NULL, we don't change the current logical file name.
+   Returns nonzero if the filename actually changes.  */
+

 int
 int

-new_logical_line (fname, line_number)
-     char *fname;              /* DON'T destroy it! We point to it! */
-     int line_number;
+new_logical_line_flags (char *fname, /* DON'T destroy it!  We point to it!  */
+                       int line_number,
+                       int flags)

 {
 {

+  switch (flags)
+    {
+    case 0:
+      break;
+    case 1:
+      if (line_number != -1)
+       abort ();
+      break;
+    case 1 << 1:
+    case 1 << 2:
+      /* FIXME: we could check that include nesting is correct.  */
+      break;
+    default:
+      abort ();
+    }
+

   if (line_number >= 0)
     logical_input_line = line_number;
   if (line_number >= 0)
     logical_input_line = line_number;

-  else if (line_number == -2 && logical_input_line > 0)
-    --logical_input_line;
+  else if (line_number == -1 && fname && !*fname && (flags & (1 << 2)))
+    {
+      logical_input_file = physical_input_file;
+      logical_input_line = physical_input_line;
+      fname = NULL;
+    }

 
   if (fname
       && (logical_input_file == NULL
 
   if (fname
       && (logical_input_file == NULL


@@ -458,19 +481,21 @@ new_logical_line (fname, line_number)
     }
   else
     return 0;
     }
   else
     return 0;

-}                              /* new_logical_line() */
+}
+
+int
+new_logical_line (char *fname, int line_number)
+{
+  return new_logical_line_flags (fname, line_number, 0);
+}
+

 \f
 \f

-/*
- *                     a s _ w h e r e ()
- *
- * Return the current file name and line number.
- * namep should be char * const *, but there are compilers which screw
- * up declarations like that, and it's easier to avoid it.
- */
+/* Return the current file name and line number.
+   namep should be char * const *, but there are compilers which screw
+   up declarations like that, and it's easier to avoid it.  */
+

 void
 void

-as_where (namep, linep)
-     char **namep;
-     unsigned int *linep;
+as_where (char **namep, unsigned int *linep)

 {
   if (logical_input_file != NULL
       && (linep == NULL || logical_input_line >= 0))
 {
   if (logical_input_file != NULL
       && (linep == NULL || logical_input_line >= 0))


@@ -491,50 +516,4 @@ as_where (namep, linep)
       if (linep != NULL)
        *linep = 0;
     }
       if (linep != NULL)
        *linep = 0;
     }

-}                              /* as_where() */
-\f
-
-/*
- *                     a s _ h o w m u c h ()
- *
- * Output to given stream how much of line we have scanned so far.
- * Assumes we have scanned up to and including input_line_pointer.
- * No free '\n' at end of line.
- */
-void
-as_howmuch (stream)
-     FILE *stream;             /* Opened for write please.  */
-{
-  register char *p;            /* Scan input line.  */
-  /* register char c; JF unused */
-
-  for (p = input_line_pointer - 1; *p != '\n'; --p)
-    {
-    }
-  ++p;                         /* p->1st char of line.  */
-  for (; p <= input_line_pointer; p++)
-    {
-      /* Assume ASCII. EBCDIC & other micro-computer char sets ignored.  */
-      as_1_char ((unsigned char) *p, stream);
-    }

 }
 }

-
-static void
-as_1_char (c, stream)
-     unsigned int c;
-     FILE *stream;
-{
-  if (c > 127)
-    {
-      (void) putc ('%', stream);
-      c -= 128;
-    }
-  if (c < 32)
-    {
-      (void) putc ('^', stream);
-      c += '@';
-    }
-  (void) putc (c, stream);
-}
-
-/* end of input_scrub.c */