Changeset 609 for branches/GNU/src/binutils/gas/read.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/read.c (modified) (93 diffs, 1 prop)

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

@@ -1 +1 @@
 /* read.c - read a source file -
    Copyright 1986, 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
-   1998, 1999, 2000 Free Software Foundation, Inc.
+   1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
 This file is part of GAS, the GNU Assembler.
@@ -36 +36 @@
    Another group of these functions is in the expr.c module.  */
 
-/* For isdigit ().  */
-#include <ctype.h>
-
 #include "as.h"
+#include "safe-ctype.h"
 #include "subsegs.h"
 #include "sb.h"
@@ -48 +46 @@
 
 #ifndef TC_START_LABEL
-#define TC_START_LABEL(x,y) (x==':')
+#define TC_START_LABEL(x,y) (x == ':')
 #endif
 
@@ -170 +168 @@
    internals manual.  */
 int target_big_endian = TARGET_BYTES_BIG_ENDIAN;
-
-static char *old_buffer;        /* JF a hack.  */
-static char *old_input;
-static char *old_limit;
 
 /* Variables for handling include file directory table.  */
@@ -320 +314 @@
   {"endfunc", s_func, 1},
   {"endif", s_endif, 0},
+  {"endr", s_bad_endr, 0},
 /* endef  */
   {"equ", s_set, 0},
@@ -352 +347 @@
   {"ifnes", s_ifeqs, 1},
   {"ifnotdef", s_ifdef, 1},
+  {"incbin", s_incbin, 0},
   {"include", s_include, 0},
   {"int", cons, 4},
