diff options
Diffstat (limited to 'gcc/flow.c')
| -rw-r--r-- | gcc/flow.c | 38 |
1 files changed, 16 insertions, 22 deletions
@@ -1114,11 +1114,9 @@ calculate_global_regs_live (sbitmap blocks_in, sbitmap blocks_out, int flags) /* ??? Abnormal call edges ignored for the moment, as this gets confused by sibling call edges, which crashes reg-stack. */ if (e->flags & EDGE_EH) - { - bitmap_operation (tmp, sb->global_live_at_start, - invalidated_by_call, BITMAP_AND_COMPL); - IOR_REG_SET (new_live_at_end, tmp); - } + bitmap_ior_and_compl_into (new_live_at_end, + sb->global_live_at_start, + invalidated_by_call); else IOR_REG_SET (new_live_at_end, sb->global_live_at_start); @@ -1188,8 +1186,8 @@ calculate_global_regs_live (sbitmap blocks_in, sbitmap blocks_out, int flags) precalculated local_live, however with PROP_SCAN_DEAD_CODE local_live is really dependent on live_at_end. */ CLEAR_REG_SET (tmp); - rescan = bitmap_operation (tmp, bb->global_live_at_end, - new_live_at_end, BITMAP_AND_COMPL); + rescan = bitmap_and_compl (tmp, bb->global_live_at_end, + new_live_at_end); if (! rescan) { @@ -1201,8 +1199,8 @@ calculate_global_regs_live (sbitmap blocks_in, sbitmap blocks_out, int flags) block. We can miss changes in those sets if we only compare the new live_at_end against the previous one. */ CLEAR_REG_SET (tmp); - rescan = bitmap_operation (tmp, new_live_at_end, - bb->cond_local_set, BITMAP_AND); + rescan = bitmap_and (tmp, new_live_at_end, + bb->cond_local_set); } if (! rescan) @@ -1210,16 +1208,15 @@ calculate_global_regs_live (sbitmap blocks_in, sbitmap blocks_out, int flags) /* Find the set of changed bits. Take this opportunity to notice that this set is empty and early out. */ CLEAR_REG_SET (tmp); - changed = bitmap_operation (tmp, bb->global_live_at_end, - new_live_at_end, BITMAP_XOR); + changed = bitmap_xor (tmp, bb->global_live_at_end, + new_live_at_end); if (! changed) continue; /* If any of the changed bits overlap with local_set, we'll have to rescan the block. Detect overlap by the AND with ~local_set turning off bits. */ - rescan = bitmap_operation (tmp, tmp, bb->local_set, - BITMAP_AND_COMPL); + rescan = bitmap_and_compl_into (tmp, bb->local_set); } } @@ -1232,14 +1229,11 @@ calculate_global_regs_live (sbitmap blocks_in, sbitmap blocks_out, int flags) { /* Add to live_at_start the set of all registers in new_live_at_end that aren't in the old live_at_end. */ - - bitmap_operation (tmp, new_live_at_end, bb->global_live_at_end, - BITMAP_AND_COMPL); + + changed = bitmap_ior_and_compl_into (bb->global_live_at_start, + new_live_at_end, + bb->global_live_at_end); COPY_REG_SET (bb->global_live_at_end, new_live_at_end); - - changed = bitmap_operation (bb->global_live_at_start, - bb->global_live_at_start, - tmp, BITMAP_IOR); if (! changed) continue; } @@ -1860,8 +1854,8 @@ init_propagate_block_info (basic_block bb, regset live, regset local_set, } /* Compute which register lead different lives in the successors. */ - if (bitmap_operation (diff, bb_true->global_live_at_start, - bb_false->global_live_at_start, BITMAP_XOR)) + if (bitmap_xor (diff, bb_true->global_live_at_start, + bb_false->global_live_at_start)) { /* Extract the condition from the branch. */ rtx set_src = SET_SRC (pc_set (BB_END (bb))); |