X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=main.c;h=32456541def6785621cfaf8c9e2bd8975dd53ffc;hb=d9c2f28d8ca23867f292a952b0543807d35e672f;hp=734d5343a6a619b15a16da34f02b75f8ca5379e3;hpb=bc20f75554ba62fcbea337664cae66243ba974b4;p=cparser diff --git a/main.c b/main.c index 734d534..3245654 100644 --- a/main.c +++ b/main.c @@ -71,6 +71,7 @@ #include "lang_features.h" #include "driver/firm_opt.h" #include "driver/firm_cmdline.h" +#include "driver/firm_timing.h" #include "adt/error.h" #include "wrappergen/write_fluffy.h" #include "wrappergen/write_caml.h" @@ -300,33 +301,59 @@ static const char *type_to_string(type_t *type) static FILE *preprocess(const char *fname, filetype_t filetype) { - obstack_1grow(&cppflags_obst, '\0'); - const char *flags = obstack_finish(&cppflags_obst); + static const char *common_flags = NULL; + + if (common_flags == NULL) { + obstack_1grow(&cppflags_obst, '\0'); + const char *flags = obstack_finish(&cppflags_obst); + + /* setup default defines */ + add_flag(&cppflags_obst, "-U__WCHAR_TYPE__"); + add_flag(&cppflags_obst, "-D__WCHAR_TYPE__=%s", type_to_string(type_wchar_t)); + add_flag(&cppflags_obst, "-U__SIZE_TYPE__"); + add_flag(&cppflags_obst, "-D__SIZE_TYPE__=%s", type_to_string(type_size_t)); + + add_flag(&cppflags_obst, "-U__VERSION__"); + add_flag(&cppflags_obst, "-D__VERSION__=\"%s\"", cparser_REVISION); + + /* TODO hack... */ + add_flag(&cppflags_obst, "-D__builtin_abort=abort"); + add_flag(&cppflags_obst, "-D__builtin_abs=abs"); + add_flag(&cppflags_obst, "-D__builtin_exit=exit"); + add_flag(&cppflags_obst, "-D__builtin_malloc=malloc"); + add_flag(&cppflags_obst, "-D__builtin_memcmp=memcmp"); + add_flag(&cppflags_obst, "-D__builtin_memcpy=memcpy"); + add_flag(&cppflags_obst, "-D__builtin_memset=memset"); + add_flag(&cppflags_obst, "-D__builtin_strlen=strlen"); + add_flag(&cppflags_obst, "-D__builtin_strcmp=strcmp"); + add_flag(&cppflags_obst, "-D__builtin_strcpy=strcpy"); + + if (flags[0] != '\0') { + size_t len = strlen(flags); + obstack_1grow(&cppflags_obst, ' '); + obstack_grow(&cppflags_obst, flags, len); + } + obstack_1grow(&cppflags_obst, '\0'); + common_flags = obstack_finish(&cppflags_obst); + } - obstack_printf(&cppflags_obst, "%s", PREPROCESSOR); - if (filetype == FILETYPE_C) { + assert(obstack_object_size(&cppflags_obst) == 0); + obstack_printf(&cppflags_obst, "%s ", PREPROCESSOR); + switch (filetype) { + case FILETYPE_C: add_flag(&cppflags_obst, "-std=c99"); - } else { + break; + case FILETYPE_CXX: add_flag(&cppflags_obst, "-std=c++98"); + break; + case FILETYPE_ASSEMBLER: + add_flag(&cppflags_obst, "-x"); + add_flag(&cppflags_obst, "assembler-with-cpp"); + break; + default: + break; } - - /* setup default defines */ - add_flag(&cppflags_obst, "-U__WCHAR_TYPE__"); - add_flag(&cppflags_obst, "-D__WCHAR_TYPE__=%s", type_to_string(type_wchar_t)); - add_flag(&cppflags_obst, "-U__SIZE_TYPE__"); - add_flag(&cppflags_obst, "-D__SIZE_TYPE__=%s", type_to_string(type_size_t)); - - /* TODO hack... */ - add_flag(&cppflags_obst, "-D__builtin_abort=abort"); - add_flag(&cppflags_obst, "-D__builtin_abs=abs"); - add_flag(&cppflags_obst, "-D__builtin_exit=exit"); - add_flag(&cppflags_obst, "-D__builtin_malloc=malloc"); - add_flag(&cppflags_obst, "-D__builtin_memcmp=memcmp"); - add_flag(&cppflags_obst, "-D__builtin_memcpy=memcpy"); - add_flag(&cppflags_obst, "-D__builtin_memset=memset"); - add_flag(&cppflags_obst, "-D__builtin_strlen=strlen"); - add_flag(&cppflags_obst, "-D__builtin_strcmp=strcmp"); - add_flag(&cppflags_obst, "-D__builtin_strcpy=strcpy"); + obstack_printf(&cppflags_obst, "%s", common_flags); /* handle dependency generation */ if (dep_target[0] != '\0') { @@ -337,15 +364,10 @@ static FILE *preprocess(const char *fname, filetype_t filetype) add_flag(&cppflags_obst, outname); } } - if (flags[0] != '\0') { - size_t len = strlen(flags); - obstack_1grow(&cppflags_obst, ' '); - obstack_grow(&cppflags_obst, flags, len); - } add_flag(&cppflags_obst, fname); obstack_1grow(&cppflags_obst, '\0'); - const char *buf = obstack_finish(&cppflags_obst); + char *buf = obstack_finish(&cppflags_obst); if (verbose) { puts(buf); } @@ -356,6 +378,9 @@ static FILE *preprocess(const char *fname, filetype_t filetype) exit(1); } + /* we don't really need that anymore */ + obstack_free(&cppflags_obst, buf); + return f; } @@ -661,6 +686,7 @@ int main(int argc, char **argv) file_list_entry_t *files = NULL; file_list_entry_t *last_file = NULL; bool construct_dep_target = false; + bool do_timing = false; struct obstack file_obst; atexit(free_temp_files); @@ -726,14 +752,14 @@ int main(int argc, char **argv) break; default: case 4: - set_option("strict-aliasing"); /* use_builtins = true; */ /* fallthrough */ case 3: - set_option("cond-eval"); + set_option("thread-jumps"); set_option("if-conv"); /* fallthrough */ case 2: + set_option("strict-aliasing"); set_option("inline"); set_option("deconv"); set_be_option("omitfp"); @@ -931,9 +957,10 @@ int main(int argc, char **argv) GET_ARG_AFTER(opt, "-march="); snprintf(arch_opt, sizeof(arch_opt), "%s-arch=%s", cpu_arch, opt); int res = firm_be_option(arch_opt); - if (res == 0) + if (res == 0) { + fprintf(stderr, "Unknown architecture '%s'\n", arch_opt); argument_errors = true; - else { + } else { snprintf(arch_opt, sizeof(arch_opt), "%s-opt=%s", cpu_arch, opt); int res = firm_be_option(arch_opt); if (res == 0) @@ -1055,6 +1082,8 @@ int main(int argc, char **argv) mode = PrintCaml; } else if (streq(option, "print-jna")) { mode = PrintJna; + } else if (streq(option, "time")) { + do_timing = true; } else if (streq(option, "version")) { print_cparser_version(); exit(EXIT_SUCCESS); @@ -1162,6 +1191,9 @@ int main(int argc, char **argv) init_ast2firm(); init_mangle(); + if (do_timing) + timer_init(); + if (construct_dep_target) { if (outname != 0 && strlen(outname) >= 2) { get_output_name(dep_target, sizeof(dep_target), outname, ".d"); @@ -1257,8 +1289,6 @@ int main(int argc, char **argv) goto preprocess; case FILETYPE_ASSEMBLER: next_filetype = FILETYPE_PREPROCESSED_ASSEMBLER; - add_flag(&cppflags_obst, "-x"); - add_flag(&cppflags_obst, "assembler-with-cpp"); goto preprocess; preprocess: /* no support for input on FILE* yet */ @@ -1342,8 +1372,10 @@ do_parsing: c_mode |= features_on; c_mode &= ~features_off; + timer_push(TV_PARSING); init_tokens(); translation_unit_t *const unit = do_parsing(in, filename); + timer_pop(); /* prints the AST even if errors occurred */ if (mode == PrintAst) { @@ -1385,7 +1417,9 @@ do_parsing: continue; } + timer_push(TV_CONSTRUCT); translation_unit_to_firm(unit); + timer_pop(); graph_built: if (mode == ParseOnly) { @@ -1518,6 +1552,9 @@ graph_built: } } + if (do_timing) + timer_term(stderr); + obstack_free(&cppflags_obst, NULL); obstack_free(&ldflags_obst, NULL); obstack_free(&file_obst, NULL);