GCC 4.2.0 release.

1 files changed, 111 insertions, 68 deletions

diff --git a/contrib/gcc/c-ppoutput.c b/contrib/gcc/c-ppoutput.c
index 8162ccb..10540b7 100644
--- a/contrib/gcc/c-ppoutput.c
+++ b/contrib/gcc/c-ppoutput.c
@@ -15,14 +15,14 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
 #include "cpplib.h"
-#include "cpphash.h"
+#include "../libcpp/internal.h"
 #include "tree.h"
 #include "c-common.h"		/* For flags.  */
 #include "c-pragma.h"		/* For parse_in.  */
@@ -32,11 +32,11 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 static struct
 {
   FILE *outf;			/* Stream to write to.  */
-  const struct line_map *map;	/* Logical to physical line mappings.  */
   const cpp_token *prev;	/* Previous token.  */
   const cpp_token *source;	/* Source token for spacing.  */
-  fileline line;		/* Line currently being written.  */
+  int src_line;			/* Line number currently being written.  */
   unsigned char printed;	/* Nonzero if something output at line.  */
+  bool first_time;		/* pp_file_change hasn't been called yet.  */
 } print;
 
 /* General output routines.  */
@@ -45,18 +45,20 @@ static void scan_translation_unit_trad (cpp_reader *);
 static void account_for_newlines (const unsigned char *, size_t);
 static int dump_macro (cpp_reader *, cpp_hashnode *, void *);
 
-static void print_line (const struct line_map *, fileline, const char *);
-static void maybe_print_line (const struct line_map *, fileline);
+static void print_line (source_location, const char *);
+static void maybe_print_line (source_location);
 
 /* Callback routines for the parser.   Most of these are active only
    in specific modes.  */
 static void cb_line_change (cpp_reader *, const cpp_token *, int);
-static void cb_define (cpp_reader *, fileline, cpp_hashnode *);
-static void cb_undef (cpp_reader *, fileline, cpp_hashnode *);
-static void cb_include (cpp_reader *, fileline, const unsigned char *,
-			const char *, int);
-static void cb_ident (cpp_reader *, fileline, const cpp_string *);
-static void cb_def_pragma (cpp_reader *, fileline);
+static void cb_define (cpp_reader *, source_location, cpp_hashnode *);
+static void cb_undef (cpp_reader *, source_location, cpp_hashnode *);
+static void cb_include (cpp_reader *, source_location, const unsigned char *,
+			const char *, int, const cpp_token **);
+static void cb_ident (cpp_reader *, source_location, const cpp_string *);
+static void cb_def_pragma (cpp_reader *, source_location);
+static void cb_read_pch (cpp_reader *pfile, const char *name,
+			 int fd, const char *orig_name);
 
 /* Preprocess and output.  */
 void
@@ -106,20 +108,26 @@ init_pp_output (FILE *out_stream)
   if (flag_dump_includes)
     cb->include  = cb_include;
 
+  if (flag_pch_preprocess)
+    {
+      cb->valid_pch = c_common_valid_pch;
+      cb->read_pch = cb_read_pch;
+    }
+
   if (flag_dump_macros == 'N' || flag_dump_macros == 'D')
     {
       cb->define = cb_define;
       cb->undef  = cb_undef;
     }
 
-  /* Initialize the print structure.  Setting print.line to -1 here is
+  /* Initialize the print structure.  Setting print.src_line to -1 here is
      a trick to guarantee that the first token of the file will cause
      a linemarker to be output by maybe_print_line.  */
-  print.line = (fileline) -1;
+  print.src_line = -1;
   print.printed = 0;
   print.prev = 0;
-  print.map = 0;
   print.outf = out_stream;
+  print.first_time = 1;
 }
 
 /* Writes out the preprocessed file, handling spacing and paste
@@ -171,13 +179,13 @@ scan_translation_unit (cpp_reader *pfile)
     }
 }
 
-/* Adjust print.line for newlines embedded in output.  */
+/* Adjust print.src_line for newlines embedded in output.  */
 static void
 account_for_newlines (const unsigned char *str, size_t len)
 {
   while (len--)
     if (*str++ == '\n')
-      print.line++;
+      print.src_line++;
 }
 
 /* Writes out a traditionally preprocessed file.  */
