* config/tc-mmix.c (loc_asserts): New variable.

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

diff --git a/gas/input-scrub.c b/gas/input-scrub.c
index 5698a6dc22a2d1225ae6c01d0fd42165a284bcc1..adae4d4dcd004b3ff0abaca61f80dcf247989547 100644 (file)
--- a/gas/input-scrub.c
+++ b/gas/input-scrub.c
@@ -1,13 +1,13 @@
 /* input_scrub.c - Break up input buffers into whole numbers of lines.
    Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-   2000, 2001, 2003, 2006, 2007
+   2000, 2001, 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
    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,
@@ -21,6 +21,7 @@
    02110-1301, USA.  */
 
 #include "as.h"
+#include "filenames.h"
 #include "input-file.h"
 #include "sb.h"
 #include "listing.h"
@@ -74,7 +75,7 @@ static char save_source[AFTER_SIZE];
 static unsigned int buffer_length;
 
 /* The index into an sb structure we are reading from.  -1 if none.  */
-static int sb_index = -1;
+static size_t sb_index = -1;
 
 /* If we are reading from an sb structure, this is it.  */
 static sb from_sb;
@@ -99,10 +100,9 @@ int macro_nest;
 static char *physical_input_file;
 static char *logical_input_file;
 
-typedef unsigned int line_numberT;     /* 1-origin line number in a source file.  */
+/* 1-origin line number in a source file.  */
 /* A line ends in '\n' or eof.  */
-
-static line_numberT physical_input_line;
+static unsigned int physical_input_line;
 static int logical_input_line;
 
 /* Struct used to save the state of the input handler during include files */
@@ -111,12 +111,12 @@ struct input_save {
   char *              partial_where;
   int                 partial_size;
   char                save_source[AFTER_SIZE];
-  unsigned int        buffer_length;
+  size_t              buffer_length;
   char *              physical_input_file;
   char *              logical_input_file;
-  line_numberT        physical_input_line;
+  unsigned int        physical_input_line;
   int                 logical_input_line;
-  int                 sb_index;
+  size_t              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.  */
@@ -165,7 +165,8 @@ input_scrub_push (char *saved_position)
   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;
@@ -209,7 +210,8 @@ input_scrub_begin (void)
 
   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.  */
@@ -262,6 +264,8 @@ input_scrub_include_file (char *filename, char *position)
 void
 input_scrub_include_sb (sb *from, char *position, int is_expansion)
 {
+  int newline;
+
   if (macro_nest > max_macro_nest)
     as_fatal (_("macros nested too deeply"));
   ++macro_nest;
@@ -275,14 +279,21 @@ input_scrub_include_sb (sb *from, char *position, int is_expansion)
 
   next_saved_file = input_scrub_push (position);
 
-  sb_new (&from_sb);
+  /* Allocate sufficient space: from->len + optional newline.  */
+  newline = from->len >= 1 && from->ptr[0] != '\n';
+  sb_build (&from_sb, from->len + newline);
   from_sb_is_expansion = is_expansion;
-  if (from->len >= 1 && from->ptr[0] != '\n')
+  if (newline)
     {
       /* Add the sentinel required by read.c.  */
       sb_add_char (&from_sb, '\n');
     }
   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_terminate (&from_sb);
+
   sb_index = 1;
 
   /* These variables are reset by input_scrub_push.  Restore them
@@ -295,6 +306,8 @@ void
 input_scrub_close (void)
 {
   input_file_close ();
+  physical_input_line = 0;
+  logical_input_line = -1;
 }
 
 char *
@@ -302,13 +315,12 @@ input_scrub_next_buffer (char **bufp)
 {
   register char *limit;                /*->just after last char of buffer.  */
 
-  if (sb_index >= 0)
+  if (sb_index != (size_t) -1)
     {
       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);
 #ifdef md_macro_end
@@ -335,8 +347,8 @@ input_scrub_next_buffer (char **bufp)
 
   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
@@ -357,10 +369,10 @@ input_scrub_next_buffer (char **bufp)
 
          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);
 
@@ -418,7 +430,7 @@ seen_at_least_1_file (void)
 void
 bump_line_counters (void)
 {
-  if (sb_index < 0)
+  if (sb_index == (size_t) -1)
     {
       ++physical_input_line;
       if (logical_input_line >= 0)
@@ -466,7 +478,7 @@ new_logical_line_flags (char *fname, /* DON'T destroy it!  We point to it!  */
 
   if (fname
       && (logical_input_file == NULL
-         || strcmp (logical_input_file, fname)))
+         || filename_cmp (logical_input_file, fname)))
     {
       logical_input_file = fname;
       return 1;