FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

lra: use rtx_insn

Browse source 
gcc/
	* lra-int.h (struct lra_insn_recog_data): Strengthen field "insn"
	from rtx to rtx_insn *.
	(lra_push_insn): Likewise for 1st param.
	(lra_push_insn_and_update_insn_regno_info): Likewise.
	(lra_pop_insn): Likewise for return type.
	(lra_invalidate_insn_data): Likewise for 1st param.
	(lra_set_insn_deleted): Likewise.
	(lra_delete_dead_insn): Likewise.
	(lra_process_new_insns): Likewise for first 3 params.
	(lra_set_insn_recog_data): Likewise for 1st param.
	(lra_update_insn_recog_data): Likewise.
	(lra_set_used_insn_alternative): Likewise.
	(lra_invalidate_insn_regno_info): Likewise.
	(lra_update_insn_regno_info): Likewise.
	(lra_former_scratch_operand_p): Likewise.
	(lra_eliminate_regs_1): Likewise.
	(lra_get_insn_recog_data): Likewise.

	* lra-assigns.c (assign_by_spills): Strengthen local "insn" from
	rtx to rtx_insn *.

	* lra-coalesce.c (move_freq_compare_func): Likewise for locals
	"mv1" and "mv2".
	(substitute_within_insn): New.
	(lra_coalesce): Strengthen locals "mv", "insn", "next" from rtx to
	rtx_insn *.  Strengthen sorted_moves from rtx * to rxt_insn **.
	Replace call to "substitute" with call to substitute_within_insn.

	* lra-constraints.c (curr_insn): Strengthen from rtx to
	rtx_insn *.
	(get_equiv_with_elimination): Likewise for param "insn".
	(match_reload): Strengthen params "before" and "after" from rtx *
	to rtx_insn **.
	(emit_spill_move): Likewise for return type.  Add a checked cast
	to rtx_insn * on result of gen_move_insn for now.
	(check_and_process_move): Likewise for local "before".  Replace
	NULL_RTX with NULL when referring to insns.
	(process_addr_reg): Strengthen params "before" and "after" from
	rtx * to rtx_insn **.
	(insert_move_for_subreg): Likewise.
	(simplify_operand_subreg): Strengthen locals "before" and "after"
	from rtx to rtx_insn *.
	(process_address_1): Strengthen params "before" and "after" from
	rtx * to rtx_insn **.  Strengthen locals "insns", "last_insn" from
	rtx to rtx_insn *.
	(process_address): Strengthen params "before" and "after" from
	rtx * to rtx_insn **.
	(emit_inc): Strengthen local "last" from rtx to rtx_insn *.
	(curr_insn_transform): Strengthen locals "before" and "after"
	from rtx to rtx_insn *.  Replace NULL_RTX with NULL when referring
	to insns.
	(loc_equivalence_callback): Update cast of "data", changing
	resulting type from rtx to rtx_insn *.
	(substitute_pseudo_within_insn): New.
	(inherit_reload_reg): Strengthen param "insn" from rtx to
	rtx_insn *; likewise for local "new_insns".  Replace NULL_RTX with
	NULL when referring to insns.  Add a checked cast to rtx_insn *
	when using usage_insn to invoke lra_update_insn_regno_info.
	(split_reg): Strengthen param "insn" from rtx to rtx_insn *;
	likewise for locals "restore", "save".  Add checked casts to
	rtx_insn * when using usage_insn to invoke
	lra_update_insn_regno_info and lra_process_new_insns.  Replace
	NULL_RTX with NULL when referring to insns.
	(split_if_necessary): Strengthen param "insn" from rtx to
	rtx_insn *.
	(update_ebb_live_info): Likewise for params "head", "tail" and local
	"prev_insn".
	(get_last_insertion_point): Likewise for return type and local "insn".
	(get_live_on_other_edges): Likewise for local "last".
	(inherit_in_ebb): Likewise for params "head", "tail" and locals
	"prev_insn", "next_insn", "restore".
	(remove_inheritance_pseudos): Likewise for local "prev_insn".
	(undo_optional_reloads): Likewise for local "insn".

	* lra-eliminations.c (lra_eliminate_regs_1): Likewise for param
	"insn".
	(lra_eliminate_regs): Replace NULL_RTX with NULL when referring to
	insns.
	(eliminate_regs_in_insn): Strengthen param "insn" from rtx to
	rtx_insn *.
	(spill_pseudos): Likewise for local "insn".
	(init_elimination): Likewise.
	(process_insn_for_elimination): Likewise for param "insn".

	* lra-lives.c (curr_insn): Likewise.;

	* lra-spills.c (assign_spill_hard_regs): Likewise for local "insn".
	(remove_pseudos): Likewise for param "insn".
	(spill_pseudos): Likewise for local "insn".
	(lra_final_code_change): Likewise for locals "insn", "curr".

	* lra.c (lra_invalidate_insn_data): Likewise for param "insn".
	(lra_set_insn_deleted): Likewise.
	(lra_delete_dead_insn): Likewise, and for local "prev".
	(new_insn_reg): Likewise for param "insn".
	(lra_set_insn_recog_data): Likewise.
	(lra_update_insn_recog_data): Likewise.
	(lra_set_used_insn_alternative): Likewise.
	(get_insn_freq): Likewise.
	(invalidate_insn_data_regno_info): Likewise.
	(lra_invalidate_insn_regno_info): Likewise.
	(lra_update_insn_regno_info): Likewise.
	(lra_constraint_insn_stack): Strengthen from vec<rtx> to
	vec<rtx_insn *>.
	(lra_push_insn_1): Strengthen param "insn" from rtx to
	rtx_insn *.
	(lra_push_insn): Likewise.
	(lra_push_insn_and_update_insn_regno_info): Likewise.
	(lra_pop_insn): Likewise for return type and local "insn".
	(push_insns): Likewise for params "from", "to", and local "insn".
	(setup_sp_offset): Likewise for params "from", "last" and locals
	"before", "insn".
	(lra_process_new_insns): Likewise for params "insn", "before",
	"after" and local "last".
	(struct sloc): Likewise for field "insn".
	(lra_former_scratch_operand_p): Likewise for param "insn".
	(remove_scratches): Likewise for locals "insn", "last".
	(check_rtl): Likewise for local "insn".
	(add_auto_inc_notes): Likewise for param "insn".
	(update_inc_notes): Likewise for local "insn".
	(lra): Replace NULL_RTX with NULL when referring to insn.

From-SVN: r214348
This commit is contained in:
David Malcolm 2014-08-22 18:36:35 +00:00 • committed by David Malcolm
parent e967cc2f9a
commit cfa434f6d2
9 changed files with 286 additions and 120 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

124
gcc/ChangeLog
View file

