Changeset 609 for branches/GNU/src/binutils/gas/app.c

Timestamp:

Aug 16, 2003, 6:59:22 PM (22 years ago)

Author:

bird

Message:

binutils v2.14 - offical sources.

File:

• branches/GNU/src/binutils/gas/app.c (modified) (44 diffs, 1 prop)

branches/GNU/src/binutils/gas/app.c

@@ -1 +1 @@
 /* This is the Assembler Pre-Processor
    Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-   1999, 2000
+   1999, 2000, 2002, 2003
    Free Software Foundation, Inc.
 
@@ -21 +21 @@
    02111-1307, USA.  */
 
-/* Modified by Allen Wirfs-Brock, Instantiations Inc 2/90 */
+/* Modified by Allen Wirfs-Brock, Instantiations Inc 2/90.  */
 /* App, the assembler pre-processor.  This pre-processor strips out excess
    spaces, turns single-quoted characters into a decimal constant, and turns
@@ -28 +28 @@
 
 #include <stdio.h>
-#include "as.h"                 /* For BAD_CASE() only */
+#include "as.h"                 /* For BAD_CASE() only.  */
 
 #if (__STDC__ != 1)
@@ -41 +41 @@
    pseudo-op at different times.  */
 static int scrub_m68k_mri;
-#else
-#define scrub_m68k_mri 0
-#endif
 
 /* The pseudo-op which switches in and out of MRI mode.  See the
    comment in do_scrub_chars.  */
 static const char mri_pseudo[] = ".mri 0";
+#else
+#define scrub_m68k_mri 0
+#endif
 
 #if defined TC_ARM && defined OBJ_ELF
@@ -79 +79 @@
 #define LEX_IS_DOUBLEBAR_1ST            13
 #endif
+#define LEX_IS_PARALLEL_SEPARATOR       14
 #define IS_SYMBOL_COMPONENT(c)          (lex[c] == LEX_IS_SYMBOL_COMPONENT)
 #define IS_WHITESPACE(c)                (lex[c] == LEX_IS_WHITESPACE)
 #define IS_LINE_SEPARATOR(c)            (lex[c] == LEX_IS_LINE_SEPARATOR)
+#define IS_PARALLEL_SEPARATOR(c)        (lex[c] == LEX_IS_PARALLEL_SEPARATOR)
 #define IS_COMMENT(c)                   (lex[c] == LEX_IS_COMMENT_START)
 #define IS_LINE_COMMENT(c)              (lex[c] == LEX_IS_LINE_COMMENT_START)
@@ -114 +116 @@
 
 #if ! defined (TC_HPPA) && ! defined (TC_I370)
-      /* I370 uses single-quotes to delimit integer, float constants */
+      /* I370 uses single-quotes to delimit integer, float constants.  */
       lex['\''] = LEX_IS_ONECHAR_QUOTE;
 #endif
@@ -129 +131 @@
      comment char, then it isn't a line separator.  */
   for (p = symbol_chars; *p; ++p)
-    {
-      lex[(unsigned char) *p] = LEX_IS_SYMBOL_COMPONENT;
-    }                           /* declare symbol characters */
+    lex[(unsigned char) *p] = LEX_IS_SYMBOL_COMPONENT;
 
   for (c = 128; c < 256; ++c)
@@ -151 +151 @@
 #endif
   for (p = tc_comment_chars; *p; p++)
-    {
-      lex[(unsigned char) *p] = LEX_IS_COMMENT_START;
-    }                           /* declare comment chars */
+    lex[(unsigned char) *p] = LEX_IS_COMMENT_START;
 
   for (p = line_comment_chars; *p; p++)
-    {
-      lex[(unsigned char) *p] = LEX_IS_LINE_COMMENT_START;
-    }                           /* declare line comment chars */
+    lex[(unsigned char) *p] = LEX_IS_LINE_COMMENT_START;
 
   for (p = line_separator_chars; *p; p++)
