Slightly simplify daisy chaining several lists.
[cparser] / main.c
diff --git a/main.c b/main.c
index d605c49..a418bf6 100644 (file)
--- 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,36 +301,64 @@ 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);
+
+       const char *preprocessor = getenv("CPARSER_PP");
+       if (preprocessor == NULL)
+               preprocessor = PREPROCESSOR;
+
+       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));
-
-       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");
+       obstack_printf(&cppflags_obst, "%s", common_flags);
 
        /* handle dependency generation */
        if (dep_target[0] != '\0') {
@@ -340,15 +369,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);
        }
@@ -359,6 +383,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;
 }
 
@@ -366,7 +393,11 @@ static void assemble(const char *out, const char *in)
 {
        char buf[65536];
 
-       snprintf(buf, sizeof(buf), "%s %s -o %s", ASSEMBLER, in, out);
+       const char *assembler = getenv("CPARSER_AS");
+       if (assembler == NULL)
+               assembler = ASSEMBLER;
+
+       snprintf(buf, sizeof(buf), "%s %s -o %s", assembler, in, out);
        if (verbose) {
                puts(buf);
        }
@@ -386,7 +417,10 @@ static void print_file_name(const char *file)
        const char *flags = obstack_finish(&ldflags_obst);
 
        /* construct commandline */
-       obstack_printf(&ldflags_obst, "%s ", LINKER);
+       const char *linker = getenv("CPARSER_LINK");
+       if (linker == NULL)
+               linker = LINKER;
+       obstack_printf(&ldflags_obst, "%s ", linker);
        obstack_printf(&ldflags_obst, "%s", flags);
        obstack_1grow(&ldflags_obst, '\0');
 
@@ -664,6 +698,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);
@@ -729,14 +764,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");
@@ -934,9 +969,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)
@@ -1058,6 +1094,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);
@@ -1165,6 +1203,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");
@@ -1260,8 +1301,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 */
@@ -1345,8 +1384,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) {
@@ -1388,7 +1429,9 @@ do_parsing:
                                continue;
                        }
 
+                       timer_push(TV_CONSTRUCT);
                        translation_unit_to_firm(unit);
+                       timer_pop();
 
 graph_built:
                        if (mode == ParseOnly) {
@@ -1495,7 +1538,10 @@ graph_built:
                const char *flags = obstack_finish(&ldflags_obst);
 
                /* construct commandline */
-               obstack_printf(&file_obst, "%s", LINKER);
+               const char *linker = getenv("CPARSER_LINK");
+               if (linker == NULL)
+                       linker = LINKER;
+               obstack_printf(&file_obst, "%s", linker);
                for (file_list_entry_t *entry = files; entry != NULL;
                                entry = entry->next) {
                        if (entry->type != FILETYPE_OBJECT)
@@ -1521,6 +1567,9 @@ graph_built:
                }
        }
 
+       if (do_timing)
+               timer_term(stderr);
+
        obstack_free(&cppflags_obst, NULL);
        obstack_free(&ldflags_obst, NULL);
        obstack_free(&file_obst, NULL);