@ -1,3 +1,127 @@
2014-08-22 David Malcolm <dmalcolm@redhat.com>
* lra-int.h (struct lra_insn_recog_data): Strengthen field "insn"
from rtx to rtx_insn *.
(lra_push_insn): Likewise for 1st param.
(lra_push_insn_and_update_insn_regno_info): Likewise.
(lra_pop_insn): Likewise for return type.
(lra_invalidate_insn_data): Likewise for 1st param.
(lra_set_insn_deleted): Likewise.
(lra_delete_dead_insn): Likewise.
(lra_process_new_insns): Likewise for first 3 params.
(lra_set_insn_recog_data): Likewise for 1st param.
(lra_update_insn_recog_data): Likewise.
(lra_set_used_insn_alternative): Likewise.
(lra_invalidate_insn_regno_info): Likewise.
(lra_update_insn_regno_info): Likewise.
(lra_former_scratch_operand_p): Likewise.
(lra_eliminate_regs_1): Likewise.
(lra_get_insn_recog_data): Likewise.
* lra-assigns.c (assign_by_spills): Strengthen local "insn" from
rtx to rtx_insn *.
* lra-coalesce.c (move_freq_compare_func): Likewise for locals
"mv1" and "mv2".
(substitute_within_insn): New.
(lra_coalesce): Strengthen locals "mv", "insn", "next" from rtx to
rtx_insn *. Strengthen sorted_moves from rtx * to rxt_insn **.
Replace call to "substitute" with call to substitute_within_insn.
* lra-constraints.c (curr_insn): Strengthen from rtx to
rtx_insn *.
(get_equiv_with_elimination): Likewise for param "insn".
(match_reload): Strengthen params "before" and "after" from rtx *
to rtx_insn **.
(emit_spill_move): Likewise for return type. Add a checked cast
to rtx_insn * on result of gen_move_insn for now.
(check_and_process_move): Likewise for local "before". Replace
NULL_RTX with NULL when referring to insns.
(process_addr_reg): Strengthen params "before" and "after" from
rtx * to rtx_insn **.
(insert_move_for_subreg): Likewise.
(simplify_operand_subreg): Strengthen locals "before" and "after"
from rtx to rtx_insn *.
(process_address_1): Strengthen params "before" and "after" from
rtx * to rtx_insn **. Strengthen locals "insns", "last_insn" from
rtx to rtx_insn *.
(process_address): Strengthen params "before" and "after" from
rtx * to rtx_insn **.
(emit_inc): Strengthen local "last" from rtx to rtx_insn *.
(curr_insn_transform): Strengthen locals "before" and "after"
from rtx to rtx_insn *. Replace NULL_RTX with NULL when referring
to insns.
(loc_equivalence_callback): Update cast of "data", changing
resulting type from rtx to rtx_insn *.
(substitute_pseudo_within_insn): New.
(inherit_reload_reg): Strengthen param "insn" from rtx to
rtx_insn *; likewise for local "new_insns". Replace NULL_RTX with
NULL when referring to insns. Add a checked cast to rtx_insn *
when using usage_insn to invoke lra_update_insn_regno_info.
(split_reg): Strengthen param "insn" from rtx to rtx_insn *;
likewise for locals "restore", "save". Add checked casts to
rtx_insn * when using usage_insn to invoke
lra_update_insn_regno_info and lra_process_new_insns. Replace
NULL_RTX with NULL when referring to insns.
(split_if_necessary): Strengthen param "insn" from rtx to
rtx_insn *.
(update_ebb_live_info): Likewise for params "head", "tail" and local
"prev_insn".
(get_last_insertion_point): Likewise for return type and local "insn".
(get_live_on_other_edges): Likewise for local "last".
(inherit_in_ebb): Likewise for params "head", "tail" and locals
"prev_insn", "next_insn", "restore".
(remove_inheritance_pseudos): Likewise for local "prev_insn".
(undo_optional_reloads): Likewise for local "insn".
* lra-eliminations.c (lra_eliminate_regs_1): Likewise for param
"insn".
(lra_eliminate_regs): Replace NULL_RTX with NULL when referring to
insns.
(eliminate_regs_in_insn): Strengthen param "insn" from rtx to
rtx_insn *.
(spill_pseudos): Likewise for local "insn".
(init_elimination): Likewise.
(process_insn_for_elimination): Likewise for param "insn".
* lra-lives.c (curr_insn): Likewise.;
* lra-spills.c (assign_spill_hard_regs): Likewise for local "insn".
(remove_pseudos): Likewise for param "insn".
(spill_pseudos): Likewise for local "insn".
(lra_final_code_change): Likewise for locals "insn", "curr".
* lra.c (lra_invalidate_insn_data): Likewise for param "insn".
(lra_set_insn_deleted): Likewise.
(lra_delete_dead_insn): Likewise, and for local "prev".
(new_insn_reg): Likewise for param "insn".
(lra_set_insn_recog_data): Likewise.
(lra_update_insn_recog_data): Likewise.
(lra_set_used_insn_alternative): Likewise.
(get_insn_freq): Likewise.
(invalidate_insn_data_regno_info): Likewise.
(lra_invalidate_insn_regno_info): Likewise.
(lra_update_insn_regno_info): Likewise.
(lra_constraint_insn_stack): Strengthen from vec<rtx> to
vec<rtx_insn *>.
(lra_push_insn_1): Strengthen param "insn" from rtx to
rtx_insn *.
(lra_push_insn): Likewise.
(lra_push_insn_and_update_insn_regno_info): Likewise.
(lra_pop_insn): Likewise for return type and local "insn".
(push_insns): Likewise for params "from", "to", and local "insn".
(setup_sp_offset): Likewise for params "from", "last" and locals
"before", "insn".
(lra_process_new_insns): Likewise for params "insn", "before",
"after" and local "last".
(struct sloc): Likewise for field "insn".
(lra_former_scratch_operand_p): Likewise for param "insn".
(remove_scratches): Likewise for locals "insn", "last".
(check_rtl): Likewise for local "insn".
(add_auto_inc_notes): Likewise for param "insn".
(update_inc_notes): Likewise for local "insn".
(lra): Replace NULL_RTX with NULL when referring to insn.
2014-08-22 David Malcolm <dmalcolm@redhat.com> 2014-08-22 David Malcolm <dmalcolm@redhat.com>
* lower-subreg.c (simple_move): Strengthen param "insn" from rtx * lower-subreg.c (simple_move): Strengthen param "insn" from rtx

2
gcc/lra-assigns.c
View file

