aboutsummaryrefslogtreecommitdiff
path: root/gcc/bt-load.c
diff options
context:
space:
mode:
Diffstat (limited to 'gcc/bt-load.c')
-rw-r--r--gcc/bt-load.c78
1 files changed, 39 insertions, 39 deletions
diff --git a/gcc/bt-load.c b/gcc/bt-load.c
index bd1761616c9..1d792ab3b65 100644
--- a/gcc/bt-load.c
+++ b/gcc/bt-load.c
@@ -281,7 +281,7 @@ find_btr_def_group (btr_def_group *all_btr_def_groups, btr_def def)
if (!this_group)
{
- this_group = obstack_alloc (&migrate_btrl_obstack,
+ this_group = (btr_def_group) obstack_alloc (&migrate_btrl_obstack,
sizeof (struct btr_def_group_s));
this_group->src = def_src;
this_group->members = NULL;
@@ -304,31 +304,31 @@ add_btr_def (fibheap_t all_btr_defs, basic_block bb, int insn_luid, rtx insn,
unsigned int dest_reg, int other_btr_uses_before_def,
btr_def_group *all_btr_def_groups)
{
- btr_def this
- = obstack_alloc (&migrate_btrl_obstack, sizeof (struct btr_def_s));
- this->bb = bb;
- this->luid = insn_luid;
- this->insn = insn;
- this->btr = dest_reg;
- this->cost = basic_block_freq (bb);
- this->has_ambiguous_use = 0;
- this->other_btr_uses_before_def = other_btr_uses_before_def;
- this->other_btr_uses_after_use = 0;
- this->next_this_bb = NULL;
- this->next_this_group = NULL;
- this->uses = NULL;
- this->live_range = NULL;
- find_btr_def_group (all_btr_def_groups, this);
-
- fibheap_insert (all_btr_defs, -this->cost, this);
+ btr_def it
+ = (btr_def) obstack_alloc (&migrate_btrl_obstack, sizeof (struct btr_def_s));
+ it->bb = bb;
+ it->luid = insn_luid;
+ it->insn = insn;
+ it->btr = dest_reg;
+ it->cost = basic_block_freq (bb);
+ it->has_ambiguous_use = 0;
+ it->other_btr_uses_before_def = other_btr_uses_before_def;
+ it->other_btr_uses_after_use = 0;
+ it->next_this_bb = NULL;
+ it->next_this_group = NULL;
+ it->uses = NULL;
+ it->live_range = NULL;
+ find_btr_def_group (all_btr_def_groups, it);
+
+ fibheap_insert (all_btr_defs, -it->cost, it);
if (dump_file)
fprintf (dump_file,
"Found target reg definition: sets %u { bb %d, insn %d }%s priority %d\n",
- dest_reg, bb->index, INSN_UID (insn), (this->group ? "" : ":not const"),
- this->cost);
+ dest_reg, bb->index, INSN_UID (insn), (it->group ? "" : ":not const"),
+ it->cost);
- return this;
+ return it;
}
/* Create a new target register user structure, for a use in block BB,
@@ -356,7 +356,7 @@ new_btr_user (basic_block bb, int insn_luid, rtx insn)
usep = NULL;
}
use = usep ? *usep : NULL_RTX;
- user = obstack_alloc (&migrate_btrl_obstack, sizeof (struct btr_user_s));
+ user = (struct btr_user_s *) obstack_alloc (&migrate_btrl_obstack, sizeof (struct btr_user_s));
user->bb = bb;
user->luid = insn_luid;
user->insn = insn;
@@ -427,7 +427,7 @@ typedef struct {
static void
note_btr_set (rtx dest, rtx set ATTRIBUTE_UNUSED, void *data)
{
- defs_uses_info *info = data;
+ defs_uses_info *info = (defs_uses_info *) data;
int regno, end_regno;
if (!REG_P (dest))
@@ -1278,7 +1278,7 @@ migrate_btr_def (btr_def def, int min_cost)
HARD_REG_SET btrs_live_in_range;
int btr_used_near_def = 0;
int def_basic_block_freq;
- basic_block try;
+ basic_block check;
int give_up = 0;
int def_moved = 0;
btr_user user;
@@ -1332,31 +1332,31 @@ migrate_btr_def (btr_def def, int min_cost)
def_basic_block_freq = basic_block_freq (def->bb);
- for (try = get_immediate_dominator (CDI_DOMINATORS, def->bb);
- !give_up && try && try != ENTRY_BLOCK_PTR && def->cost >= min_cost;
- try = get_immediate_dominator (CDI_DOMINATORS, try))
+ for (check = get_immediate_dominator (CDI_DOMINATORS, def->bb);
+ !give_up && check && check != ENTRY_BLOCK_PTR && def->cost >= min_cost;
+ check = get_immediate_dominator (CDI_DOMINATORS, check))
{
/* Try to move the instruction that sets the target register into
basic block TRY. */
- int try_freq = basic_block_freq (try);
+ int try_freq = basic_block_freq (check);
edge_iterator ei;
edge e;
/* If TRY has abnormal edges, skip it. */
- FOR_EACH_EDGE (e, ei, try->succs)
+ FOR_EACH_EDGE (e, ei, check->succs)
if (e->flags & EDGE_COMPLEX)
break;
if (e)
continue;
if (dump_file)
- fprintf (dump_file, "trying block %d ...", try->index);
+ fprintf (dump_file, "trying block %d ...", check->index);
if (try_freq < def_basic_block_freq
|| (try_freq == def_basic_block_freq && btr_used_near_def))
{
int btr;
- augment_live_range (live_range, &btrs_live_in_range, def->bb, try,
+ augment_live_range (live_range, &btrs_live_in_range, def->bb, check,
flag_btr_bb_exclusive);
if (dump_file)
{
@@ -1367,7 +1367,7 @@ migrate_btr_def (btr_def def, int min_cost)
btr = choose_btr (btrs_live_in_range);
if (btr != -1)
{
- move_btr_def (try, btr, def, live_range, &btrs_live_in_range);
+ move_btr_def (check, btr, def, live_range, &btrs_live_in_range);
bitmap_copy(live_range, def->live_range);
btr_used_near_def = 0;
def_moved = 1;
@@ -1421,7 +1421,7 @@ migrate_btr_defs (enum reg_class btr_class, int allow_callee_save)
CLEAR_HARD_REG_SET (all_btrs);
for (first_btr = -1, reg = 0; reg < FIRST_PSEUDO_REGISTER; reg++)
- if (TEST_HARD_REG_BIT (reg_class_contents[(int) btr_class], reg)
+ if (TEST_HARD_REG_BIT (reg_class_contents[btr_class], reg)
&& (allow_callee_save || call_used_regs[reg] || regs_ever_live[reg]))
{
SET_HARD_REG_BIT (all_btrs, reg);
@@ -1430,14 +1430,14 @@ migrate_btr_defs (enum reg_class btr_class, int allow_callee_save)
first_btr = reg;
}
- btrs_live = xcalloc (n_basic_blocks, sizeof (HARD_REG_SET));
- btrs_live_at_end = xcalloc (n_basic_blocks, sizeof (HARD_REG_SET));
+ btrs_live = XCNEWVEC (HARD_REG_SET, n_basic_blocks);
+ btrs_live_at_end = XCNEWVEC (HARD_REG_SET, n_basic_blocks);
build_btr_def_use_webs (all_btr_defs);
while (!fibheap_empty (all_btr_defs))
{
- btr_def def = fibheap_extract_min (all_btr_defs);
+ btr_def def = (btr_def) fibheap_extract_min (all_btr_defs);
int min_cost = -fibheap_min_key (all_btr_defs);
if (migrate_btr_def (def, min_cost))
{
@@ -1462,8 +1462,8 @@ migrate_btr_defs (enum reg_class btr_class, int allow_callee_save)
void
branch_target_load_optimize (bool after_prologue_epilogue_gen)
{
- enum reg_class class = targetm.branch_target_register_class ();
- if (class != NO_REGS)
+ enum reg_class btr_class = (enum reg_class) targetm.branch_target_register_class ();
+ if (btr_class != NO_REGS)
{
/* Initialize issue_rate. */
if (targetm.sched.issue_rate)
@@ -1482,7 +1482,7 @@ branch_target_load_optimize (bool after_prologue_epilogue_gen)
/* Dominator info is also needed for migrate_btr_def. */
calculate_dominance_info (CDI_DOMINATORS);
- migrate_btr_defs (class,
+ migrate_btr_defs (btr_class,
(targetm.branch_target_register_callee_saved
(after_prologue_epilogue_gen)));
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-22 10:41:26 +0000