use ir_tarval to calculate case values
[cparser] / main.c
diff --git a/main.c b/main.c
index 289d825..0f2188e 100644 (file)
--- a/main.c
+++ b/main.c
@@ -59,6 +59,7 @@
 
 #include <libfirm/firm.h>
 #include <libfirm/be.h>
+#include <libfirm/statev.h>
 
 #include "preprocessor.h"
 #include "token_t.h"
@@ -77,6 +78,7 @@
 #include "adt/array.h"
 #include "wrappergen/write_fluffy.h"
 #include "wrappergen/write_jna.h"
+#include "wrappergen/write_compoundsizes.h"
 #include "revision.h"
 #include "warning.h"
 #include "help.h"
@@ -85,7 +87,7 @@
 
 #ifndef PREPROCESSOR
 #ifndef __WIN32__
-#define PREPROCESSOR "gcc -E -U__STRICT_ANSI__"
+#define PREPROCESSOR "gcc -E -U__STRICT_ANSI__ -U__BLOCKS__"
 #else
 #define PREPROCESSOR "cpp -U__STRICT_ANSI__"
 #endif
@@ -223,7 +225,7 @@ static void do_parsing(compilation_unit_t *unit)
 {
        ir_timer_t *t_parsing = ir_timer_new();
        timer_register(t_parsing, "Frontend: Parsing");
-       timer_push(t_parsing);
+       timer_start(t_parsing);
 
        start_parsing();
 
@@ -238,7 +240,10 @@ static void do_parsing(compilation_unit_t *unit)
 
        unit->type         = COMPILATION_UNIT_AST;
        unit->parse_errors = error_count > 0 || !res;
-       timer_pop(t_parsing);
+       timer_stop(t_parsing);
+       if (stat_ev_enabled) {
+               stat_ev_dbl("time_parsing", ir_timer_elapsed_sec(t_parsing));
+       }
 }
 
 static void add_flag(struct obstack *obst, const char *format, ...)
