remove arch_irn_class_is macro as it hides usages of arch_irn_class_XXX from grep...

[libfirm] / ir / be / bemain.c

diff --git a/ir/be/bemain.c b/ir/be/bemain.c
index 4dde352..bc9623e 100644 (file)
--- a/ir/be/bemain.c
+++ b/ir/be/bemain.c
@@ -247,7 +247,7 @@ asm_constraint_flags_t be_parse_asm_constraints(const char *constraint)
                switch (*c) {
                case '#':
                        /* 'comment' stuff */
-                       while(*c != 0 && *c != ',')
+                       while (*c != 0 && *c != ',')
                                ++c;
                        break;
                case '*':
@@ -330,7 +330,8 @@ void be_opt_register(void)
 }
 
 /* Parse one argument. */
-int be_parse_arg(const char *arg) {
+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_for_entry(be_grp, '-', stdout);
@@ -355,7 +356,8 @@ static const backend_params be_params = {
 };
 
 /* Perform schedule verification if requested. */
-static void be_sched_vrfy(be_irg_t *birg, int vrfy_opt) {
+static void be_sched_vrfy(be_irg_t *birg, int vrfy_opt)
+{
        if (vrfy_opt == BE_VRFY_WARN) {
                be_verify_schedule(birg);
        } else if (vrfy_opt == BE_VRFY_ASSERT) {
@@ -436,7 +438,7 @@ static void be_done_env(be_main_env_t *env)
 static void dump(int mask, ir_graph *irg, const char *suffix,
                  void (*dumper)(ir_graph *, const char *))
 {
-       if(be_options.dump_flags & mask)
+       if (be_options.dump_flags & mask)
                be_dump(irg, suffix, dumper);
 }
 
@@ -479,7 +481,7 @@ static void initialize_birg(be_irg_t *birg, ir_graph *irg, be_main_env_t *env)
        dump(DUMP_INITIAL, irg, "-prepared", dump_ir_block_graph);
 }
 
-#define BE_TIMER_ONLY(code)   do { if (be_timing) { code; } } while(0)
+#define BE_TIMER_ONLY(code)   do { if (be_timing) { code; } } while (0)
 
 int be_timing;
 
@@ -561,7 +563,7 @@ static void be_main_loop(FILE *file_handle, const char *cup_name)
        be_info_init();
 
        /* First: initialize all birgs */
-       for(i = 0; i < num_birgs; ++i) {
+       for (i = 0; i < num_birgs; ++i) {
                ir_graph *irg = backend_irg_list ? backend_irg_list[i] : get_irp_irg(i);
                initialize_birg(&birgs[i], irg, &env);
        }
@@ -656,9 +658,7 @@ static void be_main_loop(FILE *file_handle, const char *cup_name)
 
                if (be_options.vrfy_option == BE_VRFY_WARN) {
                        be_check_dominance(irg);
-                       be_verify_out_edges(irg);
                } else if (be_options.vrfy_option == BE_VRFY_ASSERT) {
-                       assert(be_verify_out_edges(irg));
                        assert(be_check_dominance(irg) && "Dominance verification failed");
                }
 
@@ -671,9 +671,7 @@ static void be_main_loop(FILE *file_handle, const char *cup_name)
 
                if (be_options.vrfy_option == BE_VRFY_WARN) {
                        be_check_dominance(irg);
-                       be_verify_out_edges(irg);
                } else if (be_options.vrfy_option == BE_VRFY_ASSERT) {
-                       assert(be_verify_out_edges(irg));
                        assert(be_check_dominance(irg) && "Dominance verification failed");
                }
 
@@ -796,12 +794,10 @@ static void be_main_loop(FILE *file_handle, const char *cup_name)
                if (be_options.vrfy_option == BE_VRFY_WARN) {
                        irg_verify(irg, VRFY_ENFORCE_SSA);
                        be_check_dominance(irg);
-                       be_verify_out_edges(irg);
                        be_verify_schedule(birg);
                        be_verify_register_allocation(birg);
                } else if (be_options.vrfy_option == BE_VRFY_ASSERT) {
                        assert(irg_verify(irg, VRFY_ENFORCE_SSA) && "irg verification failed");
-                       assert(be_verify_out_edges(irg) && "out edge verification failed");
                        assert(be_check_dominance(irg) && "Dominance verification failed");
                        assert(be_verify_schedule(birg) && "Schedule verification failed");
                        assert(be_verify_register_allocation(birg)
@@ -934,5 +930,5 @@ unsigned be_put_ignore_regs(const be_irg_t *birg, const arch_register_class_t *c
        bitset_flip_all(bs);
        be_abi_put_ignore_regs(birg->abi, cls, bs);
 
-       return bitset_popcnt(bs);
+       return bitset_popcount(bs);
 }