-    {
-      lex[(unsigned char) *p] = LEX_IS_LINE_SEPARATOR;
-    }                           /* declare line separators */
+    lex[(unsigned char) *p] = LEX_IS_LINE_SEPARATOR;
+
+#ifdef tc_parallel_separator_chars
+  /* This macro permits the processor to specify all characters which
+     separate parallel insns on the same line.  */
+  for (p = tc_parallel_separator_chars; *p; p++)
+    lex[(unsigned char) *p] = LEX_IS_PARALLEL_SEPARATOR;
+#endif
 
   /* Only allow slash-star comments if slash is not in use.
      FIXME: This isn't right.  We should always permit them.  */
   if (lex['/'] == 0)
-    {
-      lex['/'] = LEX_IS_TWOCHAR_COMMENT_1ST;
-    }
+    lex['/'] = LEX_IS_TWOCHAR_COMMENT_1ST;
 
 #ifdef TC_M68K
@@ -179 +178 @@
       lex['*'] = LEX_IS_LINE_COMMENT_START;
       /* The MRI documentation says '!' is LEX_IS_COMMENT_START, but
-         then it can't be used in an expression.  */
+         then it can't be used in an expression.  */
       lex['!'] = LEX_IS_LINE_COMMENT_START;
     }
@@ -191 +190 @@
 #endif
 #ifdef TC_D30V
-  /* must do this is we want VLIW instruction with "->" or "<-" */
+  /* Must do this is we want VLIW instruction with "->" or "<-".  */
   lex['-'] = LEX_IS_SYMBOL_COMPONENT;
 #endif
-}                               /* do_scrub_begin() */
-
-/* Saved state of the scrubber */
+}
+
+/* Saved state of the scrubber.  */
 static int state;
 static int old_state;
@@ -213 +212 @@
    That's why we have to save it all.  */
 
-struct app_save {
+struct app_save
+{
   int          state;
   int          old_state;
@@ -299 +299 @@
 
   free (arg);
-}                               /* app_pop() */
+}
 
 /* @@ This assumes that \n &c are the same on host and target.  This is not
    necessarily true.  */
+
 static int
 process_escape (ch)
@@ -367 +368 @@
          -2: flush text until a '*' '/' is seen, then go to state old_state
 #ifdef TC_V850
-         12: After seeing a dash, looking for a second dash as a start of comment.
+         12: After seeing a dash, looking for a second dash as a start
+             of comment.
 #endif
 #ifdef DOUBLEBAR_PARALLEL
-         13: After seeing a vertical bar, looking for a second vertical bar as a parallel expression seperator.
+         13: After seeing a vertical bar, looking for a second
+             vertical bar as a parallel expression separator.
 #endif
           */
@@ -377 +380 @@
      constructs like ``.loc 1 20''.  This was turning into ``.loc
      120''.  States 9 and 10 ensure that a space is never dropped in
-     between characters which could appear in a identifier.  Ian
+     between characters which could appear in an identifier.  Ian
      Taylor, ian@cygnus.com.
 
@@ -414 +417 @@
      memory usage.  */
 
-#define PUT(pch)                        \
-  do                                    \
-    {                                   \
-      *to++ = (pch);                    \
-      if (to >= toend)                  \
-        goto tofull;                    \
-    }                                   \
+#define PUT(pch)                                \
+  do                                            \
+    {                                           \
+      *to++ = (pch);                            \
+      if (to >= toend)                          \
+        goto tofull;                            \
+    }                                           \
   while (0)
 
