more asserts

[cparser] / main.c

diff --git a/main.c b/main.c
index acd2f48..299be22 100644 (file)
--- a/main.c
+++ b/main.c
@@ -4,6 +4,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdbool.h>
 #include <errno.h>
 #include <string.h>
 #include <assert.h>
@@ -22,8 +23,13 @@
 #include "ast2firm.h"
 #include "adt/error.h"
 
+#ifndef PREPROCESSOR
 #define PREPROCESSOR "cpp"
+#endif
+
+#ifndef LINKER
 #define LINKER       "gcc"
+#endif
 
 #ifdef _WIN32
 /* remap some names */
@@ -31,16 +37,17 @@
 #define pclose(file)      _pclose(file)
 #endif /* _WIN32 */
 
-static int verbose;
+static int  verbose;
+static bool do_dump;
 
 static const ir_settings_if_conv_t *if_conv_info = NULL;
+static const backend_params        *be_params    = NULL;
 
 static void initialize_firm(void)
 {
        be_opt_register();
        firm_init_options(NULL, 0, NULL);
 
-       const backend_params *be_params;
        firm_parameter_t params;
        memset(&params, 0, sizeof(params));
 
@@ -52,7 +59,7 @@ static void initialize_firm(void)
 
        /* initialize backend */
        be_params = be_init();
-       be_set_debug_retrieve(retrieve_dbg);
+       ir_set_debug_retrieve(retrieve_dbg);
        params.arch_op_settings = be_params->arch_op_settings;
        if_conv_info            = be_params->if_conv_info;
 
@@ -83,7 +90,9 @@ static void initialize_firm(void)
 
 static void dump(ir_graph *irg, const char *suffix)
 {
-       dump_ir_block_graph(irg, suffix);
+       if(do_dump) {
+               dump_ir_block_graph(irg, suffix);
+       }
 }
 
 static void get_output_name(char *buf, size_t buflen, const char *inputname,
@@ -158,7 +167,8 @@ static FILE* preprocess(const char *in)
 {
        char buf[4096];
 
-       snprintf(buf, sizeof(buf), PREPROCESSOR " %s -o -",in);
+       snprintf(buf, sizeof(buf), PREPROCESSOR " %s", in);
+
        if(verbose) {
                puts(buf);
        }
@@ -230,15 +240,34 @@ static void optimize(void)
 
        optimize_funccalls(0);
 
+       lwrdw_param_t lwrdw_param = {
+               1,
+               1,
+               mode_Ls, mode_Lu,
+               mode_Is, mode_Iu,
+               def_create_intrinsic_fkt,
+               NULL
+       };
+       if (be_params->arch_create_intrinsic_fkt) {
+               lwrdw_param.create_intrinsic = be_params->arch_create_intrinsic_fkt;
+               lwrdw_param.ctx              = be_params->create_intrinsic_ctx;
+       }
+
        for(int i = 0; i < get_irp_n_irgs(); ++i) {
                ir_graph *irg = get_irp_irg(i);
 
                optimize_graph_df(irg);
-               dump(irg, "-localopt");
+               dump(irg, "-01-localopt");
                place_code(irg);
-               dump(irg, "-place");
+               dump(irg, "-02-place");
                optimize_cf(irg);
-               dump(irg, "-cf");
+               dump(irg, "-03-cf");
+               lower_dw_ops(&lwrdw_param);
+               dump(irg, "-04-dw");
+               optimize_graph_df(irg);
+               dump(irg, "-05-localopt");
+               optimize_cf(irg);
+               dump(irg, "-06-cf");
        }
 }
 
@@ -264,9 +293,9 @@ int main(int argc, char **argv)
 
        init_symbol_table();
        init_tokens();
-       init_lexer();
        init_types();
        init_typehash();
+       init_lexer();
        init_ast();
        init_parser();
        init_ast2firm();
@@ -294,11 +323,50 @@ int main(int argc, char **argv)
                        mode = PrintAst;
                } else if(strcmp(arg, "--print-fluffy") == 0) {
                        mode = PrintFluffy;
+               } else if(strcmp(arg, "--dump") == 0) {
+                       do_dump = true;
                } else if(strcmp(arg, "-v") == 0) {
                        verbose = 1;
+               } else if(arg[0] == '-' && arg[1] == 'f') {
+                       const char *opt = &arg[2];
+                       if(opt[0] == 0) {
+                               ++i;
+                               if(i >= argc) {
+                                       usage(argv[0]);
+                                       return 1;
+                               }
+                               opt = argv[i];
+                               if(opt[0] == '-') {
+                                       usage(argv[0]);
+                                       return 1;
+                               }
+                       }
+                       //firm_option(opt);
+               } else if(arg[0] == '-' && arg[1] == 'b') {
+                       const char *opt = &arg[2];
+                       if(opt[0] == 0) {
+                               ++i;
+                               if(i >= argc) {
+                                       usage(argv[0]);
+                                       return 1;
+                               }
+                               opt = argv[i];
+                               if(opt[0] == '-') {
+                                       usage(argv[0]);
+                                       return 1;
+                               }
+                       }
+                       //firm_be_option(opt);
                } else if(arg[0] == '-') {
-                       usage(argv[0]);
-                       return 1;
+                       if (arg[1] == 'D' ||
+                                       arg[1] == 'O' ||
+                                       arg[1] == 'f' ||
+                                       strncmp(arg + 1, "std=", 4) == 0) {
+                               fprintf(stderr, "Warning: Ignoring option '%s'\n", arg);
+                       } else {
+                               usage(argv[0]);
+                               return 1;
+                       }
                } else {
                        if(input != NULL) {
                                fprintf(stderr, "Error: multiple input files specified\n");
@@ -369,9 +437,9 @@ int main(int argc, char **argv)
        exit_ast2firm();
        exit_parser();
        exit_ast();
+       exit_lexer();
        exit_typehash();
        exit_types();
-       exit_lexer();
        exit_tokens();
        exit_symbol_table();
        return 0;