@@ -187,7 +195,7 @@ scan_translation_unit_trad (cpp_reader *pfile)
   while (_cpp_read_logical_line_trad (pfile))
     {
       size_t len = pfile->out.cur - pfile->out.base;
-      maybe_print_line (print.map, pfile->out.first_line);
+      maybe_print_line (pfile->out.first_line);
       fwrite (pfile->out.base, 1, len, print.outf);
       print.printed = 1;
       if (!CPP_OPTION (pfile, discard_comments))
@@ -199,52 +207,58 @@ scan_translation_unit_trad (cpp_reader *pfile)
    different line to the current one, output the required newlines or
    a line marker, and return 1.  Otherwise return 0.  */
 static void
-maybe_print_line (const struct line_map *map, fileline line)
+maybe_print_line (source_location src_loc)
 {
+  const struct line_map *map = linemap_lookup (&line_table, src_loc);
+  int src_line = SOURCE_LINE (map, src_loc);
   /* End the previous line of text.  */
   if (print.printed)
     {
       putc ('\n', print.outf);
-      print.line++;
+      print.src_line++;
       print.printed = 0;
     }
 
-  if (line >= print.line && line < print.line + 8)
+  if (src_line >= print.src_line && src_line < print.src_line + 8)
     {
-      while (line > print.line)
+      while (src_line > print.src_line)
 	{
 	  putc ('\n', print.outf);
-	  print.line++;
+	  print.src_line++;
 	}
     }
   else
-    print_line (map, line, "");
+    print_line (src_loc, "");
 }
 
 /* Output a line marker for logical line LINE.  Special flags are "1"
    or "2" indicating entering or leaving a file.  */
 static void
-print_line (const struct line_map *map, fileline line, const char *special_flags)
+print_line (source_location src_loc, const char *special_flags)
 {
   /* End any previous line of text.  */
   if (print.printed)
     putc ('\n', print.outf);
   print.printed = 0;
 
-  print.line = line;
   if (!flag_no_line_commands)
     {
+      const struct line_map *map = linemap_lookup (&line_table, src_loc);
+
       size_t to_file_len = strlen (map->to_file);
-      unsigned char *to_file_quoted = alloca (to_file_len * 4 + 1);
+      unsigned char *to_file_quoted =
+         (unsigned char *) alloca (to_file_len * 4 + 1);
       unsigned char *p;
 
+      print.src_line = SOURCE_LINE (map, src_loc);
+
       /* cpp_quote_string does not nul-terminate, so we have to do it
 	 ourselves.  */
       p = cpp_quote_string (to_file_quoted,
-			    (unsigned char *)map->to_file, to_file_len);
+			    (unsigned char *) map->to_file, to_file_len);
       *p = '\0';
       fprintf (print.outf, "# %u \"%s\"%s",
-	       SOURCE_LINE (map, print.line),
+	       print.src_line == 0 ? 1 : print.src_line,
 	       to_file_quoted, special_flags);
 
       if (map->sysp == 2)
@@ -262,10 +276,12 @@ static void
 cb_line_change (cpp_reader *pfile, const cpp_token *token,
 		int parsing_args)
 {
+  source_location src_loc = token->src_loc;
+
   if (token->type == CPP_EOF || parsing_args)
     return;
 
-  maybe_print_line (print.map, token->line);
+  maybe_print_line (src_loc);
   print.prev = 0;
   print.source = 0;
 
@@ -276,30 +292,28 @@ cb_line_change (cpp_reader *pfile, const cpp_token *token,
      ought to care.  Some things do care; the fault lies with them.  */
   if (!CPP_OPTION (pfile, traditional))
     {
+      const struct line_map *map = linemap_lookup (&line_table, src_loc);
+      int spaces = SOURCE_COLUMN (map, src_loc) - 2;
       print.printed = 1;
-      if (token->col > 2)
-	{
-	  unsigned int spaces = token->col - 2;
 
-	  while (spaces--)
-	    putc (' ', print.outf);
-	}
+      while (-- spaces >= 0)
+	putc (' ', print.outf);
     }
 }
 
 static void
-cb_ident (cpp_reader *pfile ATTRIBUTE_UNUSED, fileline line,
+cb_ident (cpp_reader *pfile ATTRIBUTE_UNUSED, source_location line,
 	  const cpp_string *str)
 {
-  maybe_print_line (print.map, line);
+  maybe_print_line (line);
   fprintf (print.outf, "#ident %s\n", str->text);
-  print.line++;
+  print.src_line++;
 }
 
 static void
-cb_define (cpp_reader *pfile, fileline line, cpp_hashnode *node)
+cb_define (cpp_reader *pfile, source_location line, cpp_hashnode *node)
 {
-  maybe_print_line (print.map, line);
+  maybe_print_line (line);
   fputs ("#define ", print.outf);
 
   /* 'D' is whole definition; 'N' is name only.  */
@@ -310,49 +324,64 @@ cb_define (cpp_reader *pfile, fileline line, cpp_hashnode *node)
     fputs ((const char *) NODE_NAME (node), print.outf);
 
   putc ('\n', print.outf);
-  print.line++;
+  if (linemap_lookup (&line_table, line)->to_line != 0)
+    print.src_line++;
 }
 
 static void
-cb_undef (cpp_reader *pfile ATTRIBUTE_UNUSED, fileline line,
+cb_undef (cpp_reader *pfile ATTRIBUTE_UNUSED, source_location line,
 	  cpp_hashnode *node)
 {
-  maybe_print_line (print.map, line);
+  maybe_print_line (line);
   fprintf (print.outf, "#undef %s\n", NODE_NAME (node));
-  print.line++;
+  print.src_line++;
 }
 
 static void
-cb_include (cpp_reader *pfile ATTRIBUTE_UNUSED, fileline line,
-	    const unsigned char *dir, const char *header, int angle_brackets)
+cb_include (cpp_reader *pfile ATTRIBUTE_UNUSED, source_location line,
+	    const unsigned char *dir, const char *header, int angle_brackets,
+	    const cpp_token **comments)
 {
-  maybe_print_line (print.map, line);
+  maybe_print_line (line);
   if (angle_brackets)
-    fprintf (print.outf, "#%s <%s>\n", dir, header);
+    fprintf (print.outf, "#%s <%s>", dir, header);
   else
-    fprintf (print.outf, "#%s \"%s\"\n", dir, header);
-  print.line++;
+    fprintf (print.outf, "#%s \"%s\"", dir, header);
+
+  if (comments != NULL)
+    {
+      while (*comments != NULL)
+	{
+	  if ((*comments)->flags & PREV_WHITE)
+	    putc (' ', print.outf);
+	  cpp_output_token (*comments, print.outf);
+	  ++comments;
+	}
+    }
+
+  putc ('\n', print.outf);
+  print.src_line++;
 }
 
 /* Callback called when -fworking-director and -E to emit working
-   diretory in cpp output file. */
+   directory in cpp output file.  */
 
 void
 pp_dir_change (cpp_reader *pfile ATTRIBUTE_UNUSED, const char *dir)
 {
   size_t to_file_len = strlen (dir);
-  unsigned char *to_file_quoted = alloca (to_file_len * 4 + 1);
+  unsigned char *to_file_quoted =
+     (unsigned char *) alloca (to_file_len * 4 + 1);
   unsigned char *p;
 
-  /* cpp_quote_string does not nul-terminate, so we have to do it ourselves. */
+  /* cpp_quote_string does not nul-terminate, so we have to do it ourselves.  */
   p = cpp_quote_string (to_file_quoted, (unsigned char *) dir, to_file_len);
   *p = '\0';
   fprintf (print.outf, "# 1 \"%s//\"\n", to_file_quoted);
 }
 
 /* The file name, line number or system header flags have changed, as
-   described in MAP.  From this point on, the old print.map might be
-   pointing to freed memory, and so must not be dereferenced.  */
+   described in MAP.  */
 
 void
 pp_file_change (const struct line_map *map)
@@ -364,38 +393,38 @@ pp_file_change (const struct line_map *map)
 
   if (map != NULL)
     {
-      /* First time?  */
-      if (print.map == NULL)
+      if (print.first_time)
 	{
 	  /* Avoid printing foo.i when the main file is foo.c.  */
 	  if (!cpp_get_options (parse_in)->preprocessed)
-	    print_line (map, map->from_line, flags);
+	    print_line (map->start_location, flags);
+	  print.first_time = 0;
 	}
       else
 	{
 	  /* Bring current file to correct line when entering a new file.  */
 	  if (map->reason == LC_ENTER)
-	    maybe_print_line (map - 1, map->from_line - 1);
-
+	    {
+	      const struct line_map *from = INCLUDED_FROM (&line_table, map);
+	      maybe_print_line (LAST_SOURCE_LINE_LOCATION (from));
+	    }
 	  if (map->reason == LC_ENTER)
 	    flags = " 1";
 	  else if (map->reason == LC_LEAVE)
 	    flags = " 2";
-	  print_line (map, map->from_line, flags);
+	  print_line (map->start_location, flags);
 	}
     }
-
-  print.map = map;
 }
 
 /* Copy a #pragma directive to the preprocessed output.  */
 static void
-cb_def_pragma (cpp_reader *pfile, fileline line)
+cb_def_pragma (cpp_reader *pfile, source_location line)
 {
-  maybe_print_line (print.map, line);
+  maybe_print_line (line);
   fputs ("#pragma ", print.outf);
   cpp_output_line (pfile, print.outf);
-  print.line++;
+  print.src_line++;
 }
 
 /* Dump out the hash table.  */
@@ -408,8 +437,22 @@ dump_macro (cpp_reader *pfile, cpp_hashnode *node, void *v ATTRIBUTE_UNUSED)
       fputs ((const char *) cpp_macro_definition (pfile, node),
 	     print.outf);
       putc ('\n', print.outf);
-      print.line++;
+      print.src_line++;
     }
 
   return 1;
 }
+
+/* Load in the PCH file NAME, open on FD.  It was originally searched for
+   by ORIG_NAME.  Also, print out a #include command so that the PCH
+   file can be loaded when the preprocessed output is compiled.  */
+
+static void
+cb_read_pch (cpp_reader *pfile, const char *name,
+	     int fd, const char *orig_name ATTRIBUTE_UNUSED)
+{
+  c_common_read_pch (pfile, name, fd, orig_name);
+
+  fprintf (print.outf, "#pragma GCC pch_preprocess \"%s\"\n", name);
+  print.src_line++;
+}