@@ -440 +443 @@
     {
       /* The cases in this switch end with continue, in order to
-         branch back to the top of this while loop and generate the
-         next output character in the appropriate state.  */
+         branch back to the top of this while loop and generate the
+         next output character in the appropriate state.  */
       switch (state)
         {
@@ -524 +527 @@
         case 5:
           /* We are going to copy everything up to a quote character,
-             with special handling for a backslash.  We try to
-             optimize the copying in the simple case without using the
-             GET and PUT macros.  */
+             with special handling for a backslash.  We try to
+             optimize the copying in the simple case without using the
+             GET and PUT macros.  */
           {
             char *s;
@@ -535 +538 @@
                 ch = *s;
                 /* This condition must be changed if the type of any
-                   other character can be LEX_IS_STRINGQUOTE.  */
+                   other character can be LEX_IS_STRINGQUOTE.  */
                 if (ch == '\\'
                     || ch == '"'
@@ -556 +559 @@
           if (ch == EOF)
             {
-              as_warn (_("end of file in string: inserted '\"'"));
+              as_warn (_("end of file in string; inserted '\"'"));
               state = old_state;
               UNGET ('\n');
@@ -576 +579 @@
             {
               /* Just quietly terminate the string.  This permits lines like
-                   bne  label   loop if we haven't reach end yet
-                 */
+                   bne  label   loop if we haven't reach end yet.  */
               state = old_state;
               UNGET (ch);
@@ -599 +601 @@
               add_newlines++;
               PUT ('\\');
+              continue;
+
+            case EOF:
+              as_warn (_("end of file in string; '\"' inserted"));
+              PUT ('"');
               continue;
 
@@ -620 +627 @@
             case '7':
               break;
-#if defined(IGNORE_NONSTANDARD_ESCAPES) | defined(ONLY_STANDARD_ESCAPES)
+
             default:
-              as_warn (_("Unknown escape '\\%c' in string: Ignored"), ch);
+#ifdef ONLY_STANDARD_ESCAPES
+              as_warn (_("unknown escape '\\%c' in string; ignored"), ch);
+#endif
               break;
-#else  /* ONLY_STANDARD_ESCAPES */
-            default:
-              /* Accept \x as x for any x */
-              break;
-#endif /* ONLY_STANDARD_ESCAPES */
-
-            case EOF:
-              as_warn (_("End of file in string: '\"' inserted"));
-              PUT ('"');
-              continue;
             }
           PUT (ch);
@@ -656 +655 @@
           PUT (ch);
           continue;
+
+#ifdef DOUBLEBAR_PARALLEL
+        case 13:
+          ch = GET ();
+          if (ch != '|')
+            abort ();
+
+          /* Reset back to state 1 and pretend that we are parsing a
+             line from just after the first white space.  */
+          state = 1;
+          PUT ('|');
+          continue;
+#endif
         }
 
-      /* OK, we are somewhere in states 0 through 4 or 9 through 11 */
+      /* OK, we are somewhere in states 0 through 4 or 9 through 11.  */
 
       /* flushchar: */
@@ -696 +708 @@
 #ifdef TC_M68K
       /* We want to have pseudo-ops which control whether we are in
-         MRI mode or not.  Unfortunately, since m68k MRI mode affects
-         the scrubber, that means that we need a special purpose
-         recognizer here.  */
+         MRI mode or not.  Unfortunately, since m68k MRI mode affects
+         the scrubber, that means that we need a special purpose
+         recognizer here.  */
       if (mri_state == NULL)
         {
@@ -735 +747 @@
             {
               /* We've read the entire pseudo-op.  mips_last_ch is
-                 either '0' or '1' indicating whether to enter or
-                 leave MRI mode.  */
+                 either '0' or '1' indicating whether to enter or
+                 leave MRI mode.  */
               do_scrub_begin (mri_last_ch == '1');
               mri_state = NULL;
 
               /* We continue handling the character as usual.  The
-                 main gas reader must also handle the .mri pseudo-op
-                 to control expression parsing and the like.  */
+                 main gas reader must also handle the .mri pseudo-op
+                 to control expression parsing and the like.  */
             }
         }
@@ -783 +795 @@
             {
               /* Only keep this white if there's no white *after* the
-                 colon.  */
+                 colon.  */
               ch2 = GET ();
               UNGET (ch2);
@@ -797 +809 @@
           if (IS_COMMENT (ch)
               || ch == '/'
-              || IS_LINE_SEPARATOR (ch))
+              || IS_LINE_SEPARATOR (ch)
+              || IS_PARALLEL_SEPARATOR (ch))
             {
               if (scrub_m68k_mri)
@@ -870 +883 @@
                 {
                   /* We know that ch is not ':', since we tested that
-                     case above.  Therefore this is not a label, so it
-                     must be the opcode, and we've just seen the
-                     whitespace after it.  */
+                     case above.  Therefore this is not a label, so it
+                     must be the opcode, and we've just seen the
+                     whitespace after it.  */
                   state = 3;
                 }
@@ -904 +917 @@
 
                   /* This UNGET will ensure that we count newlines
-                     correctly.  */
+                     correctly.  */
                   UNGET (ch2);
                 }
@@ -942 +955 @@
           if (state == 10)
             {
-              /* Preserve the whitespace in foo "bar" */
+              /* Preserve the whitespace in foo "bar".  */
               UNGET (ch);
               state = 3;
@@ -948 +961 @@
 
               /* PUT didn't jump out.  We could just break, but we
-                 know what will happen, so optimize a bit.  */
+                 know what will happen, so optimize a bit.  */
               ch = GET ();
               old_state = 3;
@@ -964 +977 @@
           if (state == 10)
             {
-              /* Preserve the whitespace in foo 'b' */
+              /* Preserve the whitespace in foo 'b'.  */
               UNGET (ch);
               state = 3;
@@ -993 +1006 @@
             {
 #ifdef REQUIRE_CHAR_CLOSE_QUOTE
-              as_warn (_("Missing close quote: (assumed)"));
+              as_warn (_("missing close quote; (assumed)"));
 #else
               if (ch != EOF)
@@ -1040 +1053 @@
           break;
 
+        case LEX_IS_PARALLEL_SEPARATOR:
+          state = 1;
+          PUT (ch);
+          break;
+
 #ifdef TC_V850
         case LEX_IS_DOUBLEDASH_1ST:
@@ -1054 +1072 @@
             }
           while (ch != EOF && ch != '\n');
+
           if (ch == EOF)
-            {
-              as_warn (_("end of file in comment; newline inserted"));
-            }
+            as_warn (_("end of file in comment; newline inserted"));
+
           state = 0;
           PUT ('\n');
@@ -1065 +1083 @@
         case LEX_IS_DOUBLEBAR_1ST:
           ch2 = GET ();
+          UNGET (ch2);
           if (ch2 != '|')
-            {
-              UNGET (ch2);
-              goto de_fault;
-            }
-          /* Reset back to state 1 and pretend that we are parsing a line from
-             just after the first white space.  */
-          state = 1;
-          PUT ('|');
+            goto de_fault;
+
+          /* Handle '||' in two states as invoking PUT twice might
+             result in the first one jumping out of this loop.  We'd
+             then lose track of the state and one '|' char.  */
+          state = 13;
           PUT ('|');
           break;
@@ -1095 +1112 @@
                   UNGET (ch2);
                 }
-            } /* bad hack */
+            }
 
           if (state == 0 || state == 1) /* Only comment at start of line.  */
@@ -1108 +1125 @@
                 }
               while (ch != EOF && IS_WHITESPACE (ch));
+
               if (ch == EOF)
                 {
@@ -1114 +1132 @@
                   break;
                 }
+
               if (ch < '0' || ch > '9' || state != 0 || startch != '#')
                 {
@@ -1120 +1139 @@
                     ch = GET ();
                   if (ch == EOF)
-                    as_warn (_("EOF in Comment: Newline inserted"));
+                    as_warn (_("end of file in comment; newline inserted"));
                   state = 0;
                   PUT ('\n');
@@ -1206 +1225 @@
 
           /* This is a common case.  Quickly copy CH and all the
-             following symbol component or normal characters.  */
+             following symbol component or normal characters.  */
           if (to + 1 < toend
               && mri_state == NULL
@@ -1227 +1246 @@
                     break;
                 }
+
               if (s > from)
-                {
-                  /* Handle the last character normally, for
-                     simplicity.  */
-                  --s;
-                }
+                /* Handle the last character normally, for
+                   simplicity.  */
+                --s;
+
               len = s - from;
+
               if (len > (toend - to) - 1)
                 len = (toend - to) - 1;
+
               if (len > 0)
                 {
@@ -1269 +1290 @@
           if (state == 0)
             {
-              state = 11;       /* Now seeing label definition */
+              state = 11;       /* Now seeing label definition.  */
             }
           else if (state == 1)
             {
-              state = 2;        /* Ditto */
+              state = 2;        /* Ditto.  */
             }
           else if (state == 9)
@@ -1326 +1347 @@
 }
 
-/* end of app.c */