@@ -559,6 +564,9 @@ static FILE *make_temp_file(const char *prefix, const char **name_result)
 
 static void free_temp_files(void)
 {
+       if (temp_files == NULL)
+               return;
+
        size_t n_temp_files = ARR_LEN(temp_files);
        size_t i;
        for (i = 0; i < n_temp_files; ++i) {
@@ -580,7 +588,8 @@ typedef enum compile_mode_t {
        CompileAssembleLink,
        PrintAst,
        PrintFluffy,
-       PrintJna
+       PrintJna,
+       PrintCompoundSizes,
 } compile_mode_t;
 
 static void usage(const char *argv0)
@@ -776,6 +785,8 @@ static void print_help_debug(void)
        put_help("--print-parenthesis",      "");
        put_help("--benchmark",              "Preprocess and parse, produces no output");
        put_help("--time",                   "Measure time of compiler passes");
+       put_help("--statev",                 "Produce statev output");
+       put_help("--filtev=filter",          "Set statev filter regex");
        put_help("--dump-function func",     "Preprocess, parse and output vcg graph of func");
        put_help("--export-ir",              "Preprocess, parse and output compiler intermediate representation");
 }
@@ -980,7 +991,7 @@ static void init_types_and_adjust(void)
 
        /* operating system ABI specifics */
        if (firm_is_darwin_os(target_machine)) {
-               if (machine_size == 32) {
+               if (is_ia32_cpu(target_machine->cpu_type)) {
                        props[ATOMIC_TYPE_LONGLONG].struct_alignment    =  4;
                        props[ATOMIC_TYPE_ULONGLONG].struct_alignment   =  4;
                        props[ATOMIC_TYPE_DOUBLE].struct_alignment      =  4;
@@ -989,7 +1000,11 @@ static void init_types_and_adjust(void)
                        props[ATOMIC_TYPE_LONG_DOUBLE].struct_alignment = 16;
                }
        } else if (firm_is_windows_os(target_machine)) {
-               if (machine_size == 64) {
+               if (is_ia32_cpu(target_machine->cpu_type)) {
+                       props[ATOMIC_TYPE_LONGLONG].struct_alignment    =  8;
+                       props[ATOMIC_TYPE_ULONGLONG].struct_alignment   =  8;
+                       props[ATOMIC_TYPE_DOUBLE].struct_alignment      =  8;
+               } else if (machine_size == 64) {
                        /* to ease porting of old c-code microsoft decided to use 32bits
                         * even for long */
                        props[ATOMIC_TYPE_LONG]  = props[ATOMIC_TYPE_INT];
@@ -1000,8 +1015,6 @@ static void init_types_and_adjust(void)
                props[ATOMIC_TYPE_LONG_DOUBLE] = props[ATOMIC_TYPE_DOUBLE];
        } else if (firm_is_unixish_os(target_machine)) {
                if (is_ia32_cpu(target_machine->cpu_type)) {
-                       /* System V has a broken alignment for double so we have to add
-                        * a hack here */
                        props[ATOMIC_TYPE_DOUBLE].struct_alignment    = 4;
                        props[ATOMIC_TYPE_LONGLONG].struct_alignment  = 4;
                        props[ATOMIC_TYPE_ULONGLONG].struct_alignment = 4;
@@ -1203,6 +1216,25 @@ static bool open_input(compilation_unit_t *unit)
        return true;
 }
 
+static void node_counter(ir_node *node, void *env)
+{
+       (void)node;
+       unsigned long long *count = (unsigned long long*)env;
+       ++(*count);
+}
+
+static unsigned long long count_firm_nodes(void)
+{
+       unsigned long long count = 0;
+
+       int n_irgs = get_irp_n_irgs();
+       for (int i = 0; i < n_irgs; ++i) {
+               ir_graph *irg = get_irp_irg(i);
+               irg_walk_graph(irg, node_counter, NULL, &count);
+       }
+       return count;
+}
+
 static int compilation_loop(compile_mode_t mode, compilation_unit_t *units,
                                                        lang_standard_t standard, FILE *out)
 {
@@ -1214,20 +1246,22 @@ static int compilation_loop(compile_mode_t mode, compilation_unit_t *units,
                determine_unit_standard(unit, standard);
                setup_cmode(unit);
 
+               stat_ev_ctx_push_str("compilation_unit", inputname);
+
 again:
                switch (unit->type) {
                case COMPILATION_UNIT_IR: {
                        bool res = open_input(unit);
                        if (!res) {
                                result = EXIT_FAILURE;
-                               continue;
+                               break;
                        }
                        res = !ir_import_file(unit->input, unit->name);
                        if (!res) {
                                fprintf(stderr, "Import of firm graph from '%s' failed\n",
                                        inputname);
                                result = EXIT_FAILURE;
-                               continue;
+                               break;
                        }
                        unit->type = COMPILATION_UNIT_INTERMEDIATE_REPRESENTATION;
                        goto again;
@@ -1240,7 +1274,7 @@ again:
                                bool res = run_external_preprocessor(unit);
                                if (!res) {
                                        result = EXIT_FAILURE;
-                                       continue;
+                                       break;
                                }
                                goto again;
                        }
@@ -1251,7 +1285,7 @@ again:
                        bool res = open_input(unit);
                        if (!res) {
                                result = EXIT_FAILURE;
-                               continue;
+                               break;
                        }
                        init_tokens();
 
@@ -1259,9 +1293,9 @@ again:
                                bool res = output_preprocessor_tokens(unit, out);
                                if (!res) {
                                        result = EXIT_FAILURE;
-                                       continue;
+                                       break;
                                }
-                               continue;
+                               break;
                        }
 
                        /* do the actual parsing */
@@ -1287,23 +1321,33 @@ again:
                        } else if (mode == PrintJna) {
                                write_jna_decls(out, unit->ast);
                                break;
+                       } else if (mode == PrintCompoundSizes) {
+                               write_compoundsizes(out, unit->ast);
+                               break;
                        }
 
                        /* build the firm graph */
                        ir_timer_t *t_construct = ir_timer_new();
                        timer_register(t_construct, "Frontend: Graph construction");
-                       timer_push(t_construct);
+                       timer_start(t_construct);
                        if (already_constructed_firm) {
                                panic("compiling multiple files/translation units not possible");
                        }
                        init_implicit_optimizations();
                        translation_unit_to_firm(unit->ast);
                        already_constructed_firm = true;
-                       timer_pop(t_construct);
+                       timer_stop(t_construct);
+                       if (stat_ev_enabled) {
+                               stat_ev_dbl("time_graph_construction", ir_timer_elapsed_sec(t_construct));
+                               stat_ev_int("size_graph_construction", count_firm_nodes());
+                       }
                        unit->type = COMPILATION_UNIT_INTERMEDIATE_REPRESENTATION;
                        goto again;
 
                case COMPILATION_UNIT_INTERMEDIATE_REPRESENTATION:
+                       if (mode == ParseOnly)
+                               break;
+
                        if (mode == CompileDump) {
                                /* find irg */
                                ident    *id     = new_id_from_str(dumpfunction);
@@ -1344,7 +1388,14 @@ again:
                        } else {
                                asm_out = make_temp_file("ccs", &unit->name);
                        }
+                       ir_timer_t *t_opt_codegen = ir_timer_new();
+                       timer_register(t_opt_codegen, "Optimization and Codegeneration");
+                       timer_start(t_opt_codegen);
                        generate_code(asm_out, inputname);
+                       timer_stop(t_opt_codegen);
+                       if (stat_ev_enabled) {
+                               stat_ev_dbl("time_opt_codegen", ir_timer_elapsed_sec(t_opt_codegen));
+                       }
                        if (asm_out != out) {
                                fclose(asm_out);
                        }
@@ -1374,6 +1425,8 @@ again:
                case COMPILATION_UNIT_OBJECT:
                        break;
                }
+
+               stat_ev_ctx_pop("compilation_unit");
        }
        return result;
 }
@@ -1427,9 +1480,12 @@ int main(int argc, char **argv)
        compilation_unit_t *units                = NULL;
        compilation_unit_t *last_unit            = NULL;
        bool                construct_dep_target = false;
-       bool                do_timing            = false;
+       bool                produce_statev       = false;
+       const char         *filtev               = NULL;
        bool                profile_generate     = false;
        bool                profile_use          = false;
+       bool                do_timing            = false;
+       bool                print_timing         = false;
 
        /* hack for now... */
        if (strstr(argv[0], "pptest") != NULL) {
@@ -1687,7 +1743,6 @@ int main(int argc, char **argv)
                                                   streq(opt, "align-loops")             ||
                                                   streq(opt, "align-jumps")             ||
                                                   streq(opt, "align-functions")         ||
-                                                  streq(opt, "unroll-loops")            ||
                                                   streq(opt, "PIC")                     ||
                                                   streq(opt, "stack-protector")         ||
                                                   streq(opt, "stack-protector-all")) {
@@ -1910,6 +1965,8 @@ int main(int argc, char **argv)
                                        print_parenthesis = true;
                                } else if (streq(option, "print-fluffy")) {
                                        mode = PrintFluffy;
+                               } else if (streq(option, "print-compound-sizes")) {
+                                       mode = PrintCompoundSizes;
                                } else if (streq(option, "print-jna")) {
                                        mode = PrintJna;
                                } else if (streq(option, "jna-limit")) {
@@ -1940,7 +1997,13 @@ int main(int argc, char **argv)
                                } else if (streq(option, "no-external-pp")) {
                                        external_preprocessor = NULL;
                                } else if (streq(option, "time")) {
-                                       do_timing = true;
+                                       do_timing    = true;
+                                       print_timing = true;
+                               } else if (streq(option, "statev")) {
+                                       do_timing      = true;
+                                       produce_statev = true;
+                               } else if (strstart(option, "filtev=")) {
+                                       GET_ARG_AFTER(filtev, "--filtev=");
                                } else if (streq(option, "version")) {
                                        print_cparser_version();
                                        return EXIT_SUCCESS;
@@ -2100,6 +2163,7 @@ int main(int argc, char **argv)
                case PrintAst:
                case PrintFluffy:
                case PrintJna:
+               case PrintCompoundSizes:
                case PreprocessOnly:
                case ParseOnly:
                        outname = "-";
@@ -2145,7 +2209,25 @@ int main(int argc, char **argv)
                }
        }
 
+       if (produce_statev && units != NULL) {
+               /* attempt to guess a good name for the file */
+               const char *first_cup = units->name;
+               if (first_cup != NULL) {
+                       const char *dot = strrchr(first_cup, '.');
+                       const char *pos = dot ? dot : first_cup + strlen(first_cup);
+                       char        buf[pos-first_cup+1];
+                       strncpy(buf, first_cup, pos-first_cup);
+                       buf[pos-first_cup] = '\0';
+
+                       stat_ev_begin(buf, filtev);
+               }
+       }
+
        int result = compilation_loop(mode, units, standard, out);
+       if (stat_ev_enabled) {
+               stat_ev_end();
+       }
+
        if (result != EXIT_SUCCESS) {
                if (out != stdout)
                        unlink(outname);
@@ -2163,8 +2245,9 @@ int main(int argc, char **argv)
        }
 
        if (do_timing)
-               timer_term(stderr);
+               timer_term(print_timing ? stderr : NULL);
 
+       free_temp_files();
        obstack_free(&cppflags_obst, NULL);
        obstack_free(&ldflags_obst, NULL);
        obstack_free(&asflags_obst, NULL);