From f2034d064c29d9620c5562b2b5b517bdc6c7a672 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Wed, 30 Mar 2011 09:18:30 -0600 Subject: reload.h (reg_equiv_constant): Move into new structure reg_equivs, define accessor macro. * reload.h (reg_equiv_constant): Move into new structure reg_equivs, define accessor macro. (reg_equiv_invariant, reg_equiv_memory_loc): Likewise. (reg_equiv_address, reg_equiv_mem, reg_equiv_alt_mem_list): Likewise. (reg_equiv_init): Likewise. (reg_equivs_size): New variable. (reg_equiv_init_size): Remove. (allocate_initial_values): Move prototype to here from.... * integrate.h (allocate_initial_values): Remove prototype. * integrate.c: Include reload.h. (allocate_initial_values): Corresponding changes. * ira.c (find_reg_equiv_invariant_cost): Corresponding changes. (fix_reg_equiv_init, no_equiv): Corresponding changes. (update_equiv_regs): Corresponding changes. (ira): Corresponding changes. * reload.c (push_reg_equiv_alt_mem): Corresponding changes. (push_secondary_reload): Corresponding changes. (push_reload, find_reloads, find_reloads_toplev): Corresponding changes. (make_memloc, find_reloads_address): Corresponding changes. (subst_reg_equivs, subst_indexed_address): Corresponding changes. (find_reloads_address_1): Corresponding changes. (find_reloads_subreg_address, subst_reloads): Corresponding changes. (refers_to_regno_for_reload_p): Corresponding changes. (reg_overlap_mentioned_for_reload_p): Corresponding changes. (refers_to_mem_for_reload_p, find_equiv_reg): Corresponding changes. * reload1.c: Include ggc.h. (grow_reg_equivs): New function. (replace_pseudos_in, reload): Corresponding changes. (calculate_needs_all_insns, alter_regs): Corresponding changes. (eliminate_regs_1, elimination_effects): Corresponding changes. (emit_input_reload_insns, emit_output_reload_insns): Likewise. (delete_output_reload): Likewise. * caller-save.c (mark_referenced_regs): Corresponding changes. * alpha/alpha.c (resolve_reload_operand): Corresponding changes. * frv/predicates.md (frv_load_operand): Corresponding changes. * microblaze/microblaze.c (double_memory_operand): Corresponding changes. * avr/avr.h (LEGITIMIZE_RELOAD_ADDRESS): Corresponding changes. * xtensa/xtensa.c (fixup_subreg_mem): Corresponding changes. * mn10300/mn10300.c (mn10300_secondary_reload): Corresponding changes. * m68k/m68k.c (emit_move_sequence): Corresponding changes. * arm/arm.c (arm_reload_in_hi, arm_reload_out_hi): Corresponding changes. * pa/pa.c (emit_move_sequence): Corresponding changes. * vax/vax.c (nonindexed_address_p): Corresponding changes. From-SVN: r171731 --- gcc/reload.h | 79 ++++++++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 64 insertions(+), 15 deletions(-) (limited to 'gcc/reload.h') diff --git a/gcc/reload.h b/gcc/reload.h index 340f81d..baa7548 100644 --- a/gcc/reload.h +++ b/gcc/reload.h @@ -100,7 +100,7 @@ struct reload int inc; /* A reg for which reload_in is the equivalent. If reload_in is a symbol_ref which came from - reg_equiv_constant, then this is the pseudo + reg_equiv_consant, then this is the pseudo which has that symbol_ref as equivalent. */ rtx in_reg; rtx out_reg; @@ -204,20 +204,62 @@ extern struct target_reload *this_target_reload; #define caller_save_initialized_p \ (this_target_reload->x_caller_save_initialized_p) -extern GTY (()) VEC(rtx,gc) *reg_equiv_memory_loc_vec; -extern rtx *reg_equiv_constant; -extern rtx *reg_equiv_invariant; -extern rtx *reg_equiv_memory_loc; -extern rtx *reg_equiv_address; -extern rtx *reg_equiv_mem; -extern rtx *reg_equiv_alt_mem_list; - -/* Element N is the list of insns that initialized reg N from its equivalent - constant or memory slot. */ -extern GTY((length("reg_equiv_init_size"))) rtx *reg_equiv_init; - -/* The size of the previous array, for GC purposes. */ -extern GTY(()) int reg_equiv_init_size; +/* Register equivalences. Indexed by register number. */ +typedef struct reg_equivs +{ + /* The constant value to which pseudo reg N is equivalent, + or zero if pseudo reg N is not equivalent to a constant. + find_reloads looks at this in order to replace pseudo reg N + with the constant it stands for. */ + rtx constant; + + /* An invariant value to which pseudo reg N is equivalent. + eliminate_regs_in_insn uses this to replace pseudos in particular + contexts. */ + rtx invariant; + + /* A memory location to which pseudo reg N is equivalent, + prior to any register elimination (such as frame pointer to stack + pointer). Depending on whether or not it is a valid address, this value + is transferred to either equiv_address or equiv_mem. */ + rtx memory_loc; + + /* The address of stack slot to which pseudo reg N is equivalent. + This is used when the address is not valid as a memory address + (because its displacement is too big for the machine.) */ + rtx address; + + /* The memory slot to which pseudo reg N is equivalent, + or zero if pseudo reg N is not equivalent to a memory slot. */ + rtx mem; + + /* An EXPR_LIST of REG_EQUIVs containing MEMs with + alternate representations of the location of pseudo reg N. */ + rtx alt_mem_list; + + /* The list of insns that initialized reg N from its equivalent + constant or memory slot. */ + rtx init; +} reg_equivs_t; + +#define reg_equiv_constant(ELT) \ + VEC_index (reg_equivs_t, reg_equivs, (ELT))->constant +#define reg_equiv_invariant(ELT) \ + VEC_index (reg_equivs_t, reg_equivs, (ELT))->invariant +#define reg_equiv_memory_loc(ELT) \ + VEC_index (reg_equivs_t, reg_equivs, (ELT))->memory_loc +#define reg_equiv_address(ELT) \ + VEC_index (reg_equivs_t, reg_equivs, (ELT))->address +#define reg_equiv_mem(ELT) \ + VEC_index (reg_equivs_t, reg_equivs, (ELT))->mem +#define reg_equiv_alt_mem_list(ELT) \ + VEC_index (reg_equivs_t, reg_equivs, (ELT))->alt_mem_list +#define reg_equiv_init(ELT) \ + VEC_index (reg_equivs_t, reg_equivs, (ELT))->init + +DEF_VEC_O(reg_equivs_t); +DEF_VEC_ALLOC_O(reg_equivs_t, gc); +extern VEC(reg_equivs_t,gc) *reg_equivs; /* All the "earlyclobber" operands of the current insn are recorded here. */ @@ -420,3 +462,10 @@ extern void debug_reload (void); /* Compute the actual register we should reload to, in case we're reloading to/from a register that is wider than a word. */ extern rtx reload_adjust_reg_for_mode (rtx, enum machine_mode); + +/* Ideally this function would be in ira.c or reload, but due to dependencies + on integrate.h, it's part of integrate.c. */ +extern void allocate_initial_values (VEC (reg_equivs_t, gc) *); + +/* Allocate or grow the reg_equiv tables, initializing new entries to 0. */ +extern void grow_reg_equivs (void); -- cgit v1.1