name the option 'verify' because I can never remember 'vrfy'

[libfirm] / ir / be / bemain.c

diff --git a/ir/be/bemain.c b/ir/be/bemain.c
index cbca78d..b87ed06 100644 (file)
--- a/ir/be/bemain.c
+++ b/ir/be/bemain.c
@@ -155,7 +155,7 @@ static const lc_opt_table_entry_t be_main_options[] = {
        LC_OPT_ENT_BOOL     ("omitleaffp", "omit frame pointer in leaf routines",                 &be_options.omit_leaf_fp),
        LC_OPT_ENT_BOOL     ("pic",        "create PIC code",                                     &be_options.pic),
        LC_OPT_ENT_BOOL     ("gprof",      "create gprof profiling code",                         &be_options.gprof),
-       LC_OPT_ENT_ENUM_PTR ("vrfy",       "verify the backend irg",                              &vrfy_var),
+       LC_OPT_ENT_ENUM_PTR ("verify",       "verify the backend irg",                              &vrfy_var),
        LC_OPT_ENT_BOOL     ("time",       "get backend timing statistics",                       &be_options.timing),
        LC_OPT_ENT_BOOL     ("profile",    "instrument the code for execution count profiling",   &be_options.opt_profile),
        LC_OPT_ENT_ENUM_PTR ("sched",      "select a scheduler",                                  &sched_var),
@@ -317,25 +317,24 @@ void be_opt_register(void)
        lc_opt_entry_t *be_grp;
        static int run_once = 0;
 
-       if (run_once) {
+       if (run_once)
                return;
-       }
-       run_once     = 1;
-
-       be_init_modules();
+       run_once = 1;
 
        be_grp = lc_opt_get_grp(firm_opt_get_root(), "be");
        lc_opt_add_table(be_grp, be_main_options);
 
        be_add_module_list_opt(be_grp, "isa", "the instruction set architecture",
                               &isa_ifs, (void**) &isa_if);
+
+       be_init_modules();
 }
 
 /* Parse one argument. */
 int be_parse_arg(const char *arg) {
        lc_opt_entry_t *be_grp = lc_opt_get_grp(firm_opt_get_root(), "be");
        if (strcmp(arg, "help") == 0 || (arg[0] == '?' && arg[1] == '\0')) {
-               lc_opt_print_help(be_grp, stdout);
+               lc_opt_print_help_for_entry(be_grp, '-', stdout);
                return -1;
        }
        return lc_opt_from_single_arg(be_grp, NULL, arg, NULL);
@@ -881,11 +880,13 @@ void be_main(FILE *file_handle, const char *cup_name)
 
        /* The user specified another config file to read. do that now. */
        if (config_file[0] != '\0') {
-               FILE *f;
+               FILE *f = fopen(config_file, "rt");
 
-               if ((f = fopen(config_file, "rt")) != NULL) {
+               if (f != NULL) {
                        lc_opt_from_file(config_file, f, NULL);
                        fclose(f);
+               } else {
+                       fprintf(stderr, "Warning: Cannot open config file '%s'\n", config_file);
                }
        }
 
@@ -945,7 +946,7 @@ unsigned be_put_ignore_regs(const be_irg_t *birg, const arch_register_class_t *c
        else
                bitset_clear_all(bs);
 
-       assert(bitset_size(bs) == (unsigned)cls->n_regs);
+       assert(bitset_size(bs) == cls->n_regs);
        arch_put_non_ignore_regs(cls, bs);
        bitset_flip_all(bs);
        be_abi_put_ignore_regs(birg->abi, cls, bs);