@@ -537 +533 @@
     {                           /* We have another line to parse.  */
       know (buffer_limit[-1] == '\n');  /* Must have a sentinel.  */
-    contin:                     /* JF this goto is my fault I admit it.
-                                   Someone brave please re-write the whole
-                                   input section here?  Pleeze???  */
+
       while (input_line_pointer < buffer_limit)
         {
@@ -742 +736 @@
                     while (*s2)
                       {
-                        if (isupper ((unsigned char) *s2))
-                          *s2 = tolower (*s2);
+                        *s2 = TOLOWER (*s2);
                         s2++;
                       }
@@ -803 +796 @@
                       if (pop == NULL)
                         {
-                          as_bad (_("Unknown pseudo-op:  `%s'"), s);
+                          as_bad (_("unknown pseudo-op: `%s'"), s);
                           *input_line_pointer = c;
                           s_ignore (0);
@@ -867 +860 @@
                           macro_entry *macro;
 
-                          if (check_macro (s, &out, '\0', &err, &macro))
+                          if (check_macro (s, &out, &err, &macro))
                             {
                               if (err != NULL)
@@ -910 +903 @@
             continue;
 
-          if ((LOCAL_LABELS_DOLLAR || LOCAL_LABELS_FB)
-              && isdigit ((unsigned char) c))
+          if ((LOCAL_LABELS_DOLLAR || LOCAL_LABELS_FB) && ISDIGIT (c))
             {
               /* local label  ("4:")  */
@@ -921 +913 @@
 
               /* Read the whole number.  */
-              while (isdigit ((unsigned char) *input_line_pointer))
+              while (ISDIGIT (*input_line_pointer))
                 {
                   temp = (temp * 10) + *input_line_pointer - '0';
@@ -956 +948 @@
           if (c && strchr (line_comment_chars, c))
             {                   /* Its a comment.  Better say APP or NO_APP.  */
+              sb sbuf;
               char *ends;
               char *new_buf;
@@ -968 +961 @@
               s += 4;
 
+              sb_new (&sbuf);
               ends = strstr (s, "#NO_APP\n");
 
@@ -1029 +1023 @@
                   if (size < space)
                     {
-                      new_tmp += size;
+                      new_tmp[size] = 0;
                       break;
                     }
@@ -1040 +1034 @@
               if (tmp_buf)
                 free (tmp_buf);
-              old_buffer = buffer;
-              old_input = input_line_pointer;
-              old_limit = buffer_limit;
-              buffer = new_buf;
-              input_line_pointer = new_buf;
-              buffer_limit = new_tmp;
-
+
+              /* We've "scrubbed" input to the preferred format.  In the
+                 process we may have consumed the whole of the remaining
+                 file (and included files).  We handle this formatted
+                 input similar to that of macro expansion, letting
+                 actual macro expansion (possibly nested) and other
+                 input expansion work.  Beware that in messages, line
+                 numbers and possibly file names will be incorrect.  */
+              sb_add_string (&sbuf, new_buf);
+              input_scrub_include_sb (&sbuf, input_line_pointer, 0);
+              sb_kill (&sbuf);
+              buffer_limit = input_scrub_next_buffer (&input_line_pointer);
+              free (new_buf);
               continue;
             }
@@ -1056 +1056 @@
             continue;
 #endif
-          /* as_warn (_("Junk character %d."),c); Now done by ignore_rest.  */
-          input_line_pointer--; /* Report unknown char as ignored.  */
+          input_line_pointer--;
+          /* Report unknown char as ignored.  */
           ignore_rest_of_line ();
         }
@@ -1064 +1064 @@
       md_after_pass_hook ();
 #endif
-
-      if (old_buffer)
-        {
-          free (buffer);
-          bump_line_counters ();
-          if (old_input != 0)
-            {
-              buffer = old_buffer;
-              input_line_pointer = old_input;
-              buffer_limit = old_limit;
-              old_buffer = 0;
-              goto contin;
-            }
-        }
     }
 
@@ -1169 +1155 @@
      int max;
 {
+  if (now_seg == absolute_section)
+    {
+      if (fill != NULL)
+        while (len-- > 0)
+          if (*fill++ != '\0')
+            {
+              as_warn (_("ignoring fill value in absolute section"));
+              break;
+            }
+      fill = NULL;
+      len = 0;
+    }
+
 #ifdef md_do_align
   md_do_align (n, fill, len, max, just_record_alignment);
@@ -1190 +1189 @@
 
 #ifdef md_do_align
- just_record_alignment:
+ just_record_alignment: ATTRIBUTE_UNUSED_LABEL
 #endif
 
@@ -1239 +1238 @@
             ;
           if (align != 1)
-            as_bad (_("Alignment not a power of 2"));
+            as_bad (_("alignment not a power of 2"));
 
           align = i;
@@ -1248 +1247 @@
     {
       align = 15;
-      as_bad (_("Alignment too large: %u assumed"), align);
+      as_warn (_("alignment too large: %u assumed"), align);
     }
 
@@ -1355 +1354 @@
   p = input_line_pointer;
   *p = c;
+
+  if (name == p)
+    {
+      as_bad (_("expected symbol name"));
+      discard_rest_of_line ();
+      return;
+    }
+
   SKIP_WHITESPACE ();
 
   if (*input_line_pointer != ',')
     {
-      as_bad (_("Expected comma after symbol-name: rest of line ignored."));
+      *p = 0;
+      as_bad (_("expected comma after \"%s\""), name);
+      *p = c;
       ignore_rest_of_line ();
       if (flag_mri)
@@ -1370 +1379 @@
   if ((temp = get_absolute_expression ()) < 0)
     {
-      as_warn (_(".COMMon length (%ld.) <0! Ignored."), (long) temp);
+      as_warn (_(".COMMon length (%ld) < 0 ignored"), (long) temp);
       ignore_rest_of_line ();
       if (flag_mri)
@@ -1383 +1392 @@
   if (S_IS_DEFINED (symbolP) && !S_IS_COMMON (symbolP))
     {
-      as_bad (_("Ignoring attempt to re-define symbol `%s'."),
+      as_bad (_("symbol `%s' is already defined"),
               S_GET_NAME (symbolP));
       ignore_rest_of_line ();
@@ -1394 +1403 @@
     {
       if (S_GET_VALUE (symbolP) != (valueT) temp)
-        as_bad (_("Length of .comm \"%s\" is already %ld. Not changed to %ld."),
+        as_bad (_("length of .comm \"%s\" is already %ld; not changing to %ld"),
                 S_GET_NAME (symbolP),
                 (long) S_GET_VALUE (symbolP),
@@ -1446 +1455 @@
 
   name = input_line_pointer;
-  if (!isdigit ((unsigned char) *name))
+  if (!ISDIGIT (*name))
     c = get_symbol_end ();
   else
@@ -1454 +1463 @@
           ++input_line_pointer;
         }
-      while (isdigit ((unsigned char) *input_line_pointer));
+      while (ISDIGIT (*input_line_pointer));
 
       c = *input_line_pointer;
@@ -1484 +1493 @@
   if (S_IS_DEFINED (sym) && !S_IS_COMMON (sym))
     {
-      as_bad (_("attempt to re-define symbol `%s'"), S_GET_NAME (sym));
+      as_bad (_("symbol `%s' is already defined"), S_GET_NAME (sym));
       ignore_rest_of_line ();
       mri_comment_end (stop, stopc);
@@ -1555 +1564 @@
 
 void
+s_app_file_string (file)
+     char *file;
+{
+#ifdef LISTING
+  if (listing)
+    listing_source_file (file);
+#endif
+  register_dependency (file);
+#ifdef obj_app_file
+  obj_app_file (file);
+#endif
+}
+
+void
 s_app_file (appfile)
      int appfile;
@@ -1579 +1602 @@
       demand_empty_rest_of_line ();
       if (!may_omit)
-        {
-#ifdef LISTING
-          if (listing)
-            listing_source_file (s);
-#endif
-          register_dependency (s);
-#ifdef obj_app_file
-          obj_app_file (s);
-#endif
-        }
+        s_app_file_string (s);
     }
 }
@@ -1608 +1622 @@
     /* Some of the back ends can't deal with non-positive line numbers.
        Besides, it's silly.  */
-    as_warn (_("Line numbers must be positive; line number %d rejected."),
+    as_warn (_("line numbers must be positive; line number %d rejected"),
              l + 1);
   else
@@ -1704 +1718 @@
   if (size > BSD_FILL_SIZE_CROCK_8)
     {
-      as_warn (_(".fill size clamped to %d."), BSD_FILL_SIZE_CROCK_8);
+      as_warn (_(".fill size clamped to %d"), BSD_FILL_SIZE_CROCK_8);
       size = BSD_FILL_SIZE_CROCK_8;
     }
   if (size < 0)
     {
-      as_warn (_("Size negative: .fill ignored."));
+      as_warn (_("size negative; .fill ignored"));
       size = 0;
     }
@@ -1715 +1729 @@
     {
       if (rep_exp.X_add_number < 0)
-        as_warn (_("Repeat < 0, .fill ignored"));
+        as_warn (_("repeat < 0; .fill ignored"));
       size = 0;
     }
@@ -1757 +1771 @@
 
       /* The magic number BSD_FILL_SIZE_CROCK_4 is from BSD 4.2 VAX
-         flavoured AS.  The following bizzare behaviour is to be
+         flavoured AS.  The following bizarre behaviour is to be
          compatible with above.  I guess they tried to take up to 8
          bytes from a 4-byte expression and they forgot to sign
-         extend. Un*x Sux.  */
+         extend.  */
 #define BSD_FILL_SIZE_CROCK_4 (4)
       md_number_to_chars (p, (valueT) fill,
@@ -1801 +1815 @@
           input_line_pointer++;
           SKIP_WHITESPACE ();
-          if (*input_line_pointer == '\n')
+          if (is_end_of_line[(unsigned char) *input_line_pointer])
             c = '\n';
         }
@@ -1833 +1847 @@
   sb_new (&out);
 
-  err = expand_irp (irpc, 0, &s, &out, get_line_sb, '\0');
+  err = expand_irp (irpc, 0, &s, &out, get_line_sb);
   if (err != NULL)
     as_bad_where (file, line, "%s", err);
@@ -1945 +1959 @@
   p = input_line_pointer;
   *p = c;
+
+  if (name == p)
+    {
+      as_bad (_("expected symbol name"));
+      discard_rest_of_line ();
+      return;
+    }
+
   SKIP_WHITESPACE ();
 
@@ -1955 +1977 @@
     }
 
-  if (*input_line_pointer == '\n')
-    {
-      as_bad (_("Missing size expression"));
+  if (is_end_of_line[(unsigned char) *input_line_pointer])
+    {
+      as_bad (_("missing size expression"));
       return;
     }
@@ -1963 +1985 @@
   if ((temp = get_absolute_expression ()) < 0)
     {
-      as_warn (_("BSS length (%d.) <0! Ignored."), temp);
+      as_warn (_("BSS length (%d) < 0 ignored"), temp);
       ignore_rest_of_line ();
       return;
@@ -1973 +1995 @@
     {
       /* For MIPS and Alpha ECOFF or ELF, small objects are put in .sbss.  */
-      if (temp <= bfd_get_gp_size (stdoutput))
+      if ((unsigned) temp <= bfd_get_gp_size (stdoutput))
         {
           bss_seg = subseg_new (".sbss", 1);
@@ -2002 +2024 @@
       if (*input_line_pointer != ',')
         {
-          as_bad (_("Expected comma after size"));
+          as_bad (_("expected comma after size"));
           ignore_rest_of_line ();
           return;
@@ -2010 +2032 @@
       SKIP_WHITESPACE ();
 
-      if (*input_line_pointer == '\n')
-        {
-          as_bad (_("Missing alignment"));
+      if (is_end_of_line[(unsigned char) *input_line_pointer])
+        {
+          as_bad (_("missing alignment"));
           return;
         }
@@ -2028 +2050 @@
                 ;
               if (align != 1)
-                as_bad (_("Alignment not a power of 2"));
+                as_bad (_("alignment not a power of 2"));
               align = i;
             }
@@ -2036 +2058 @@
         {
           align = max_alignment;
-          as_warn (_("Alignment too large: %d. assumed."), align);
+          as_warn (_("alignment too large; %d assumed"), align);
         }
       else if (align < 0)
         {
           align = 0;
-          as_warn (_("Alignment negative. 0 assumed."));
+          as_warn (_("alignment negative; 0 assumed"));
         }
 
@@ -2109 +2131 @@
     }
   else
-    as_bad (_("Ignoring attempt to re-define symbol `%s'."),
-            S_GET_NAME (symbolP));
+    as_bad (_("symbol `%s' is already defined"), S_GET_NAME (symbolP));
 
   subseg_set (current_seg, current_subseg);
@@ -2146 +2167 @@
   p = input_line_pointer;
   *p = c;
+
+  if (name == p)
+    {
+      as_bad (_("expected symbol name"));
+      discard_rest_of_line ();
+      return;
+    }
+
   SKIP_WHITESPACE ();
 
@@ -2151 +2180 @@
     {
       *p = 0;
-      as_bad (_("Expected comma after name \"%s\""), name);
+      as_bad (_("expected comma after \"%s\""), name);
       *p = c;
       ignore_rest_of_line ();
@@ -2191 +2220 @@
   else
     {
-      as_bad (_("Symbol %s already defined"), name);
+      as_bad (_("symbol `%s' is already defined"), name);
     }
 
@@ -2198 +2227 @@
 }
 
-/* Read a line into an sb.  */
+/* Read a line into an sb.  Returns the character that ended the line
+   or zero if there are no more lines.  */
 
 static int
@@ -2205 +2235 @@
 {
   char quote1, quote2, inquote;
+  unsigned char c;
 
   if (input_line_pointer[-1] == '\n')
@@ -2232 +2263 @@
   inquote = '\0';
 
-  while (!is_end_of_line[(unsigned char) *input_line_pointer]
-         || (inquote != '\0' && *input_line_pointer != '\n'))
-    {
-      if (inquote == *input_line_pointer)
+  while ((c = * input_line_pointer ++) != 0
+         && (!is_end_of_line[c]
+             || (inquote != '\0' && c != '\n')))
+    {
+      if (inquote == c)
         inquote = '\0';
       else if (inquote == '\0')
         {
-          if (*input_line_pointer == quote1)
+          if (c == quote1)
             inquote = quote1;
-          else if (*input_line_pointer == quote2)
+          else if (c == quote2)
             inquote = quote2;
         }
 
-      sb_add_char (line, *input_line_pointer++);
-    }
-
-  while (input_line_pointer < buffer_limit
-         && is_end_of_line[(unsigned char) *input_line_pointer])
-    {
-      if (input_line_pointer[-1] == '\n')
-        bump_line_counters ();
-      ++input_line_pointer;
-    }
-
-  return 1;
-}
-
-/* Define a macro.  This is an interface to macro.c, which is shared
-   between gas and gasp.  */
+      sb_add_char (line, c);
+    }
+
+  /* Don't skip multiple end-of-line characters, because that breaks support
+     for the IA-64 stop bit (;;) which looks like two consecutive end-of-line
+     characters but isn't.  Instead just skip one end of line character and
+     return the character skipped so that the caller can re-insert it if
+     necessary.   */
+  return c;
+}
+
+/* Define a macro.  This is an interface to macro.c.  */
 
 void
@@ -2366 +2394 @@
 {
   if (segment != now_seg && segment != absolute_section)
-    as_bad (_("invalid segment \"%s\"; segment \"%s\" assumed"),
-            segment_name (segment), segment_name (now_seg));
+    as_bad (_("invalid segment \"%s\""), segment_name (segment));
 
   if (now_seg == absolute_section)
@@ -2467 +2494 @@
 
   name = input_line_pointer;
-  if (!isdigit ((unsigned char) *name))
+  if (!ISDIGIT (*name))
     c = get_symbol_end ();
   else
@@ -2475 +2502 @@
           ++input_line_pointer;
         }
-      while (isdigit ((unsigned char) *input_line_pointer));
+      while (ISDIGIT (*input_line_pointer));
 
       c = *input_line_pointer;
@@ -2500 +2527 @@
     {
       c = *++input_line_pointer;
-      c = toupper ((unsigned char) c);
+      c = TOUPPER (c);
       if (c == 'C' || c == 'D' || c == 'M' || c == 'R')
         *type = c;
@@ -2664 +2691 @@
 
 void
+s_bad_endr (ignore)
+     int ignore ATTRIBUTE_UNUSED;
+{
+  as_warn (_(".endr encountered without preceeding .rept, .irc, or .irp"));
+  demand_empty_rest_of_line ();
+}
+
+/* Handle the .rept pseudo-op.  */
+
+void
 s_rept (ignore)
      int ignore ATTRIBUTE_UNUSED;
@@ -2741 +2778 @@
   end_name = input_line_pointer;
   *end_name = delim;
+
+  if (name == end_name)
+    {
+      as_bad (_("expected symbol name"));
+      discard_rest_of_line ();
+      return;
+    }
+
   SKIP_WHITESPACE ();
 
@@ -2746 +2791 @@
     {
       *end_name = 0;
-      as_bad (_("Expected comma after name \"%s\""), name);
+      as_bad (_("expected comma after \"%s\""), name);
       *end_name = delim;
       ignore_rest_of_line ();
@@ -2804 +2849 @@
       && S_IS_DEFINED (symbolP)
       && S_GET_SEGMENT (symbolP) != reg_section)
-    as_bad (_("symbol `%s' already defined"), S_GET_NAME (symbolP));
+    as_bad (_("symbol `%s' is already defined"), S_GET_NAME (symbolP));
 
   pseudo_set (symbolP);
@@ -2890 +2935 @@
     {
       if (exp.X_op != O_constant)
-        as_bad (_("Unsupported variable size or fill value"));
+        as_bad (_("unsupported variable size or fill value"));
       else
         {
@@ -3015 +3060 @@
    * letter is legal.  */
   if (input_line_pointer[0] == '0'
-      && isalpha ((unsigned char) input_line_pointer[1]))
+      && ISALPHA (input_line_pointer[1]))
     input_line_pointer += 2;
 
@@ -3040 +3085 @@
       if (err)
         {
-          as_bad (_("Bad floating literal: %s"), err);
+          as_bad (_("bad floating literal: %s"), err);
           ignore_rest_of_line ();
           if (flag_mri)
@@ -3113 +3158 @@
   if (!is_end_of_line[(unsigned char) *input_line_pointer])
     {
-      if (isprint ((unsigned char) *input_line_pointer))
-        as_bad (_("Rest of line ignored. First ignored character is `%c'."),
-                *input_line_pointer);
+      if (ISPRINT (*input_line_pointer))
+        as_warn (_("rest of line ignored; first ignored character is `%c'"),
+                 *input_line_pointer);
       else
-        as_bad (_("Rest of line ignored. First ignored character valued 0x%x."),
-                *input_line_pointer);
+        as_warn (_("rest of line ignored; first ignored character valued 0x%x"),
+                 *input_line_pointer);
 
       while (input_line_pointer < buffer_limit
@@ -3168 +3213 @@
 
   if (exp.X_op == O_illegal)
-    as_bad (_("illegal expression; zero assumed"));
+    as_bad (_("illegal expression"));
   else if (exp.X_op == O_absent)
-    as_bad (_("missing expression; zero assumed"));
+    as_bad (_("missing expression"));
   else if (exp.X_op == O_big)
     {
       if (exp.X_add_number > 0)
-        as_bad (_("bignum invalid; zero assumed"));
+        as_bad (_("bignum invalid"));
       else
-        as_bad (_("floating point number invalid; zero assumed"));
+        as_bad (_("floating point number invalid"));
     }
   else if (exp.X_op == O_subtract
-           && (S_GET_SEGMENT (exp.X_add_symbol)
-               == S_GET_SEGMENT (exp.X_op_symbol))
            && SEG_NORMAL (S_GET_SEGMENT (exp.X_add_symbol))
            && (symbol_get_frag (exp.X_add_symbol)
@@ -3221 +3264 @@
         symbol_set_value_expression (symbolP, &exp);
       else if (symbol_section_p (symbolP))
-        as_bad ("invalid attempt to set value of section symbol");
+        as_bad ("attempt to set value of section symbol");
       else
         {
@@ -3510 +3553 @@
   else if (op == O_big && exp->X_add_number <= 0)
     {
-      as_bad (_("floating point number invalid; zero assumed"));
+      as_bad (_("floating point number invalid"));
       exp->X_add_number = 0;
       op = O_constant;
@@ -3541 +3584 @@
       x->addnum = exp->X_add_number;
       x->added = 0;
+      x->use_jump = 0;
       new_broken_words++;
       return;
@@ -3606 +3650 @@
               || (get & hibit) == 0))
         {               /* Leading bits contain both 0s & 1s.  */
-          as_warn (_("Value 0x%lx truncated to 0x%lx."),
+          as_warn (_("value 0x%lx truncated to 0x%lx"),
                    (unsigned long) get, (unsigned long) use);
         }
@@ -3622 +3666 @@
       if (nbytes < size)
         {
-          as_warn (_("Bignum truncated to %d bytes"), nbytes);
+          as_warn (_("bignum truncated to %d bytes"), nbytes);
           size = nbytes;
         }
@@ -3636 +3680 @@
 
           nums = generic_bignum + size / CHARS_PER_LITTLENUM;
-          while (size > 0)
+          while (size >= CHARS_PER_LITTLENUM)
             {
               --nums;
@@ -3647 +3691 @@
         {
           nums = generic_bignum;
-          while (size > 0)
+          while (size >= CHARS_PER_LITTLENUM)
             {
               md_number_to_chars (p, (valueT) *nums, CHARS_PER_LITTLENUM);
@@ -3656 +3700 @@
             }
 
-          while (nbytes > 0)
+          while (nbytes >= CHARS_PER_LITTLENUM)
             {
               md_number_to_chars (p, extra_digit, CHARS_PER_LITTLENUM);
@@ -3956 +4000 @@
       || count.X_add_number <= 0)
     {
-      as_warn (_("Unresolvable or nonpositive repeat count; using 1"));
+      as_warn (_("unresolvable or nonpositive repeat count; using 1"));
       return;
     }
@@ -4008 +4052 @@
 
     default:
-      as_bad (_("Unknown floating type type '%c'"), float_type);
+      as_bad (_("unknown floating type type '%c'"), float_type);
       return -1;
     }
@@ -4030 +4074 @@
       if (i >= length)
         {
-          as_warn (_("Floating point constant too large"));
+          as_warn (_("floating point constant too large"));
           return -1;
         }
@@ -4107 +4151 @@
          diagnostics if your input is ill-conditioned.  */
       if (input_line_pointer[0] == '0'
-          && isalpha ((unsigned char) input_line_pointer[1]))
+          && ISALPHA (input_line_pointer[1]))
         input_line_pointer += 2;
 
@@ -4129 +4173 @@
           if (err)
             {
-              as_bad (_("Bad floating literal: %s"), err);
+              as_bad (_("bad floating literal: %s"), err);
               ignore_rest_of_line ();
               return;
@@ -4414 +4458 @@
   else if (op == O_big && exp->X_add_number <= 0)
     {
-      as_bad (_("floating point number invalid; zero assumed"));
+      as_bad (_("floating point number invalid"));
       exp->X_add_number = 0;
       op = O_constant;
@@ -4518 +4562 @@
       c = ',';                  /* Do loop.  */
     }
+  /* If we have been switched into the abs_section then we
+     will not have an obstack onto which we can hang strings.  */
+  if (now_seg == absolute_section)
+    {
+      as_bad (_("strings must be placed into a section"));
+      c = 0;
+      ignore_rest_of_line ();
+    }
+  
   while (c == ',' || c == '<' || c == '"')
     {
@@ -4563 +4616 @@
           if (*input_line_pointer != '>')
             {
-              as_bad (_("Expected <nn>"));
+              as_bad (_("expected <nn>"));
             }
           input_line_pointer++;
@@ -4597 +4650 @@
 
     case '\n':
-      as_warn (_("Unterminated string: Newline inserted."));
+      as_warn (_("unterminated string; newline inserted"));
       bump_line_counters ();
       break;
@@ -4648 +4701 @@
 
             for (i = 0, number = 0;
-                 isdigit (c) && i < 3;
+                 ISDIGIT (c) && i < 3;
                  c = *input_line_pointer++, i++)
               {
@@ -4666 +4719 @@
             number = 0;
             c = *input_line_pointer++;
-            while (isxdigit (c))
+            while (ISXDIGIT (c))
               {
-                if (isdigit (c))
+                if (ISDIGIT (c))
                   number = number * 16 + c - '0';
-                else if (isupper (c))
+                else if (ISUPPER (c))
                   number = number * 16 + c - 'A' + 10;
                 else
@@ -4683 +4736 @@
         case '\n':
           /* To be compatible with BSD 4.2 as: give the luser a linefeed!!  */
-          as_warn (_("Unterminated string: Newline inserted."));
+          as_warn (_("unterminated string; newline inserted"));
           c = '\n';
           bump_line_counters ();
@@ -4691 +4744 @@
 
 #ifdef ONLY_STANDARD_ESCAPES
-          as_bad (_("Bad escaped character in string, '?' assumed"));
+          as_bad (_("bad escaped character in string"));
           c = '?';
 #endif /* ONLY_STANDARD_ESCAPES */
@@ -4718 +4771 @@
       || expP->X_op == O_big)
     {
-      as_bad (_("expected address expression; zero assumed"));
+      as_bad (_("expected address expression"));
       expP->X_op = O_constant;
       expP->X_add_number = 0;
@@ -4751 +4804 @@
 
 offsetT
+get_absolute_expr (exp)
+     expressionS *exp;
+{
+  expression (exp);
+  if (exp->X_op != O_constant)
+    {
+      if (exp->X_op != O_absent)
+        as_bad (_("bad or irreducible absolute expression"));
+      exp->X_add_number = 0;
+    }
+  return exp->X_add_number;
+}
+
+offsetT
 get_absolute_expression ()
 {
   expressionS exp;
 
-  expression (&exp);
-  if (exp.X_op != O_constant)
-    {
-      if (exp.X_op != O_absent)
-        as_bad (_("bad or irreducible absolute expression; zero assumed"));
-      exp.X_add_number = 0;
-    }
-  return exp.X_add_number;
+  return get_absolute_expr (&exp);
 }
 
@@ -4795 +4855 @@
               len = 1;
               *len_pointer = 0;
-              as_bad (_("This string may not contain \'\\0\'"));
+              as_bad (_("this string may not contain \'\\0\'"));
             }
         }
@@ -4833 +4893 @@
   else
     {
-      as_warn (_("Missing string"));
+      as_warn (_("missing string"));
       retval = NULL;
       ignore_rest_of_line ();
@@ -4898 +4958 @@
           && S_IS_DEFINED (symbolP)
           && S_GET_SEGMENT (symbolP) != reg_section)
-        as_bad (_("symbol `%s' already defined"), S_GET_NAME (symbolP));
+        as_bad (_("symbol `%s' is already defined"), S_GET_NAME (symbolP));
 
 #ifdef OBJ_COFF
@@ -4917 +4977 @@
 }
 
+/* .incbin -- include a file verbatim at the current location.  */
+
+void
+s_incbin (x)
+     int x ATTRIBUTE_UNUSED;
+{
+  FILE * binfile;
+  char * path;
+  char * filename;
+  char * binfrag;
+  long   skip = 0;
+  long   count = 0;
+  long   bytes;
+  int    len;
+
+#ifdef md_flush_pending_output
+  md_flush_pending_output ();
+#endif
+
+  SKIP_WHITESPACE ();
+  filename = demand_copy_string (& len);
+  if (filename == NULL)
+    return;
+
+  SKIP_WHITESPACE ();
+
+  /* Look for optional skip and count.  */
+  if (* input_line_pointer == ',')
+    {
+      ++ input_line_pointer;
+      skip = get_absolute_expression ();
+
+      SKIP_WHITESPACE ();
+
+      if (* input_line_pointer == ',')
+        {
+          ++ input_line_pointer;
+
+          count = get_absolute_expression ();
+          if (count == 0)
+            as_warn (_(".incbin count zero, ignoring `%s'"), filename);
+
+          SKIP_WHITESPACE ();
+        }
+    }
+
+  demand_empty_rest_of_line ();
+
+  /* Try opening absolute path first, then try include dirs.  */
+  binfile = fopen (filename, FOPEN_RB);
+  if (binfile == NULL)
+    {
+      int i;
+
+      path = xmalloc ((unsigned long) len + include_dir_maxlen + 5);
+
+      for (i = 0; i < include_dir_count; i++)
+        {
+          sprintf (path, "%s/%s", include_dirs[i], filename);
+
+          binfile = fopen (path, FOPEN_RB);
+          if (binfile != NULL)
+            break;
+        }
+
+      if (binfile == NULL)
+        as_bad (_("file not found: %s"), filename);
+    }
+  else
+    path = xstrdup (filename);
+
+  if (binfile)
+    {
+      long   file_len;
+
+      register_dependency (path);
+
+      /* Compute the length of the file.  */
+      if (fseek (binfile, 0, SEEK_END) != 0)
+        {
+          as_bad (_("seek to end of .incbin file failed `%s'"), path);
+          goto done;
+        }
+      file_len = ftell (binfile);
+
+      /* If a count was not specified use the size of the file.  */
+      if (count == 0)
+        count = file_len;
+
+      if (skip + count > file_len)
+        {
+          as_bad (_("skip (%ld) + count (%ld) larger than file size (%ld)"),
+                  skip, count, file_len);
+          goto done;
+        }
+
+      if (fseek (binfile, skip, SEEK_SET) != 0)
+        {
+          as_bad (_("could not skip to %ld in file `%s'"), skip, path);
+          goto done;
+        }
+
+      /* Allocate frag space and store file contents in it.  */
+      binfrag = frag_more (count);
+
+      bytes = fread (binfrag, 1, count, binfile);
+      if (bytes < count)
+        as_warn (_("truncated file `%s', %ld of %ld bytes read"),
+                 path, bytes, count);
+    }
+done:
+  if (binfile != NULL)
+    fclose (binfile);
+  if (path)
+    free (path);
+}
+
 /* .include -- include a file at this point.  */
 
@@ -4965 +5142 @@
       strcat (path, "/");
       strcat (path, filename);
-      if (0 != (try = fopen (path, "r")))
+      if (0 != (try = fopen (path, FOPEN_RT)))
         {
           fclose (try);