diff options
| -rw-r--r-- | gcc/ChangeLog | 11 | ||||
| -rw-r--r-- | gcc/bitmap.h | 2 | ||||
| -rw-r--r-- | gcc/df.c | 4 | ||||
| -rw-r--r-- | gcc/except.c | 2 | ||||
| -rw-r--r-- | gcc/global.c | 12 | ||||
| -rw-r--r-- | gcc/tree-dfa.c | 2 | ||||
| -rw-r--r-- | gcc/tree-ssa-alias.c | 4 | ||||
| -rw-r--r-- | gcc/tree-ssa-live.h | 2 | ||||
| -rw-r--r-- | gcc/tree-ssa-loop-ivopts.c | 10 |
9 files changed, 27 insertions, 22 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index e2e6032374e..82a7d19cd06 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,16 @@ 2004-11-04 Nathan Sidwell <nathan@codesourcery.com> + * bitmap.h (bitmap_a_or_b, bitmap_a_and_b): Remove. + * df.c (dataflow_set_a_op_b): Use bitmap_and, bitmap_ior, + bitmap_and_into, bitmap_ior_into as appropriate. + * except.c (remove_eh_handler): Likewise. + * global.c (modify_bb_reg_pav, make_accurate_live_analysis): Likewise. + * tree-dfa.c (mark_new_vars_to_rename): Likewise. + * tree-ssa-alias.c (merge_pointed_to_info): Likewise. + * tree-ssa-live.h (live_merge_and_clear): Likewise. + * tree-ssa-loop-ivopts.c (find_best_candidate, try_add_cand_for): + Likewise. + * bitmap.c (bitmap_print): Make bitno unsigned. * bt-load.c (clear_btr_from_live_range, btr_def_live_range): Likewise. diff --git a/gcc/bitmap.h b/gcc/bitmap.h index acabca8ab25..9f89da8b39c 100644 --- a/gcc/bitmap.h +++ b/gcc/bitmap.h @@ -141,8 +141,6 @@ extern void bitmap_release_memory (void); /* A few compatibility/functions macros for compatibility with sbitmaps */ #define dump_bitmap(file, bitmap) bitmap_print (file, bitmap, "", "\n") #define bitmap_zero(a) bitmap_clear (a) -#define bitmap_a_or_b(a,b,c) bitmap_operation (a, b, c, BITMAP_IOR) -#define bitmap_a_and_b(a,b,c) bitmap_operation (a, b, c, BITMAP_AND) extern int bitmap_first_set_bit (bitmap); extern int bitmap_last_set_bit (bitmap); @@ -3750,11 +3750,11 @@ dataflow_set_a_op_b (enum set_representation repr, switch (op) { case DF_UNION: - bitmap_a_or_b (rslt, op1, op2); + bitmap_ior (rslt, op1, op2); break; case DF_INTERSECTION: - bitmap_a_and_b (rslt, op1, op2); + bitmap_and (rslt, op1, op2); break; default: diff --git a/gcc/except.c b/gcc/except.c index 2a2e8da14f8..c67a98205a2 100644 --- a/gcc/except.c +++ b/gcc/except.c @@ -2293,7 +2293,7 @@ remove_eh_handler (struct eh_region *region) if (!outer->aka) outer->aka = BITMAP_GGC_ALLOC (); if (region->aka) - bitmap_a_or_b (outer->aka, outer->aka, region->aka); + bitmap_ior_into (outer->aka, region->aka); bitmap_set_bit (outer->aka, region->region_number); } diff --git a/gcc/global.c b/gcc/global.c index 728914b947f..0cda11f83b5 100644 --- a/gcc/global.c +++ b/gcc/global.c @@ -2306,7 +2306,7 @@ modify_bb_reg_pav (basic_block bb, basic_block pred, bool changed_p) bb_pavin = bb_info->pavin; bb_pavout = bb_info->pavout; if (pred->index != ENTRY_BLOCK) - bitmap_a_or_b (bb_pavin, bb_pavin, BB_INFO (pred)->pavout); + bitmap_ior_into (bb_pavin, BB_INFO (pred)->pavout); changed_p |= bitmap_ior_and_compl (bb_pavout, bb_info->avloc, bb_pavin, bb_info->killed); return changed_p; @@ -2405,14 +2405,14 @@ modify_reg_pav (void) insn if the pseudo-register is used first time in given BB and not lived at the BB start. To prevent this we don't change life information for such pseudo-registers. */ - bitmap_a_or_b (bb_info->pavin, bb_info->pavin, bb_info->earlyclobber); + bitmap_ior_into (bb_info->pavin, bb_info->earlyclobber); #ifdef STACK_REGS /* We can not use the same stack register for uninitialized pseudo-register and another living pseudo-register because if the uninitialized pseudo-register dies, subsequent pass reg-stack will be confused (it will believe that the other register dies). */ - bitmap_a_or_b (bb_info->pavin, bb_info->pavin, stack_regs); + bitmap_ior_into (bb_info->pavin, stack_regs); #endif } #ifdef STACK_REGS @@ -2444,10 +2444,8 @@ make_accurate_live_analysis (void) { bb_info = BB_INFO (bb); - bitmap_a_and_b (bb->global_live_at_start, bb->global_live_at_start, - bb_info->pavin); - bitmap_a_and_b (bb->global_live_at_end, bb->global_live_at_end, - bb_info->pavout); + bitmap_and_into (bb->global_live_at_start, bb_info->pavin); + bitmap_and_into (bb->global_live_at_end, bb_info->pavout); } free_bb_info (); } diff --git a/gcc/tree-dfa.c b/gcc/tree-dfa.c index 6dc49a021fc..90ff710a44b 100644 --- a/gcc/tree-dfa.c +++ b/gcc/tree-dfa.c @@ -1004,7 +1004,7 @@ mark_new_vars_to_rename (tree stmt, bitmap vars_to_rename) if (found_exposed_symbol || v_may_defs_before > v_may_defs_after || v_must_defs_before > v_must_defs_after) - bitmap_a_or_b (vars_to_rename, vars_to_rename, vars_in_vops_to_rename); + bitmap_ior_into (vars_to_rename, vars_in_vops_to_rename); BITMAP_XFREE (vars_in_vops_to_rename); } diff --git a/gcc/tree-ssa-alias.c b/gcc/tree-ssa-alias.c index 87f460ac2b2..976f2d1b0fc 100644 --- a/gcc/tree-ssa-alias.c +++ b/gcc/tree-ssa-alias.c @@ -1740,9 +1740,7 @@ merge_pointed_to_info (struct alias_info *ai, tree dest, tree orig) bitmap_copy (dest_pi->pt_vars, orig_pi->pt_vars); } else - bitmap_a_or_b (dest_pi->pt_vars, - dest_pi->pt_vars, - orig_pi->pt_vars); + bitmap_ior_into (dest_pi->pt_vars, orig_pi->pt_vars); } } else diff --git a/gcc/tree-ssa-live.h b/gcc/tree-ssa-live.h index c0c1d183ab3..ee6ee4c4b76 100644 --- a/gcc/tree-ssa-live.h +++ b/gcc/tree-ssa-live.h @@ -309,7 +309,7 @@ live_var_map (tree_live_info_p live) static inline void live_merge_and_clear (tree_live_info_p live, int p1, int p2) { - bitmap_a_or_b (live->livein[p1], live->livein[p1], live->livein[p2]); + bitmap_ior_into (live->livein[p1], live->livein[p2]); bitmap_zero (live->livein[p2]); } diff --git a/gcc/tree-ssa-loop-ivopts.c b/gcc/tree-ssa-loop-ivopts.c index f457f7adf27..ce1eccccfa3 100644 --- a/gcc/tree-ssa-loop-ivopts.c +++ b/gcc/tree-ssa-loop-ivopts.c @@ -3473,8 +3473,8 @@ find_best_candidate (struct ivopts_data *data, { asol = BITMAP_XMALLOC (); - bitmap_a_or_b (asol, data->important_candidates, use->related_cands); - bitmap_a_and_b (asol, asol, sol); + bitmap_ior (asol, data->important_candidates, use->related_cands); + bitmap_and_into (asol, sol); } EXECUTE_IF_SET_IN_BITMAP (asol, 0, c, bi) @@ -3500,7 +3500,7 @@ find_best_candidate (struct ivopts_data *data, goto next_cand; } if (used_inv) - bitmap_a_or_b (used_inv, used_inv, depends_on); + bitmap_ior_into (used_inv, depends_on); } cnd = acnd; @@ -3623,7 +3623,7 @@ try_add_cand_for (struct ivopts_data *data, bitmap ivs, bitmap inv, bitmap_copy (act_ivs, ivs); bitmap_set_bit (act_ivs, cand->id); if (depends_on) - bitmap_a_or_b (act_inv, inv, depends_on); + bitmap_ior (act_inv, inv, depends_on); else bitmap_copy (act_inv, inv); act_cost = set_cost_up_to (data, act_ivs, act_inv, use->id + 1); @@ -3651,7 +3651,7 @@ try_add_cand_for (struct ivopts_data *data, bitmap ivs, bitmap inv, bitmap_copy (act_ivs, ivs); bitmap_set_bit (act_ivs, cp->cand->id); if (cp->depends_on) - bitmap_a_or_b (act_inv, inv, cp->depends_on); + bitmap_ior (act_inv, inv, cp->depends_on); else bitmap_copy (act_inv, inv); act_cost = set_cost_up_to (data, act_ivs, act_inv, use->id + 1); |