fix trailing whitespaces and tabulators in the middle of a line
[libfirm] / ir / opt / opt_ldst.c
index 20ec4a4..342dc0f 100644 (file)
@@ -158,7 +158,8 @@ static void dump_block_list(ldst_env *env)
                for (op = entry->memop_forward; op != NULL; op = op->next) {
                        if (i == 0) {
                                DB((dbg, LEVEL_2, "\n\t"));
-                       }                       DB((dbg, LEVEL_2, "%+F", op->node));
+                       }
+                       DB((dbg, LEVEL_2, "%+F", op->node));
                        if ((op->flags & FLAG_KILL_ALL) == FLAG_KILL_ALL)
                                DB((dbg, LEVEL_2, "X"));
                        else if (op->flags & FLAG_KILL_ALL)
@@ -609,7 +610,7 @@ static ir_entity *find_constant_entity(ir_node *ptr)
                        ir_node *l = get_Sub_left(ptr);
                        ir_node *r = get_Sub_right(ptr);
 
-                       if (get_irn_mode(l) == get_irn_mode(ptr) &&     is_Const(r))
+                       if (get_irn_mode(l) == get_irn_mode(ptr) && is_Const(r))
                                ptr = l;
                        else
                                return NULL;
@@ -1690,7 +1691,7 @@ static int backward_antic(block_t *bl)
        }
 
        memcpy(bl->id_2_memop_antic, env.curr_id_2_memop, env.rbs_size * sizeof(env.curr_id_2_memop[0]));
-       if (! rbitset_equal(bl->anticL_in, env.curr_set, env.rbs_size)) {
+       if (! rbitsets_equal(bl->anticL_in, env.curr_set, env.rbs_size)) {
                /* changed */
                rbitset_copy(bl->anticL_in, env.curr_set, env.rbs_size);
                dump_curr(bl, "AnticL_in*");
@@ -2113,11 +2114,11 @@ static int insert_Load(block_t *bl)
                                                assert(last_mem != NULL);
                                                adr  = phi_translate(op->value.address, block, i);
                                                load = new_rd_Load(db, pred, last_mem, adr, mode, cons_none);
-                                               def  = new_r_Proj(pred, load, mode, pn_Load_res);
+                                               def  = new_r_Proj(load, mode, pn_Load_res);
                                                DB((dbg, LEVEL_1, "Created new %+F in %+F for party redundant %+F\n", load, pred, op->node));
 
                                                new_op                = alloc_memop(load);
-                                               new_op->mem           = new_r_Proj(pred, load, mode_M, pn_Load_M);
+                                               new_op->mem           = new_r_Proj(load, mode_M, pn_Load_M);
                                                new_op->value.address = adr;
                                                new_op->value.id      = op->value.id;
                                                new_op->value.mode    = mode;
@@ -2166,7 +2167,7 @@ static int insert_Load(block_t *bl)
        /* always update the map after gen/kill, as values might have been changed due to RAR/WAR/WAW */
        memcpy(bl->id_2_memop_avail, env.curr_id_2_memop, env.rbs_size * sizeof(env.curr_id_2_memop[0]));
 
-       if (!rbitset_equal(bl->avail_out, env.curr_set, env.rbs_size)) {
+       if (!rbitsets_equal(bl->avail_out, env.curr_set, env.rbs_size)) {
                /* the avail set has changed */
                rbitset_copy(bl->avail_out, env.curr_set, env.rbs_size);
                dump_curr(bl, "Avail_out*");
@@ -2308,15 +2309,12 @@ int opt_ldst(ir_graph *irg)
        current_ir_graph = irg;
 
        FIRM_DBG_REGISTER(dbg, "firm.opt.ldst");
-//     firm_dbg_set_mask(dbg, -1);
 
        DB((dbg, LEVEL_1, "\nDoing Load/Store optimization on %+F\n", irg));
 
        /* we need landing pads */
        remove_critical_cf_edges(irg);
 
-//     dump_ir_block_graph(irg, "-XXX");
-
        if (get_opt_alias_analysis()) {
                assure_irg_entity_usage_computed(irg);
                assure_irp_globals_entity_usage_computed();
@@ -2417,7 +2415,6 @@ int opt_ldst(ir_graph *irg)
                memset(bl->id_2_memop_antic, 0, env.rbs_size * sizeof(bl->id_2_memop_antic[0]));
        }
 
-//     dump_block_list(&env);
        (void) dump_block_list;
 
        calcAvail();
@@ -2442,8 +2439,6 @@ end:
        ir_nodemap_destroy(&env.adr_map);
        obstack_free(&env.obst, NULL);
 
-//     dump_ir_block_graph(irg, "-YYY");
-
 #ifdef DEBUG_libfirm
        DEL_ARR_F(env.id_2_address);
 #endif