From a37374818c824faeb9ac4db40bcc0229995a84f6 Mon Sep 17 00:00:00 2001 From: Neil Booth Date: Mon, 12 Aug 2002 17:21:52 +0000 Subject: [PATCH] cpphash.h (struct printer): New from cppmain.c. * cpphash.h (struct printer): New from cppmain.c. (cpp_reader): New member. * cppmain.c (struct printer): Move to cpphash.h. (options, print): Remove. (account_for_newlines, print_line, maybe_print_line, cpp_preprocess_file, setup_callbacks, scan_translation_unit, scan_translation_unit_trad, cb_line_change, cb_ident, cb_define, cb_undef, cb_include, cb_file_change, dump_macro, cb_def_pragma): Make reentrant. From-SVN: r56233 --- gcc/ChangeLog | 12 ++++ gcc/cpphash.h | 15 ++++ gcc/cppmain.c | 217 ++++++++++++++++++++++++++++------------------------------ 3 files changed, 133 insertions(+), 111 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index e317d5e..c247142 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,15 @@ +2002-08-12 Neil Booth + + * cpphash.h (struct printer): New from cppmain.c. + (cpp_reader): New member. + * cppmain.c (struct printer): Move to cpphash.h. + (options, print): Remove. + (account_for_newlines, print_line, maybe_print_line, + cpp_preprocess_file, setup_callbacks, scan_translation_unit, + scan_translation_unit_trad, cb_line_change, cb_ident, + cb_define, cb_undef, cb_include, cb_file_change, dump_macro, + cb_def_pragma): Make reentrant. + 2002-08-12 Kaveh R. Ghazi * real.c (ieee_64): Always define. diff --git a/gcc/cpphash.h b/gcc/cpphash.h index 5e69c85..547a70c 100644 --- a/gcc/cpphash.h +++ b/gcc/cpphash.h @@ -253,6 +253,18 @@ struct spec_nodes cpp_hashnode *n__VA_ARGS__; /* C99 vararg macros */ }; +/* Encapsulates state used to convert a stream of tokens into a text + file. */ +struct printer +{ + 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. */ + unsigned int line; /* Line currently being written. */ + unsigned char printed; /* Nonzero if something output at line. */ +}; + /* Represents the contents of a file cpplib has read in. */ struct cpp_buffer { @@ -419,6 +431,9 @@ struct cpp_reader preprocessor. */ struct spec_nodes spec_nodes; + /* Used when doing preprocessed output. */ + struct printer print; + /* Whether cpplib owns the hashtable. */ unsigned char our_hashtable; diff --git a/gcc/cppmain.c b/gcc/cppmain.c index 5efafd5..4036bc3 100644 --- a/gcc/cppmain.c +++ b/gcc/cppmain.c @@ -26,29 +26,19 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "cpplib.h" #include "cpphash.h" -/* Encapsulates state used to convert the stream of tokens coming from - cpp_get_token back into a text file. */ -struct printer -{ - 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. */ - unsigned int line; /* Line currently being written. */ - unsigned char printed; /* Nonzero if something output at line. */ -}; - static void setup_callbacks PARAMS ((cpp_reader *)); /* General output routines. */ static void scan_translation_unit PARAMS ((cpp_reader *)); static void scan_translation_unit_trad PARAMS ((cpp_reader *)); -static void account_for_newlines PARAMS ((const uchar *, size_t)); +static void account_for_newlines PARAMS ((cpp_reader *, const uchar *, + size_t)); static int dump_macro PARAMS ((cpp_reader *, cpp_hashnode *, void *)); -static void print_line PARAMS ((const struct line_map *, unsigned int, - const char *)); -static void maybe_print_line PARAMS ((const struct line_map *, unsigned int)); +static void print_line PARAMS ((cpp_reader *, const struct line_map *, + unsigned int, const char *)); +static void maybe_print_line PARAMS ((cpp_reader *, const struct line_map *, + unsigned int)); /* Callback routines for the parser. Most of these are active only in specific modes. */ @@ -62,9 +52,6 @@ static void cb_ident PARAMS ((cpp_reader *, unsigned int, static void cb_file_change PARAMS ((cpp_reader *, const struct line_map *)); static void cb_def_pragma PARAMS ((cpp_reader *, unsigned int)); -static cpp_options *options; /* Options of pfile. */ -static struct printer print; - /* Preprocess and output. */ void cpp_preprocess_file (pfile, in_fname, out_stream) @@ -72,21 +59,20 @@ cpp_preprocess_file (pfile, in_fname, out_stream) const char *in_fname; FILE *out_stream; { - options = cpp_get_options (pfile); - /* Initialize the printer structure. Setting print.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 = (unsigned int) -1; - print.printed = 0; - print.prev = 0; - print.map = 0; - print.outf = out_stream; + pfile->print.line = (unsigned int) -1; + pfile->print.printed = 0; + pfile->print.prev = 0; + pfile->print.map = 0; + pfile->print.outf = out_stream; setup_callbacks (pfile); if (cpp_read_main_file (pfile, in_fname, NULL)) { + cpp_options *options = &pfile->opts; cpp_finish_options (pfile); /* A successful cpp_read_main_file guarantees that we can call @@ -104,8 +90,8 @@ cpp_preprocess_file (pfile, in_fname, out_stream) } /* Flush any pending output. */ - if (print.printed) - putc ('\n', print.outf); + if (pfile->print.printed) + putc ('\n', pfile->print.outf); } /* Set up the callbacks as appropriate. */ @@ -113,6 +99,7 @@ static void setup_callbacks (pfile) cpp_reader *pfile; { + cpp_options *options = &pfile->opts; cpp_callbacks *cb = cpp_get_callbacks (pfile); if (! options->no_output) @@ -148,7 +135,7 @@ scan_translation_unit (pfile) { bool avoid_paste = false; - print.source = NULL; + pfile->print.source = NULL; for (;;) { const cpp_token *token = cpp_get_token (pfile); @@ -156,10 +143,10 @@ scan_translation_unit (pfile) if (token->type == CPP_PADDING) { avoid_paste = true; - if (print.source == NULL - || (!(print.source->flags & PREV_WHITE) + if (pfile->print.source == NULL + || (!(pfile->print.source->flags & PREV_WHITE) && token->val.source == NULL)) - print.source = token->val.source; + pfile->print.source = token->val.source; continue; } @@ -169,35 +156,37 @@ scan_translation_unit (pfile) /* Subtle logic to output a space if and only if necessary. */ if (avoid_paste) { - if (print.source == NULL) - print.source = token; - if (print.source->flags & PREV_WHITE - || (print.prev && cpp_avoid_paste (pfile, print.prev, token)) - || (print.prev == NULL && token->type == CPP_HASH)) - putc (' ', print.outf); + if (pfile->print.source == NULL) + pfile->print.source = token; + if (pfile->print.source->flags & PREV_WHITE + || (pfile->print.prev + && cpp_avoid_paste (pfile, pfile->print.prev, token)) + || (pfile->print.prev == NULL && token->type == CPP_HASH)) + putc (' ', pfile->print.outf); } else if (token->flags & PREV_WHITE) - putc (' ', print.outf); + putc (' ', pfile->print.outf); avoid_paste = false; - print.source = NULL; - print.prev = token; - cpp_output_token (token, print.outf); + pfile->print.source = NULL; + pfile->print.prev = token; + cpp_output_token (token, pfile->print.outf); if (token->type == CPP_COMMENT) - account_for_newlines (token->val.str.text, token->val.str.len); + account_for_newlines (pfile, token->val.str.text, token->val.str.len); } } -/* Adjust print.line for newlines embedded in output. */ +/* Adjust pfile->print.line for newlines embedded in output. */ static void -account_for_newlines (str, len) +account_for_newlines (pfile, str, len) + cpp_reader *pfile; const uchar *str; size_t len; { while (len--) if (*str++ == '\n') - print.line++; + pfile->print.line++; } /* Writes out a traditionally preprocessed file. */ @@ -208,11 +197,11 @@ scan_translation_unit_trad (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); - fwrite (pfile->out.base, 1, len, print.outf); - print.printed = 1; + maybe_print_line (pfile, pfile->print.map, pfile->out.first_line); + fwrite (pfile->out.base, 1, len, pfile->print.outf); + pfile->print.printed = 1; if (!CPP_OPTION (pfile, discard_comments)) - account_for_newlines (pfile->out.base, len); + account_for_newlines (pfile, pfile->out.base, len); } } @@ -220,45 +209,47 @@ scan_translation_unit_trad (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 (map, line) +maybe_print_line (pfile, map, line) + cpp_reader *pfile; const struct line_map *map; unsigned int line; { /* End the previous line of text. */ - if (print.printed) + if (pfile->print.printed) { - putc ('\n', print.outf); - print.line++; - print.printed = 0; + putc ('\n', pfile->print.outf); + pfile->print.line++; + pfile->print.printed = 0; } - if (line >= print.line && line < print.line + 8) + if (line >= pfile->print.line && line < pfile->print.line + 8) { - while (line > print.line) + while (line > pfile->print.line) { - putc ('\n', print.outf); - print.line++; + putc ('\n', pfile->print.outf); + pfile->print.line++; } } else - print_line (map, line, ""); + print_line (pfile, map, line, ""); } /* Output a line marker for logical line LINE. Special flags are "1" or "2" indicating entering or leaving a file. */ static void -print_line (map, line, special_flags) +print_line (pfile, map, line, special_flags) + cpp_reader *pfile; const struct line_map *map; unsigned int line; const char *special_flags; { /* End any previous line of text. */ - if (print.printed) - putc ('\n', print.outf); - print.printed = 0; + if (pfile->print.printed) + putc ('\n', pfile->print.outf); + pfile->print.printed = 0; - print.line = line; - if (! options->no_line_commands) + pfile->print.line = line; + if (! CPP_OPTION (pfile, no_line_commands)) { size_t to_file_len = strlen (map->to_file); unsigned char *to_file_quoted = alloca (to_file_len * 4 + 1); @@ -269,15 +260,16 @@ print_line (map, line, special_flags) p = cpp_quote_string (to_file_quoted, (unsigned char *)map->to_file, to_file_len); *p = '\0'; - fprintf (print.outf, "# %u \"%s\"%s", - SOURCE_LINE (map, print.line), to_file_quoted, special_flags); + fprintf (pfile->print.outf, "# %u \"%s\"%s", + SOURCE_LINE (map, pfile->print.line), + to_file_quoted, special_flags); if (map->sysp == 2) - fputs (" 3 4", print.outf); + fputs (" 3 4", pfile->print.outf); else if (map->sysp == 1) - fputs (" 3", print.outf); + fputs (" 3", pfile->print.outf); - putc ('\n', print.outf); + putc ('\n', pfile->print.outf); } } @@ -285,16 +277,16 @@ print_line (map, line, special_flags) of the line, and at end of file will be CPP_EOF. */ static void cb_line_change (pfile, token, parsing_args) - cpp_reader *pfile ATTRIBUTE_UNUSED; + cpp_reader *pfile; const cpp_token *token; int parsing_args; { if (token->type == CPP_EOF || parsing_args) return; - maybe_print_line (print.map, token->line); - print.prev = 0; - print.source = 0; + maybe_print_line (pfile, pfile->print.map, token->line); + pfile->print.prev = 0; + pfile->print.source = 0; /* Supply enough spaces to put this token in its original column, one space per column greater than 2, since scan_translation_unit @@ -303,26 +295,26 @@ cb_line_change (pfile, token, parsing_args) ought to care. Some things do care; the fault lies with them. */ if (!CPP_OPTION (pfile, traditional)) { - print.printed = 1; + pfile->print.printed = 1; if (token->col > 2) { unsigned int spaces = token->col - 2; while (spaces--) - putc (' ', print.outf); + putc (' ', pfile->print.outf); } } } static void cb_ident (pfile, line, str) - cpp_reader *pfile ATTRIBUTE_UNUSED; + cpp_reader *pfile; unsigned int line; const cpp_string * str; { - maybe_print_line (print.map, line); - fprintf (print.outf, "#ident \"%s\"\n", str->text); - print.line++; + maybe_print_line (pfile, pfile->print.map, line); + fprintf (pfile->print.outf, "#ident \"%s\"\n", str->text); + pfile->print.line++; } static void @@ -331,28 +323,29 @@ cb_define (pfile, line, node) unsigned int line; cpp_hashnode *node; { - maybe_print_line (print.map, line); - fputs ("#define ", print.outf); + maybe_print_line (pfile, pfile->print.map, line); + fputs ("#define ", pfile->print.outf); /* -dD command line option. */ - if (options->dump_macros == dump_definitions) - fputs ((const char *) cpp_macro_definition (pfile, node), print.outf); + if (CPP_OPTION (pfile, dump_macros) == dump_definitions) + fputs ((const char *) cpp_macro_definition (pfile, node), + pfile->print.outf); else - fputs ((const char *) NODE_NAME (node), print.outf); + fputs ((const char *) NODE_NAME (node), pfile->print.outf); - putc ('\n', print.outf); - print.line++; + putc ('\n', pfile->print.outf); + pfile->print.line++; } static void cb_undef (pfile, line, node) - cpp_reader *pfile ATTRIBUTE_UNUSED; + cpp_reader *pfile; unsigned int line; cpp_hashnode *node; { - maybe_print_line (print.map, line); - fprintf (print.outf, "#undef %s\n", NODE_NAME (node)); - print.line++; + maybe_print_line (pfile, pfile->print.map, line); + fprintf (pfile->print.outf, "#undef %s\n", NODE_NAME (node)); + pfile->print.line++; } static void @@ -362,43 +355,44 @@ cb_include (pfile, line, dir, header) const unsigned char *dir; const cpp_token *header; { - maybe_print_line (print.map, line); - fprintf (print.outf, "#%s %s\n", dir, cpp_token_as_text (pfile, header)); - print.line++; + maybe_print_line (pfile, pfile->print.map, line); + fprintf (pfile->print.outf, "#%s %s\n", dir, + cpp_token_as_text (pfile, header)); + pfile->print.line++; } /* 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 + described in MAP. From this point on, the old pfile->print.map might be pointing to freed memory, and so must not be dereferenced. */ static void cb_file_change (pfile, map) - cpp_reader *pfile ATTRIBUTE_UNUSED; + cpp_reader *pfile; const struct line_map *map; { const char *flags = ""; /* First time? */ - if (print.map == NULL) + if (pfile->print.map == NULL) { /* Avoid printing foo.i when the main file is foo.c. */ - if (!options->preprocessed) - print_line (map, map->from_line, flags); + if (!CPP_OPTION (pfile, preprocessed)) + print_line (pfile, map, map->from_line, flags); } 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); + maybe_print_line (pfile, map - 1, map->from_line - 1); if (map->reason == LC_ENTER) flags = " 1"; else if (map->reason == LC_LEAVE) flags = " 2"; - print_line (map, map->from_line, flags); + print_line (pfile, map, map->from_line, flags); } - print.map = map; + pfile->print.map = map; } /* Copy a #pragma directive to the preprocessed output. */ @@ -407,10 +401,10 @@ cb_def_pragma (pfile, line) cpp_reader *pfile; unsigned int line; { - maybe_print_line (print.map, line); - fputs ("#pragma ", print.outf); - cpp_output_line (pfile, print.outf); - print.line++; + maybe_print_line (pfile, pfile->print.map, line); + fputs ("#pragma ", pfile->print.outf); + cpp_output_line (pfile, pfile->print.outf); + pfile->print.line++; } /* Dump out the hash table. */ @@ -422,10 +416,11 @@ dump_macro (pfile, node, v) { if (node->type == NT_MACRO && !(node->flags & NODE_BUILTIN)) { - fputs ("#define ", print.outf); - fputs ((const char *) cpp_macro_definition (pfile, node), print.outf); - putc ('\n', print.outf); - print.line++; + fputs ("#define ", pfile->print.outf); + fputs ((const char *) cpp_macro_definition (pfile, node), + pfile->print.outf); + putc ('\n', pfile->print.outf); + pfile->print.line++; } return 1; -- 2.7.4