@ -1221,7 +1221,7 @@ static void
assign_by_spills (void) assign_by_spills (void)
{ {
int i, n, nfails, iter, regno, hard_regno, cost, restore_regno; int i, n, nfails, iter, regno, hard_regno, cost, restore_regno;
rtx insn; rtx_insn *insn;
bitmap_head changed_insns, do_not_assign_nonreload_pseudos; bitmap_head changed_insns, do_not_assign_nonreload_pseudos;
unsigned int u, conflict_regno; unsigned int u, conflict_regno;
bitmap_iterator bi; bitmap_iterator bi;

21
gcc/lra-coalesce.c
View file

@ -75,8 +75,8 @@ static int *first_coalesced_pseudo, *next_coalesced_pseudo;
static int static int
move_freq_compare_func (const void *v1p, const void *v2p) move_freq_compare_func (const void *v1p, const void *v2p)
{ {
rtx mv1 = *(const rtx *) v1p; rtx_insn *mv1 = *(rtx_insn * const *) v1p;
rtx mv2 = *(const rtx *) v2p; rtx_insn *mv2 = *(rtx_insn * const *) v2p;
int pri1, pri2; int pri1, pri2;
pri1 = REG_FREQ_FROM_BB (BLOCK_FOR_INSN (mv1)); pri1 = REG_FREQ_FROM_BB (BLOCK_FOR_INSN (mv1));
@ -168,6 +168,16 @@ substitute (rtx *loc)
return res; return res;
} }
/* Specialize "substitute" for use on an insn. This can't change
the insn ptr, just the contents of the insn. */
static bool
substitute_within_insn (rtx_insn *insn)
{
rtx loc = insn;
return substitute (&loc);
}
/* The current iteration (1, 2, ...) of the coalescing pass. */ /* The current iteration (1, 2, ...) of the coalescing pass. */
int lra_coalesce_iter; int lra_coalesce_iter;
@ -219,7 +229,8 @@ bool
lra_coalesce (void) lra_coalesce (void)
{ {
basic_block bb; basic_block bb;
rtx mv, set, insn, next, *sorted_moves; rtx_insn *mv, *insn, *next, **sorted_moves;
rtx set;
int i, mv_num, sregno, dregno; int i, mv_num, sregno, dregno;
unsigned int regno; unsigned int regno;
int coalesced_moves; int coalesced_moves;
@ -238,7 +249,7 @@ lra_coalesce (void)
next_coalesced_pseudo = XNEWVEC (int, max_regno); next_coalesced_pseudo = XNEWVEC (int, max_regno);
for (i = 0; i < max_regno; i++) for (i = 0; i < max_regno; i++)
first_coalesced_pseudo[i] = next_coalesced_pseudo[i] = i; first_coalesced_pseudo[i] = next_coalesced_pseudo[i] = i;
sorted_moves = XNEWVEC (rtx, get_max_uid ()); sorted_moves = XNEWVEC (rtx_insn *, get_max_uid ());
mv_num = 0; mv_num = 0;
/* Collect moves. */ /* Collect moves. */
coalesced_moves = 0; coalesced_moves = 0;
@ -308,7 +319,7 @@ lra_coalesce (void)
if (INSN_P (insn) if (INSN_P (insn)
&& bitmap_bit_p (&involved_insns_bitmap, INSN_UID (insn))) && bitmap_bit_p (&involved_insns_bitmap, INSN_UID (insn)))
{ {
if (! substitute (&insn)) if (! substitute_within_insn (insn))
continue; continue;
lra_update_insn_regno_info (insn); lra_update_insn_regno_info (insn);
if ((set = single_set (insn)) != NULL_RTX && set_noop_p (set)) if ((set = single_set (insn)) != NULL_RTX && set_noop_p (set))

128
gcc/lra-constraints.c
View file

@ -138,7 +138,7 @@ static int bb_reload_num;
/* The current insn being processed and corresponding its single set /* The current insn being processed and corresponding its single set
(NULL otherwise), its data (basic block, the insn data, the insn (NULL otherwise), its data (basic block, the insn data, the insn
static data, and the mode of each operand). */ static data, and the mode of each operand). */
static rtx curr_insn; static rtx_insn *curr_insn;
static rtx curr_insn_set; static rtx curr_insn_set;
static basic_block curr_bb; static basic_block curr_bb;
static lra_insn_recog_data_t curr_id; static lra_insn_recog_data_t curr_id;
@ -491,7 +491,7 @@ get_equiv (rtx x)
return that value after elimination for INSN, otherwise return return that value after elimination for INSN, otherwise return
X. */ X. */
static rtx static rtx
get_equiv_with_elimination (rtx x, rtx insn) get_equiv_with_elimination (rtx x, rtx_insn *insn)
{ {
rtx res = get_equiv (x); rtx res = get_equiv (x);
@ -834,7 +834,7 @@ narrow_reload_pseudo_class (rtx reg, enum reg_class cl)
matched input operands INS. */ matched input operands INS. */
static void static void
match_reload (signed char out, signed char *ins, enum reg_class goal_class, match_reload (signed char out, signed char *ins, enum reg_class goal_class,
rtx *before, rtx *after) rtx_insn **before, rtx_insn **after)
{ {
int i, in; int i, in;
rtx new_in_reg, new_out_reg, reg, clobber; rtx new_in_reg, new_out_reg, reg, clobber;
@ -1003,7 +1003,7 @@ get_op_class (rtx op)
/* Return generated insn mem_pseudo:=val if TO_P or val:=mem_pseudo /* Return generated insn mem_pseudo:=val if TO_P or val:=mem_pseudo
otherwise. If modes of MEM_PSEUDO and VAL are different, use otherwise. If modes of MEM_PSEUDO and VAL are different, use
SUBREG for VAL to make them equal. */ SUBREG for VAL to make them equal. */
static rtx static rtx_insn *
emit_spill_move (bool to_p, rtx mem_pseudo, rtx val) emit_spill_move (bool to_p, rtx mem_pseudo, rtx val)
{ {
if (GET_MODE (mem_pseudo) != GET_MODE (val)) if (GET_MODE (mem_pseudo) != GET_MODE (val))
@ -1024,9 +1024,9 @@ emit_spill_move (bool to_p, rtx mem_pseudo, rtx val)
LRA_SUBREG_P (mem_pseudo) = 1; LRA_SUBREG_P (mem_pseudo) = 1;
} }
} }
return (to_p return as_a <rtx_insn *> (to_p
? gen_move_insn (mem_pseudo, val) ? gen_move_insn (mem_pseudo, val)
: gen_move_insn (val, mem_pseudo)); : gen_move_insn (val, mem_pseudo));
} }
/* Process a special case insn (register move), return true if we /* Process a special case insn (register move), return true if we
@ -1038,7 +1038,8 @@ static bool
check_and_process_move (bool *change_p, bool *sec_mem_p ATTRIBUTE_UNUSED) check_and_process_move (bool *change_p, bool *sec_mem_p ATTRIBUTE_UNUSED)
{ {
int sregno, dregno; int sregno, dregno;
rtx dest, src, dreg, sreg, old_sreg, new_reg, before, scratch_reg; rtx dest, src, dreg, sreg, old_sreg, new_reg, scratch_reg;
rtx_insn *before;
enum reg_class dclass, sclass, secondary_class; enum reg_class dclass, sclass, secondary_class;
enum machine_mode sreg_mode; enum machine_mode sreg_mode;
secondary_reload_info sri; secondary_reload_info sri;
@ -1164,7 +1165,7 @@ check_and_process_move (bool *change_p, bool *sec_mem_p ATTRIBUTE_UNUSED)
} }
before = get_insns (); before = get_insns ();
end_sequence (); end_sequence ();
lra_process_new_insns (curr_insn, before, NULL_RTX, "Inserting the move"); lra_process_new_insns (curr_insn, before, NULL, "Inserting the move");
if (new_reg != NULL_RTX) if (new_reg != NULL_RTX)
{ {
if (GET_CODE (src) == SUBREG) if (GET_CODE (src) == SUBREG)
@ -1238,7 +1239,8 @@ static int curr_swapped;
automodified value; handle that case by adding the required output automodified value; handle that case by adding the required output
reloads to list AFTER. Return true if the RTL was changed. */ reloads to list AFTER. Return true if the RTL was changed. */
static bool static bool
process_addr_reg (rtx *loc, rtx *before, rtx *after, enum reg_class cl) process_addr_reg (rtx *loc, rtx_insn **before, rtx_insn **after,
enum reg_class cl)
{ {
int regno; int regno;
enum reg_class rclass, new_class; enum reg_class rclass, new_class;
@ -1314,7 +1316,8 @@ process_addr_reg (rtx *loc, rtx *before, rtx *after, enum reg_class cl)
the insn to be inserted after curr insn. ORIGREG and NEWREG the insn to be inserted after curr insn. ORIGREG and NEWREG
are the original reg and new reg for reload. */ are the original reg and new reg for reload. */
static void static void
insert_move_for_subreg (rtx *before, rtx *after, rtx origreg, rtx newreg) insert_move_for_subreg (rtx_insn **before, rtx_insn **after, rtx origreg,
rtx newreg)
{ {
if (before) if (before)
{ {
@ -1342,14 +1345,14 @@ static bool
simplify_operand_subreg (int nop, enum machine_mode reg_mode) simplify_operand_subreg (int nop, enum machine_mode reg_mode)
{ {
int hard_regno; int hard_regno;
rtx before, after; rtx_insn *before, *after;
enum machine_mode mode; enum machine_mode mode;
rtx reg, new_reg; rtx reg, new_reg;
rtx operand = *curr_id->operand_loc[nop]; rtx operand = *curr_id->operand_loc[nop];
enum reg_class regclass; enum reg_class regclass;
enum op_type type; enum op_type type;
before = after = NULL_RTX; before = after = NULL;
if (GET_CODE (operand) != SUBREG) if (GET_CODE (operand) != SUBREG)
return false; return false;
@ -2753,7 +2756,7 @@ equiv_address_substitution (struct address_info *ad)
To do all necessary transformations use function To do all necessary transformations use function
process_address. */ process_address. */
static bool static bool
process_address_1 (int nop, rtx *before, rtx *after) process_address_1 (int nop, rtx_insn **before, rtx_insn **after)
{ {
struct address_info ad; struct address_info ad;
rtx new_reg; rtx new_reg;
@ -2890,7 +2893,8 @@ process_address_1 (int nop, rtx *before, rtx *after)
{ {
int regno; int regno;
enum reg_class cl; enum reg_class cl;
rtx set, insns, last_insn; rtx set;
rtx_insn *insns, *last_insn;
/* Try to reload base into register only if the base is invalid /* Try to reload base into register only if the base is invalid
for the address but with valid offset, case (4) above. */ for the address but with valid offset, case (4) above. */
start_sequence (); start_sequence ();
@ -2967,7 +2971,7 @@ process_address_1 (int nop, rtx *before, rtx *after)
/* Do address reloads until it is necessary. Use process_address_1 as /* Do address reloads until it is necessary. Use process_address_1 as
a helper function. Return true for any RTL changes. */ a helper function. Return true for any RTL changes. */
static bool static bool
process_address (int nop, rtx *before, rtx *after) process_address (int nop, rtx_insn **before, rtx_insn **after)
{ {
bool res = false; bool res = false;
@ -2994,7 +2998,7 @@ emit_inc (enum reg_class new_rclass, rtx in, rtx value, int inc_amount)
/* Nonzero if increment after copying. */ /* Nonzero if increment after copying. */
int post = (GET_CODE (value) == POST_DEC || GET_CODE (value) == POST_INC int post = (GET_CODE (value) == POST_DEC || GET_CODE (value) == POST_INC
|| GET_CODE (value) == POST_MODIFY); || GET_CODE (value) == POST_MODIFY);
rtx last; rtx_insn *last;
rtx inc; rtx inc;
rtx add_insn; rtx add_insn;
int code; int code;
@ -3154,7 +3158,7 @@ curr_insn_transform (void)
int commutative; int commutative;
signed char goal_alt_matched[MAX_RECOG_OPERANDS][MAX_RECOG_OPERANDS]; signed char goal_alt_matched[MAX_RECOG_OPERANDS][MAX_RECOG_OPERANDS];
signed char match_inputs[MAX_RECOG_OPERANDS + 1]; signed char match_inputs[MAX_RECOG_OPERANDS + 1];
rtx before, after; rtx_insn *before, *after;
bool alt_p = false; bool alt_p = false;
/* Flag that the insn has been changed through a transformation. */ /* Flag that the insn has been changed through a transformation. */
bool change_p; bool change_p;
@ -3252,7 +3256,7 @@ curr_insn_transform (void)
/* Reload address registers and displacements. We do it before /* Reload address registers and displacements. We do it before
finding an alternative because of memory constraints. */ finding an alternative because of memory constraints. */
before = after = NULL_RTX; before = after = NULL;
for (i = 0; i < n_operands; i++) for (i = 0; i < n_operands; i++)
if (! curr_static_id->operand[i].is_operator if (! curr_static_id->operand[i].is_operator
&& process_address (i, &before, &after)) && process_address (i, &before, &after))
@ -3371,7 +3375,7 @@ curr_insn_transform (void)
secondary memory moves we can not reuse the original secondary memory moves we can not reuse the original
insn. */ insn. */
after = emit_spill_move (false, new_reg, dest); after = emit_spill_move (false, new_reg, dest);
lra_process_new_insns (curr_insn, NULL_RTX, after, lra_process_new_insns (curr_insn, NULL, after,
"Inserting the sec. move"); "Inserting the sec. move");
/* We may have non null BEFORE here (e.g. after address /* We may have non null BEFORE here (e.g. after address
processing. */ processing. */
@ -3380,14 +3384,14 @@ curr_insn_transform (void)
emit_insn (before); emit_insn (before);
before = get_insns (); before = get_insns ();
end_sequence (); end_sequence ();
lra_process_new_insns (curr_insn, before, NULL_RTX, "Changing on"); lra_process_new_insns (curr_insn, before, NULL, "Changing on");
lra_set_insn_deleted (curr_insn); lra_set_insn_deleted (curr_insn);
} }
else if (dest == rld) else if (dest == rld)
{ {
*curr_id->operand_loc[0] = new_reg; *curr_id->operand_loc[0] = new_reg;
after = emit_spill_move (false, new_reg, dest); after = emit_spill_move (false, new_reg, dest);
lra_process_new_insns (curr_insn, NULL_RTX, after, lra_process_new_insns (curr_insn, NULL, after,
"Inserting the sec. move"); "Inserting the sec. move");
} }
else else
@ -3399,7 +3403,7 @@ curr_insn_transform (void)
emit_insn (before); emit_insn (before);
before = get_insns (); before = get_insns ();
end_sequence (); end_sequence ();
lra_process_new_insns (curr_insn, before, NULL_RTX, lra_process_new_insns (curr_insn, before, NULL,
"Inserting the sec. move"); "Inserting the sec. move");
} }
lra_update_insn_regno_info (curr_insn); lra_update_insn_regno_info (curr_insn);
@ -3848,7 +3852,7 @@ loc_equivalence_callback (rtx loc, const_rtx, void *data)
return NULL_RTX; return NULL_RTX;
rtx subst = (data == NULL rtx subst = (data == NULL
? get_equiv (loc) : get_equiv_with_elimination (loc, (rtx) data)); ? get_equiv (loc) : get_equiv_with_elimination (loc, (rtx_insn *) data));
if (subst != loc) if (subst != loc)
return subst; return subst;
@ -4376,6 +4380,16 @@ substitute_pseudo (rtx *loc, int old_regno, rtx new_reg)
return result; return result;
} }
/* Call substitute_pseudo within an insn. This won't update the insn ptr,
just the contents of the insn. */
static bool
substitute_pseudo_within_insn (rtx_insn *insn, int old_regno, rtx new_reg)
{
rtx loc = insn;
return substitute_pseudo (&loc, old_regno, new_reg);
}
/* Return first non-debug insn in list USAGE_INSNS. */ /* Return first non-debug insn in list USAGE_INSNS. */
static rtx static rtx
skip_usage_debug_insns (rtx usage_insns) skip_usage_debug_insns (rtx usage_insns)
@ -4447,14 +4461,15 @@ static bitmap_head check_only_regs;
class of ORIGINAL REGNO. */ class of ORIGINAL REGNO. */
static bool static bool
inherit_reload_reg (bool def_p, int original_regno, inherit_reload_reg (bool def_p, int original_regno,
enum reg_class cl, rtx insn, rtx next_usage_insns) enum reg_class cl, rtx_insn *insn, rtx next_usage_insns)
{ {
if (optimize_function_for_size_p (cfun)) if (optimize_function_for_size_p (cfun))
return false; return false;
enum reg_class rclass = lra_get_allocno_class (original_regno); enum reg_class rclass = lra_get_allocno_class (original_regno);
rtx original_reg = regno_reg_rtx[original_regno]; rtx original_reg = regno_reg_rtx[original_regno];
rtx new_reg, new_insns, usage_insn; rtx new_reg, usage_insn;
rtx_insn *new_insns;
lra_assert (! usage_insns[original_regno].after_p); lra_assert (! usage_insns[original_regno].after_p);
if (lra_dump_file != NULL) if (lra_dump_file != NULL)
@ -4535,7 +4550,7 @@ inherit_reload_reg (bool def_p, int original_regno,
} }
return false; return false;
} }
substitute_pseudo (&insn, original_regno, new_reg); substitute_pseudo_within_insn (insn, original_regno, new_reg);
lra_update_insn_regno_info (insn); lra_update_insn_regno_info (insn);
if (! def_p) if (! def_p)
/* We now have a new usage insn for original regno. */ /* We now have a new usage insn for original regno. */
@ -4548,10 +4563,10 @@ inherit_reload_reg (bool def_p, int original_regno,
bitmap_set_bit (&check_only_regs, original_regno); bitmap_set_bit (&check_only_regs, original_regno);
bitmap_set_bit (&lra_inheritance_pseudos, REGNO (new_reg)); bitmap_set_bit (&lra_inheritance_pseudos, REGNO (new_reg));
if (def_p) if (def_p)
lra_process_new_insns (insn, NULL_RTX, new_insns, lra_process_new_insns (insn, NULL, new_insns,
"Add original<-inheritance"); "Add original<-inheritance");
else else
lra_process_new_insns (insn, new_insns, NULL_RTX, lra_process_new_insns (insn, new_insns, NULL,
"Add inheritance<-original"); "Add inheritance<-original");
while (next_usage_insns != NULL_RTX) while (next_usage_insns != NULL_RTX)
{ {
@ -4568,7 +4583,7 @@ inherit_reload_reg (bool def_p, int original_regno,
next_usage_insns = XEXP (next_usage_insns, 1); next_usage_insns = XEXP (next_usage_insns, 1);
} }
substitute_pseudo (&usage_insn, original_regno, new_reg); substitute_pseudo (&usage_insn, original_regno, new_reg);
lra_update_insn_regno_info (usage_insn); lra_update_insn_regno_info (as_a <rtx_insn *> (usage_insn));
if (lra_dump_file != NULL) if (lra_dump_file != NULL)
{ {
fprintf (lra_dump_file, fprintf (lra_dump_file,
@ -4719,12 +4734,14 @@ choose_split_class (enum reg_class allocno_class,
if BEFORE_P is true. Return true if we succeed in such if BEFORE_P is true. Return true if we succeed in such
transformation. */ transformation. */
static bool static bool
split_reg (bool before_p, int original_regno, rtx insn, rtx next_usage_insns) split_reg (bool before_p, int original_regno, rtx_insn *insn,
rtx next_usage_insns)
{ {
enum reg_class rclass; enum reg_class rclass;
rtx original_reg; rtx original_reg;
int hard_regno, nregs; int hard_regno, nregs;
rtx new_reg, save, restore, usage_insn; rtx new_reg, usage_insn;
rtx_insn *restore, *save;
bool after_p; bool after_p;
bool call_save_p; bool call_save_p;
@ -4830,7 +4847,7 @@ split_reg (bool before_p, int original_regno, rtx insn, rtx next_usage_insns)
lra_assert (DEBUG_INSN_P (usage_insn)); lra_assert (DEBUG_INSN_P (usage_insn));
next_usage_insns = XEXP (next_usage_insns, 1); next_usage_insns = XEXP (next_usage_insns, 1);
substitute_pseudo (&usage_insn, original_regno, new_reg); substitute_pseudo (&usage_insn, original_regno, new_reg);
lra_update_insn_regno_info (usage_insn); lra_update_insn_regno_info (as_a <rtx_insn *> (usage_insn));
if (lra_dump_file != NULL) if (lra_dump_file != NULL)
{ {
fprintf (lra_dump_file, " Split reuse change %d->%d:\n", fprintf (lra_dump_file, " Split reuse change %d->%d:\n",
@ -4840,12 +4857,13 @@ split_reg (bool before_p, int original_regno, rtx insn, rtx next_usage_insns)
} }
lra_assert (NOTE_P (usage_insn) || NONDEBUG_INSN_P (usage_insn)); lra_assert (NOTE_P (usage_insn) || NONDEBUG_INSN_P (usage_insn));
lra_assert (usage_insn != insn || (after_p && before_p)); lra_assert (usage_insn != insn || (after_p && before_p));
lra_process_new_insns (usage_insn, after_p ? NULL_RTX : restore, lra_process_new_insns (as_a <rtx_insn *> (usage_insn),
after_p ? restore : NULL_RTX, after_p ? NULL : restore,
after_p ? restore : NULL,
call_save_p call_save_p
? "Add reg<-save" : "Add reg<-split"); ? "Add reg<-save" : "Add reg<-split");
lra_process_new_insns (insn, before_p ? save : NULL_RTX, lra_process_new_insns (insn, before_p ? save : NULL,
before_p ? NULL_RTX : save, before_p ? NULL : save,
call_save_p call_save_p
? "Add save<-reg" : "Add split<-reg"); ? "Add save<-reg" : "Add split<-reg");
if (nregs > 1) if (nregs > 1)
@ -4871,7 +4889,7 @@ split_reg (bool before_p, int original_regno, rtx insn, rtx next_usage_insns)
static bool static bool
split_if_necessary (int regno, enum machine_mode mode, split_if_necessary (int regno, enum machine_mode mode,
HARD_REG_SET potential_reload_hard_regs, HARD_REG_SET potential_reload_hard_regs,
bool before_p, rtx insn, int max_uid) bool before_p, rtx_insn *insn, int max_uid)
{ {
bool res = false; bool res = false;
int i, nregs = 1; int i, nregs = 1;
@ -4901,12 +4919,13 @@ static bitmap_head live_regs;
inheritance/split transformation. The function removes dead moves inheritance/split transformation. The function removes dead moves
too. */ too. */
static void static void
update_ebb_live_info (rtx head, rtx tail) update_ebb_live_info (rtx_insn *head, rtx_insn *tail)
{ {
unsigned int j; unsigned int j;
int i, regno; int i, regno;
bool live_p; bool live_p;
rtx prev_insn, set; rtx_insn *prev_insn;
rtx set;
bool remove_p; bool remove_p;
basic_block last_bb, prev_bb, curr_bb; basic_block last_bb, prev_bb, curr_bb;
bitmap_iterator bi; bitmap_iterator bi;
@ -5041,10 +5060,10 @@ add_to_inherit (int regno, rtx insns)
/* Return the last non-debug insn in basic block BB, or the block begin /* Return the last non-debug insn in basic block BB, or the block begin
note if none. */ note if none. */
static rtx static rtx_insn *
get_last_insertion_point (basic_block bb) get_last_insertion_point (basic_block bb)
{ {
rtx insn; rtx_insn *insn;
FOR_BB_INSNS_REVERSE (bb, insn) FOR_BB_INSNS_REVERSE (bb, insn)
if (NONDEBUG_INSN_P (insn) || NOTE_INSN_BASIC_BLOCK_P (insn)) if (NONDEBUG_INSN_P (insn) || NOTE_INSN_BASIC_BLOCK_P (insn))
@ -5057,7 +5076,7 @@ get_last_insertion_point (basic_block bb)
static void static void
get_live_on_other_edges (basic_block from, basic_block to, bitmap res) get_live_on_other_edges (basic_block from, basic_block to, bitmap res)
{ {
rtx last; rtx_insn *last;
struct lra_insn_reg *reg; struct lra_insn_reg *reg;
edge e; edge e;
edge_iterator ei; edge_iterator ei;
@ -5101,11 +5120,12 @@ static const int max_small_class_regs_num = 2;
splitting even more but it is to expensive and the current approach splitting even more but it is to expensive and the current approach
works well enough. */ works well enough. */
static bool static bool
inherit_in_ebb (rtx head, rtx tail) inherit_in_ebb (rtx_insn *head, rtx_insn *tail)
{ {
int i, src_regno, dst_regno, nregs; int i, src_regno, dst_regno, nregs;
bool change_p, succ_p, update_reloads_num_p; bool change_p, succ_p, update_reloads_num_p;
rtx prev_insn, next_usage_insns, set, last_insn; rtx_insn *prev_insn, *last_insn;
rtx next_usage_insns, set;
enum reg_class cl; enum reg_class cl;
struct lra_insn_reg *reg; struct lra_insn_reg *reg;
basic_block last_processed_bb, curr_bb = NULL; basic_block last_processed_bb, curr_bb = NULL;
@ -5305,7 +5325,8 @@ inherit_in_ebb (rtx head, rtx tail)
change_p = true; change_p = true;
if (CALL_P (curr_insn)) if (CALL_P (curr_insn))
{ {
rtx cheap, pat, dest, restore; rtx cheap, pat, dest;
rtx_insn *restore;
int regno, hard_regno; int regno, hard_regno;
calls_num++; calls_num++;
@ -5604,7 +5625,8 @@ remove_inheritance_pseudos (bitmap remove_pseudos)
{ {
basic_block bb; basic_block bb;
int regno, sregno, prev_sregno, dregno, restore_regno; int regno, sregno, prev_sregno, dregno, restore_regno;
rtx set, prev_set, prev_insn; rtx set, prev_set;
rtx_insn *prev_insn;
bool change_p, done_p; bool change_p, done_p;
change_p = ! bitmap_empty_p (remove_pseudos); change_p = ! bitmap_empty_p (remove_pseudos);
@ -5738,8 +5760,8 @@ remove_inheritance_pseudos (bitmap remove_pseudos)
{ {
if (change_p && bitmap_bit_p (remove_pseudos, regno)) if (change_p && bitmap_bit_p (remove_pseudos, regno))
{ {
substitute_pseudo (&curr_insn, regno, substitute_pseudo_within_insn (
regno_reg_rtx[restore_regno]); curr_insn, regno, regno_reg_rtx[restore_regno]);
restored_regs_p = true; restored_regs_p = true;
} }
else else
@ -5780,7 +5802,8 @@ undo_optional_reloads (void)
bool change_p, keep_p; bool change_p, keep_p;
unsigned int regno, uid; unsigned int regno, uid;
bitmap_iterator bi, bi2; bitmap_iterator bi, bi2;
rtx insn, set, src, dest; rtx_insn *insn;
rtx set, src, dest;
bitmap_head removed_optional_reload_pseudos, insn_bitmap; bitmap_head removed_optional_reload_pseudos, insn_bitmap;
bitmap_initialize (&removed_optional_reload_pseudos, &reg_obstack); bitmap_initialize (&removed_optional_reload_pseudos, &reg_obstack);
@ -5861,8 +5884,9 @@ undo_optional_reloads (void)
we remove the inheritance pseudo and the optional we remove the inheritance pseudo and the optional
reload. */ reload. */
} }
substitute_pseudo (&insn, regno, substitute_pseudo_within_insn (
regno_reg_rtx[lra_reg_info[regno].restore_regno]); insn, regno,
regno_reg_rtx[lra_reg_info[regno].restore_regno]);
lra_update_insn_regno_info (insn); lra_update_insn_regno_info (insn);
if (lra_dump_file != NULL) if (lra_dump_file != NULL)
{ {

12
gcc/lra-eliminations.c
View file

@ -302,7 +302,7 @@ get_elimination (rtx reg)
If we make full substitution to SP for non-null INSN, add the insn If we make full substitution to SP for non-null INSN, add the insn
sp offset. */ sp offset. */
rtx rtx
lra_eliminate_regs_1 (rtx insn, rtx x, enum machine_mode mem_mode, lra_eliminate_regs_1 (rtx_insn *insn, rtx x, enum machine_mode mem_mode,
bool subst_p, bool update_p, bool full_p) bool subst_p, bool update_p, bool full_p)
{ {
enum rtx_code code = GET_CODE (x); enum rtx_code code = GET_CODE (x);
@ -657,7 +657,7 @@ rtx
lra_eliminate_regs (rtx x, enum machine_mode mem_mode, lra_eliminate_regs (rtx x, enum machine_mode mem_mode,
rtx insn ATTRIBUTE_UNUSED) rtx insn ATTRIBUTE_UNUSED)
{ {
return lra_eliminate_regs_1 (NULL_RTX, x, mem_mode, true, false, true); return lra_eliminate_regs_1 (NULL, x, mem_mode, true, false, true);
} }
/* Stack pointer offset before the current insn relative to one at the /* Stack pointer offset before the current insn relative to one at the
@ -848,7 +848,7 @@ remove_reg_equal_offset_note (rtx insn, rtx what)
previously used) in future. */ previously used) in future. */
static void static void
eliminate_regs_in_insn (rtx insn, bool replace_p, bool first_p) eliminate_regs_in_insn (rtx_insn *insn, bool replace_p, bool first_p)
{ {
int icode = recog_memoized (insn); int icode = recog_memoized (insn);
rtx old_set = single_set (insn); rtx old_set = single_set (insn);
@ -1086,7 +1086,7 @@ spill_pseudos (HARD_REG_SET set)
{ {
int i; int i;
bitmap_head to_process; bitmap_head to_process;
rtx insn; rtx_insn *insn;
if (hard_reg_set_empty_p (set)) if (hard_reg_set_empty_p (set))
return; return;
@ -1290,7 +1290,7 @@ init_elimination (void)
{ {
bool stop_to_sp_elimination_p; bool stop_to_sp_elimination_p;
basic_block bb; basic_block bb;
rtx insn; rtx_insn *insn;
struct elim_table *ep; struct elim_table *ep;
init_elim_table (); init_elim_table ();
@ -1339,7 +1339,7 @@ lra_eliminate_reg_if_possible (rtx *loc)
the insn for subsequent processing in the constraint pass, update the insn for subsequent processing in the constraint pass, update
the insn info. */ the insn info. */
static void static void
process_insn_for_elimination (rtx insn, bool final_p, bool first_p) process_insn_for_elimination (rtx_insn *insn, bool final_p, bool first_p)
{ {
eliminate_regs_in_insn (insn, final_p, first_p); eliminate_regs_in_insn (insn, final_p, first_p);
if (! final_p) if (! final_p)

34
gcc/lra-int.h
View file

@ -218,7 +218,7 @@ struct lra_insn_recog_data
/* SP offset before the insn relative to one at the func start. */ /* SP offset before the insn relative to one at the func start. */
HOST_WIDE_INT sp_offset; HOST_WIDE_INT sp_offset;
/* The insn itself. */ /* The insn itself. */
rtx insn; rtx_insn *insn;
/* Common data for insns with the same ICODE. Asm insns (their /* Common data for insns with the same ICODE. Asm insns (their
ICODE is negative) do not share such structures. */ ICODE is negative) do not share such structures. */
struct lra_static_insn_data *insn_static_data; struct lra_static_insn_data *insn_static_data;
@ -280,38 +280,39 @@ extern lra_insn_recog_data_t *lra_insn_recog_data;
extern int lra_curr_reload_num; extern int lra_curr_reload_num;
extern void lra_push_insn (rtx); extern void lra_push_insn (rtx_insn *);
extern void lra_push_insn_by_uid (unsigned int); extern void lra_push_insn_by_uid (unsigned int);
extern void lra_push_insn_and_update_insn_regno_info (rtx); extern void lra_push_insn_and_update_insn_regno_info (rtx_insn *);
extern rtx lra_pop_insn (void); extern rtx_insn *lra_pop_insn (void);
extern unsigned int lra_insn_stack_length (void); extern unsigned int lra_insn_stack_length (void);
extern rtx lra_create_new_reg_with_unique_value (enum machine_mode, rtx, extern rtx lra_create_new_reg_with_unique_value (enum machine_mode, rtx,
enum reg_class, const char *); enum reg_class, const char *);
extern void lra_set_regno_unique_value (int); extern void lra_set_regno_unique_value (int);
extern void lra_invalidate_insn_data (rtx); extern void lra_invalidate_insn_data (rtx_insn *);
extern void lra_set_insn_deleted (rtx); extern void lra_set_insn_deleted (rtx_insn *);
extern void lra_delete_dead_insn (rtx); extern void lra_delete_dead_insn (rtx_insn *);
extern void lra_emit_add (rtx, rtx, rtx); extern void lra_emit_add (rtx, rtx, rtx);
extern void lra_emit_move (rtx, rtx); extern void lra_emit_move (rtx, rtx);
extern void lra_update_dups (lra_insn_recog_data_t, signed char *); extern void lra_update_dups (lra_insn_recog_data_t, signed char *);
extern void lra_process_new_insns (rtx, rtx, rtx, const char *); extern void lra_process_new_insns (rtx_insn *, rtx_insn *, rtx_insn *,
const char *);
extern lra_insn_recog_data_t lra_set_insn_recog_data (rtx); extern lra_insn_recog_data_t lra_set_insn_recog_data (rtx_insn *);
extern lra_insn_recog_data_t lra_update_insn_recog_data (rtx); extern lra_insn_recog_data_t lra_update_insn_recog_data (rtx_insn *);
extern void lra_set_used_insn_alternative (rtx, int); extern void lra_set_used_insn_alternative (rtx_insn *, int);
extern void lra_set_used_insn_alternative_by_uid (int, int); extern void lra_set_used_insn_alternative_by_uid (int, int);
extern void lra_invalidate_insn_regno_info (rtx); extern void lra_invalidate_insn_regno_info (rtx_insn *);
extern void lra_update_insn_regno_info (rtx); extern void lra_update_insn_regno_info (rtx_insn *);
extern struct lra_insn_reg *lra_get_insn_regs (int); extern struct lra_insn_reg *lra_get_insn_regs (int);
extern void lra_free_copies (void); extern void lra_free_copies (void);
extern void lra_create_copy (int, int, int); extern void lra_create_copy (int, int, int);
extern lra_copy_t lra_get_copy (int); extern lra_copy_t lra_get_copy (int);
extern bool lra_former_scratch_p (int); extern bool lra_former_scratch_p (int);
extern bool lra_former_scratch_operand_p (rtx, int); extern bool lra_former_scratch_operand_p (rtx_insn *, int);
extern int lra_new_regno_start; extern int lra_new_regno_start;
extern int lra_constraint_new_regno_start; extern int lra_constraint_new_regno_start;
@ -384,7 +385,8 @@ extern void lra_final_code_change (void);
extern void lra_debug_elim_table (void); extern void lra_debug_elim_table (void);
extern int lra_get_elimination_hard_regno (int); extern int lra_get_elimination_hard_regno (int);
extern rtx lra_eliminate_regs_1 (rtx, rtx, enum machine_mode, bool, bool, bool); extern rtx lra_eliminate_regs_1 (rtx_insn *, rtx, enum machine_mode, bool,
bool, bool);
extern void lra_eliminate (bool, bool); extern void lra_eliminate (bool, bool);
extern void lra_eliminate_reg_if_possible (rtx *); extern void lra_eliminate_reg_if_possible (rtx *);
@ -450,7 +452,7 @@ lra_update_operator_dups (lra_insn_recog_data_t id)
/* Return info about INSN. Set up the info if it is not done yet. */ /* Return info about INSN. Set up the info if it is not done yet. */
static inline lra_insn_recog_data_t static inline lra_insn_recog_data_t
lra_get_insn_recog_data (rtx insn) lra_get_insn_recog_data (rtx_insn *insn)
{ {
lra_insn_recog_data_t data; lra_insn_recog_data_t data;
unsigned int uid = INSN_UID (insn); unsigned int uid = INSN_UID (insn);

2
gcc/lra-lives.c
View file

@ -358,7 +358,7 @@ mark_regno_dead (int regno, enum machine_mode mode, int point)
} }
/* Insn currently scanned. */ /* Insn currently scanned. */
static rtx curr_insn; static rtx_insn *curr_insn;
/* The insn data. */ /* The insn data. */
static lra_insn_recog_data_t curr_id; static lra_insn_recog_data_t curr_id;
/* The insn static data. */ /* The insn static data. */

9
gcc/lra-spills.c
View file

@ -256,7 +256,8 @@ assign_spill_hard_regs (int *pseudo_regnos, int n)
enum reg_class rclass, spill_class; enum reg_class rclass, spill_class;
enum machine_mode mode; enum machine_mode mode;
lra_live_range_t r; lra_live_range_t r;
rtx insn, set; rtx_insn *insn;
rtx set;
basic_block bb; basic_block bb;
HARD_REG_SET conflict_hard_regs; HARD_REG_SET conflict_hard_regs;
bitmap_head ok_insn_bitmap; bitmap_head ok_insn_bitmap;
@ -411,7 +412,7 @@ assign_stack_slot_num_and_sort_pseudos (int *pseudo_regnos, int n)
corresponding memory or spilled hard reg. Ignore spilled pseudos corresponding memory or spilled hard reg. Ignore spilled pseudos
created from the scratches. */ created from the scratches. */
static void static void
remove_pseudos (rtx *loc, rtx insn) remove_pseudos (rtx *loc, rtx_insn *insn)
{ {
int i; int i;
rtx hard_reg; rtx hard_reg;
@ -463,7 +464,7 @@ static void
spill_pseudos (void) spill_pseudos (void)
{ {
basic_block bb; basic_block bb;
rtx insn; rtx_insn *insn;
int i; int i;
bitmap_head spilled_pseudos, changed_insns; bitmap_head spilled_pseudos, changed_insns;
@ -679,7 +680,7 @@ lra_final_code_change (void)
{ {
int i, hard_regno; int i, hard_regno;
basic_block bb; basic_block bb;
rtx insn, curr; rtx_insn *insn, *curr;
int max_regno = max_reg_num (); int max_regno = max_reg_num ();
for (i = FIRST_PSEUDO_REGISTER; i < max_regno; i++) for (i = FIRST_PSEUDO_REGISTER; i < max_regno; i++)

74
gcc/lra.c
View file

@ -125,8 +125,9 @@ HARD_REG_SET lra_no_alloc_regs;
static int get_new_reg_value (void); static int get_new_reg_value (void);
static void expand_reg_info (void); static void expand_reg_info (void);
static void invalidate_insn_recog_data (int); static void invalidate_insn_recog_data (int);
static int get_insn_freq (rtx); static int get_insn_freq (rtx_insn *);
static void invalidate_insn_data_regno_info (lra_insn_recog_data_t, rtx, int); static void invalidate_insn_data_regno_info (lra_insn_recog_data_t,
rtx_insn *, int);
/* Expand all regno related info needed for LRA. */ /* Expand all regno related info needed for LRA. */
static void static void
@ -210,7 +211,7 @@ lra_set_regno_unique_value (int regno)
/* Invalidate INSN related info used by LRA. The info should never be /* Invalidate INSN related info used by LRA. The info should never be
used after that. */ used after that. */
void void
lra_invalidate_insn_data (rtx insn) lra_invalidate_insn_data (rtx_insn *insn)
{ {
lra_invalidate_insn_regno_info (insn); lra_invalidate_insn_regno_info (insn);
invalidate_insn_recog_data (INSN_UID (insn)); invalidate_insn_recog_data (INSN_UID (insn));
@ -219,7 +220,7 @@ lra_invalidate_insn_data (rtx insn)
/* Mark INSN deleted and invalidate the insn related info used by /* Mark INSN deleted and invalidate the insn related info used by
LRA. */ LRA. */
void void
lra_set_insn_deleted (rtx insn) lra_set_insn_deleted (rtx_insn *insn)
{ {
lra_invalidate_insn_data (insn); lra_invalidate_insn_data (insn);
SET_INSN_DELETED (insn); SET_INSN_DELETED (insn);
@ -228,9 +229,9 @@ lra_set_insn_deleted (rtx insn)
/* Delete an unneeded INSN and any previous insns who sole purpose is /* Delete an unneeded INSN and any previous insns who sole purpose is
loading data that is dead in INSN. */ loading data that is dead in INSN. */
void void
lra_delete_dead_insn (rtx insn) lra_delete_dead_insn (rtx_insn *insn)
{ {
rtx prev = prev_real_insn (insn); rtx_insn *prev = prev_real_insn (insn);
rtx prev_dest; rtx prev_dest;
/* If the previous insn sets a register that dies in our insn, /* If the previous insn sets a register that dies in our insn,
@ -503,7 +504,8 @@ init_insn_regs (void)
in the insn (EARLY_CLOBBER), and reference to the next insn reg in the insn (EARLY_CLOBBER), and reference to the next insn reg
info (NEXT). */ info (NEXT). */
static struct lra_insn_reg * static struct lra_insn_reg *
new_insn_reg (rtx insn, int regno, enum op_type type, enum machine_mode mode, new_insn_reg (rtx_insn *insn, int regno, enum op_type type,
enum machine_mode mode,
bool subreg_p, bool early_clobber, struct lra_insn_reg *next) bool subreg_p, bool early_clobber, struct lra_insn_reg *next)
{ {
struct lra_insn_reg *ir; struct lra_insn_reg *ir;
@ -886,7 +888,7 @@ collect_non_operand_hard_regs (rtx *x, lra_insn_recog_data_t data,
/* Set up and return info about INSN. Set up the info if it is not set up /* Set up and return info about INSN. Set up the info if it is not set up
yet. */ yet. */
lra_insn_recog_data_t lra_insn_recog_data_t
lra_set_insn_recog_data (rtx insn) lra_set_insn_recog_data (rtx_insn *insn)
{ {
lra_insn_recog_data_t data; lra_insn_recog_data_t data;
int i, n, icode; int i, n, icode;
@ -1123,7 +1125,7 @@ invalidate_insn_recog_data (int uid)
/* Update all the insn info about INSN. It is usually called when /* Update all the insn info about INSN. It is usually called when
something in the insn was changed. Return the updated info. */ something in the insn was changed. Return the updated info. */
lra_insn_recog_data_t lra_insn_recog_data_t
lra_update_insn_recog_data (rtx insn) lra_update_insn_recog_data (rtx_insn *insn)
{ {
lra_insn_recog_data_t data; lra_insn_recog_data_t data;
int n; int n;
@ -1227,7 +1229,7 @@ lra_update_insn_recog_data (rtx insn)
/* Set up that INSN is using alternative ALT now. */ /* Set up that INSN is using alternative ALT now. */
void void
lra_set_used_insn_alternative (rtx insn, int alt) lra_set_used_insn_alternative (rtx_insn *insn, int alt)
{ {
lra_insn_recog_data_t data; lra_insn_recog_data_t data;
@ -1521,7 +1523,7 @@ add_regs_to_insn_regno_info (lra_insn_recog_data_t data, rtx x, int uid,
/* Return execution frequency of INSN. */ /* Return execution frequency of INSN. */
static int static int
get_insn_freq (rtx insn) get_insn_freq (rtx_insn *insn)
{ {
basic_block bb = BLOCK_FOR_INSN (insn); basic_block bb = BLOCK_FOR_INSN (insn);
@ -1532,7 +1534,7 @@ get_insn_freq (rtx insn)
/* Invalidate all reg info of INSN with DATA and execution frequency /* Invalidate all reg info of INSN with DATA and execution frequency
FREQ. Update common info about the invalidated registers. */ FREQ. Update common info about the invalidated registers. */
static void static void
invalidate_insn_data_regno_info (lra_insn_recog_data_t data, rtx insn, invalidate_insn_data_regno_info (lra_insn_recog_data_t data, rtx_insn *insn,
int freq) int freq)
{ {
int uid; int uid;
@ -1561,7 +1563,7 @@ invalidate_insn_data_regno_info (lra_insn_recog_data_t data, rtx insn,
/* Invalidate all reg info of INSN. Update common info about the /* Invalidate all reg info of INSN. Update common info about the
invalidated registers. */ invalidated registers. */
void void
lra_invalidate_insn_regno_info (rtx insn) lra_invalidate_insn_regno_info (rtx_insn *insn)
{ {
invalidate_insn_data_regno_info (lra_get_insn_recog_data (insn), insn, invalidate_insn_data_regno_info (lra_get_insn_recog_data (insn), insn,
get_insn_freq (insn)); get_insn_freq (insn));
@ -1586,7 +1588,7 @@ setup_insn_reg_info (lra_insn_recog_data_t data, int freq)
/* Set up insn reg info of INSN. Update common reg info from reg info /* Set up insn reg info of INSN. Update common reg info from reg info
of INSN. */ of INSN. */
void void
lra_update_insn_regno_info (rtx insn) lra_update_insn_regno_info (rtx_insn *insn)
{ {
int i, uid, freq; int i, uid, freq;
lra_insn_recog_data_t data; lra_insn_recog_data_t data;
@ -1630,13 +1632,13 @@ lra_get_insn_regs (int uid)
static sbitmap lra_constraint_insn_stack_bitmap; static sbitmap lra_constraint_insn_stack_bitmap;
/* The stack itself. */ /* The stack itself. */
vec<rtx> lra_constraint_insn_stack; vec<rtx_insn *> lra_constraint_insn_stack;
/* Put INSN on the stack. If ALWAYS_UPDATE is true, always update the reg /* Put INSN on the stack. If ALWAYS_UPDATE is true, always update the reg
info for INSN, otherwise only update it if INSN is not already on the info for INSN, otherwise only update it if INSN is not already on the
stack. */ stack. */
static inline void static inline void
lra_push_insn_1 (rtx insn, bool always_update) lra_push_insn_1 (rtx_insn *insn, bool always_update)
{ {
unsigned int uid = INSN_UID (insn); unsigned int uid = INSN_UID (insn);
if (always_update) if (always_update)
@ -1654,14 +1656,14 @@ lra_push_insn_1 (rtx insn, bool always_update)
/* Put INSN on the stack. */ /* Put INSN on the stack. */
void void
lra_push_insn (rtx insn) lra_push_insn (rtx_insn *insn)
{ {
lra_push_insn_1 (insn, false); lra_push_insn_1 (insn, false);
} }
/* Put INSN on the stack and update its reg info. */ /* Put INSN on the stack and update its reg info. */
void void
lra_push_insn_and_update_insn_regno_info (rtx insn) lra_push_insn_and_update_insn_regno_info (rtx_insn *insn)
{ {
lra_push_insn_1 (insn, true); lra_push_insn_1 (insn, true);
} }
@ -1674,10 +1676,10 @@ lra_push_insn_by_uid (unsigned int uid)
} }
/* Take the last-inserted insns off the stack and return it. */ /* Take the last-inserted insns off the stack and return it. */
rtx rtx_insn *
lra_pop_insn (void) lra_pop_insn (void)
{ {
rtx insn = lra_constraint_insn_stack.pop (); rtx_insn *insn = lra_constraint_insn_stack.pop ();
bitmap_clear_bit (lra_constraint_insn_stack_bitmap, INSN_UID (insn)); bitmap_clear_bit (lra_constraint_insn_stack_bitmap, INSN_UID (insn));
return insn; return insn;
} }
@ -1691,9 +1693,9 @@ lra_insn_stack_length (void)
/* Push insns FROM to TO (excluding it) going in reverse order. */ /* Push insns FROM to TO (excluding it) going in reverse order. */
static void static void
push_insns (rtx from, rtx to) push_insns (rtx_insn *from, rtx_insn *to)
{ {
rtx insn; rtx_insn *insn;
if (from == NULL_RTX) if (from == NULL_RTX)
return; return;
@ -1706,13 +1708,13 @@ push_insns (rtx from, rtx to)
taken from the next BB insn after LAST or zero if there in such taken from the next BB insn after LAST or zero if there in such
insn. */ insn. */
static void static void
setup_sp_offset (rtx from, rtx last) setup_sp_offset (rtx_insn *from, rtx_insn *last)
{ {
rtx before = next_nonnote_insn_bb (last); rtx_insn *before = next_nonnote_insn_bb (last);
HOST_WIDE_INT offset = (before == NULL_RTX || ! INSN_P (before) HOST_WIDE_INT offset = (before == NULL_RTX || ! INSN_P (before)
? 0 : lra_get_insn_recog_data (before)->sp_offset); ? 0 : lra_get_insn_recog_data (before)->sp_offset);
for (rtx insn = from; insn != NEXT_INSN (last); insn = NEXT_INSN (insn)) for (rtx_insn *insn = from; insn != NEXT_INSN (last); insn = NEXT_INSN (insn))
lra_get_insn_recog_data (insn)->sp_offset = offset; lra_get_insn_recog_data (insn)->sp_offset = offset;
} }
@ -1720,9 +1722,10 @@ setup_sp_offset (rtx from, rtx last)
insns onto the stack. Print about emitting the insns with insns onto the stack. Print about emitting the insns with
TITLE. */ TITLE. */
void void
lra_process_new_insns (rtx insn, rtx before, rtx after, const char *title) lra_process_new_insns (rtx_insn *insn, rtx_insn *before, rtx_insn *after,
const char *title)
{ {
rtx last; rtx_insn *last;
if (before == NULL_RTX && after == NULL_RTX) if (before == NULL_RTX && after == NULL_RTX)
return; return;
@ -1772,7 +1775,7 @@ lra_process_new_insns (rtx insn, rtx before, rtx after, const char *title)
/* Description of location of a former scratch operand. */ /* Description of location of a former scratch operand. */
struct sloc struct sloc
{ {
rtx insn; /* Insn where the scratch was. */ rtx_insn *insn; /* Insn where the scratch was. */
int nop; /* Number of the operand which was a scratch. */ int nop; /* Number of the operand which was a scratch. */
}; };
@ -1796,7 +1799,7 @@ lra_former_scratch_p (int regno)
/* Return true if the operand NOP of INSN is a former scratch. */ /* Return true if the operand NOP of INSN is a former scratch. */
bool bool
lra_former_scratch_operand_p (rtx insn, int nop) lra_former_scratch_operand_p (rtx_insn *insn, int nop)
{ {
return bitmap_bit_p (&scratch_operand_bitmap, return bitmap_bit_p (&scratch_operand_bitmap,
INSN_UID (insn) * MAX_RECOG_OPERANDS + nop) != 0; INSN_UID (insn) * MAX_RECOG_OPERANDS + nop) != 0;
@ -1809,7 +1812,8 @@ remove_scratches (void)
int i; int i;
bool insn_changed_p; bool insn_changed_p;
basic_block bb; basic_block bb;
rtx insn, reg; rtx_insn *insn;
rtx reg;
sloc_t loc; sloc_t loc;
lra_insn_recog_data_t id; lra_insn_recog_data_t id;
struct lra_static_insn_data *static_id; struct lra_static_insn_data *static_id;
@ -1860,7 +1864,7 @@ restore_scratches (void)
int regno; int regno;
unsigned i; unsigned i;
sloc_t loc; sloc_t loc;
rtx last = NULL_RTX; rtx_insn *last = NULL;
lra_insn_recog_data_t id = NULL; lra_insn_recog_data_t id = NULL;
for (i = 0; scratches.iterate (i, &loc); i++) for (i = 0; scratches.iterate (i, &loc); i++)
@ -1903,7 +1907,7 @@ static void
check_rtl (bool final_p) check_rtl (bool final_p)
{ {
basic_block bb; basic_block bb;
rtx insn; rtx_insn *insn;
lra_assert (! final_p || reload_completed); lra_assert (! final_p || reload_completed);
FOR_EACH_BB_FN (bb, cfun) FOR_EACH_BB_FN (bb, cfun)
@ -1985,7 +1989,7 @@ has_nonexceptional_receiver (void)
/* Process recursively X of INSN and add REG_INC notes if necessary. */ /* Process recursively X of INSN and add REG_INC notes if necessary. */
static void static void
add_auto_inc_notes (rtx insn, rtx x) add_auto_inc_notes (rtx_insn *insn, rtx x)
{ {
enum rtx_code code = GET_CODE (x); enum rtx_code code = GET_CODE (x);
const char *fmt; const char *fmt;
@ -2020,7 +2024,7 @@ update_inc_notes (void)
{ {
rtx *pnote; rtx *pnote;
basic_block bb; basic_block bb;
rtx insn; rtx_insn *insn;
FOR_EACH_BB_FN (bb, cfun) FOR_EACH_BB_FN (bb, cfun)
FOR_BB_INSNS (bb, insn) FOR_BB_INSNS (bb, insn)
@ -2165,7 +2169,7 @@ lra (FILE *f)
lra_live_ranges_init (); lra_live_ranges_init ();
lra_constraints_init (); lra_constraints_init ();
lra_curr_reload_num = 0; lra_curr_reload_num = 0;
push_insns (get_last_insn (), NULL_RTX); push_insns (get_last_insn (), NULL);
/* It is needed for the 1st coalescing. */ /* It is needed for the 1st coalescing. */
lra_constraint_new_insn_uid_start = get_max_uid (); lra_constraint_new_insn_uid_start = get_max_uid ();
bitmap_initialize (&lra_inheritance_pseudos, &reg_obstack); bitmap_initialize (&lra_inheritance_pseudos, &reg_obstack);