This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Update: reload register allocation patch
- To: gcc-patches at gcc dot gnu dot org
- Subject: Update: reload register allocation patch
- From: Bernd Schmidt <bernds at cygnus dot co dot uk>
- Date: Thu, 4 Nov 1999 18:27:12 +0000 (GMT)
This is the same patch I submitted in September, minus the cleanups that
already went in. See
http://egcs.cygnus.com/ml/gcc-patches/1999-09/msg00792.html
for a description.
Bootstrapped & passed make check on i586-linux.
Bernd
* reload.h (struct insn_chain): Delete fields group_size, group_mode,
counted_for_groups, counted_for_nongroups. Add fields rld and
n_reloads.
* reload.c (push_secondary_reload): Don't set nongroup field of
new reloads.
(push_reload): Likewise.
(find_reloads): Delete code to compute nongroup fields.
* reload1.c (reload_insn_firstobj): New static variable.
(calculate_needs, find_tworeg_group, find_group, possible_group_p,
count_possible_groups, modes_equiv_for_class_p, new_spill_reg,
dump_needs): Delete functions.
(select_reload_regs, copy_reloads, find_reg): New functions.
(reload): Don't try to allocate reload registers if we already know
we have to make another pass. Call select_reload_regs. Free memory
starting with reload_firstobj when starting another pass.
(calculate_needs_all_insns): Call copy_reloads for an insn that
needs reloads; don't call calculate_needs.
(spill_cost): New static array.
(used_spill_regs_local): New static variable.
(order_regs_for_reload): Compute spill_cost from hard_reg_n_uses.
(maybe_mark_pseudo_spilled): Use used_spill_regs_local to determine
which regs were spilled.
(find_reload_regs): Completely rewritten to use find_reg.
(allocate_reload_reg): Don't test counted_for_groups or
counted_for_nongroups. Reorder exit code a bit to lose goto.
(choose_reload_regs): Change inheritance for loop into if statement.
Add fallback code after it that uses the existing register allocation
from find_reload_regs.
Index: gcc/reload.c
===================================================================
RCS file: /cvs/gcc/egcs/gcc/reload.c,v
retrieving revision 1.89
diff -c -p -r1.89 reload.c
*** reload.c 1999/11/03 12:43:35 1.89
--- gcc/reload.c 1999/11/04 17:57:32
*************** push_secondary_reload (in_p, x, opnum, o
*** 465,471 ****
rld[t_reload].outmode = ! in_p ? t_mode : VOIDmode;
rld[t_reload].reg_rtx = 0;
rld[t_reload].optional = optional;
- rld[t_reload].nongroup = 0;
rld[t_reload].inc = 0;
/* Maybe we could combine these, but it seems too tricky. */
rld[t_reload].nocombine = 1;
--- 465,470 ----
*************** push_secondary_reload (in_p, x, opnum, o
*** 535,541 ****
rld[s_reload].outmode = ! in_p ? mode : VOIDmode;
rld[s_reload].reg_rtx = 0;
rld[s_reload].optional = optional;
- rld[s_reload].nongroup = 0;
rld[s_reload].inc = 0;
/* Maybe we could combine these, but it seems too tricky. */
rld[s_reload].nocombine = 1;
--- 534,539 ----
*************** push_reload (in, out, inloc, outloc, cla
*** 1246,1252 ****
rld[i].outmode = outmode;
rld[i].reg_rtx = 0;
rld[i].optional = optional;
- rld[i].nongroup = 0;
rld[i].inc = 0;
rld[i].nocombine = 0;
rld[i].in_reg = inloc ? *inloc : 0;
--- 1244,1249 ----
*************** find_reloads (insn, replace, ind_levels,
*** 4114,4180 ****
&& rld[i].when_needed != RELOAD_FOR_OUTPUT_ADDRESS)
abort ();
#endif
-
- /* Set which reloads must use registers not used in any group. Start
- with those that conflict with a group and then include ones that
- conflict with ones that are already known to conflict with a group. */
-
- changed = 0;
- for (i = 0; i < n_reloads; i++)
- {
- enum machine_mode mode = rld[i].inmode;
- enum reg_class class = rld[i].class;
- int size;
-
- if (GET_MODE_SIZE (rld[i].outmode) > GET_MODE_SIZE (mode))
- mode = rld[i].outmode;
- size = CLASS_MAX_NREGS (class, mode);
-
- if (size == 1)
- for (j = 0; j < n_reloads; j++)
- if ((CLASS_MAX_NREGS (rld[j].class,
- (GET_MODE_SIZE (rld[j].outmode)
- > GET_MODE_SIZE (rld[j].inmode))
- ? rld[j].outmode : rld[j].inmode)
- > 1)
- && !rld[j].optional
- && (rld[j].in != 0 || rld[j].out != 0
- || rld[j].secondary_p)
- && reloads_conflict (i, j)
- && reg_classes_intersect_p (class, rld[j].class))
- {
- rld[i].nongroup = 1;
- changed = 1;
- break;
- }
- }
-
- while (changed)
- {
- changed = 0;
-
- for (i = 0; i < n_reloads; i++)
- {
- enum machine_mode mode = rld[i].inmode;
- enum reg_class class = rld[i].class;
- int size;
-
- if (GET_MODE_SIZE (rld[i].outmode) > GET_MODE_SIZE (mode))
- mode = rld[i].outmode;
- size = CLASS_MAX_NREGS (class, mode);
-
- if (! rld[i].nongroup && size == 1)
- for (j = 0; j < n_reloads; j++)
- if (rld[j].nongroup
- && reloads_conflict (i, j)
- && reg_classes_intersect_p (class, rld[j].class))
- {
- rld[i].nongroup = 1;
- changed = 1;
- break;
- }
- }
- }
/* Compute reload_mode and reload_nregs. */
for (i = 0; i < n_reloads; i++)
--- 4111,4116 ----
Index: gcc/reload.h
===================================================================
RCS file: /cvs/gcc/egcs/gcc/reload.h,v
retrieving revision 1.21
diff -c -p -r1.21 reload.h
*** reload.h 1999/10/27 02:14:12 1.21
--- gcc/reload.h 1999/11/04 17:57:32
*************** struct insn_chain
*** 231,255 ****
regset live_before;
regset live_after;
! /* For each class, size of group of consecutive regs
! that is needed for the reloads of this class. */
! char group_size[N_REG_CLASSES];
! /* For each class, the machine mode which requires consecutive
! groups of regs of that class.
! If two different modes ever require groups of one class,
! they must be the same size and equally restrictive for that class,
! otherwise we can't handle the complexity. */
! enum machine_mode group_mode[N_REG_CLASSES];
!
! /* Indicates if a register was counted against the need for
! groups. 0 means it can count against max_nongroup instead. */
! HARD_REG_SET counted_for_groups;
!
! /* Indicates if a register was counted against the need for
! non-groups. 0 means it can become part of a new group.
! During choose_reload_regs, 1 here means don't use this reg
! as part of a group, even if it seems to be otherwise ok. */
! HARD_REG_SET counted_for_nongroups;
/* Indicates which registers have already been used for spills. */
HARD_REG_SET used_spill_regs;
--- 231,239 ----
regset live_before;
regset live_after;
! /* Copies of the global variables computed by find_reloads. */
! struct reload *rld;
! int n_reloads;
/* Indicates which registers have already been used for spills. */
HARD_REG_SET used_spill_regs;
Index: gcc/reload1.c
===================================================================
RCS file: /cvs/gcc/egcs/gcc/reload1.c,v
retrieving revision 1.179
diff -c -p -r1.179 reload1.c
*** reload1.c 1999/11/03 11:23:27 1.179
--- gcc/reload1.c 1999/11/04 17:57:43
*************** struct obstack reload_obstack;
*** 275,283 ****
char *reload_startobj;
/* The point after all insn_chain structures. Used to quickly deallocate
! memory used while processing one insn. */
char *reload_firstobj;
#define obstack_chunk_alloc xmalloc
#define obstack_chunk_free free
--- 275,287 ----
char *reload_startobj;
/* The point after all insn_chain structures. Used to quickly deallocate
! memory allocated in copy_reloads during calculate_needs_all_insns. */
char *reload_firstobj;
+ /* This points before all local rtl generated by register elimination.
+ Used to quickly free all memory after processing one insn. */
+ static char *reload_insn_firstobj;
+
#define obstack_chunk_alloc xmalloc
#define obstack_chunk_free free
*************** struct hard_reg_n_uses
*** 372,395 ****
};
static void maybe_fix_stack_asms PROTO((void));
static void calculate_needs_all_insns PROTO((int));
! static void calculate_needs PROTO((struct insn_chain *));
! static void find_reload_regs PROTO((struct insn_chain *chain,
! FILE *));
! static void find_tworeg_group PROTO((struct insn_chain *, int,
FILE *));
! static void find_group PROTO((struct insn_chain *, int,
! FILE *));
! static int possible_group_p PROTO((struct insn_chain *, int));
! static void count_possible_groups PROTO((struct insn_chain *, int));
! static int modes_equiv_for_class_p PROTO((enum machine_mode,
! enum machine_mode,
! enum reg_class));
static void delete_caller_save_insns PROTO((void));
static void spill_failure PROTO((rtx));
- static void new_spill_reg PROTO((struct insn_chain *, int, int,
- int, FILE *));
static void maybe_mark_pseudo_spilled PROTO((int));
static void delete_dead_insn PROTO((rtx));
static void alter_reg PROTO((int, int));
--- 376,390 ----
};
static void maybe_fix_stack_asms PROTO((void));
+ static void copy_reloads PROTO((struct insn_chain *));
static void calculate_needs_all_insns PROTO((int));
! static int find_reg PROTO((struct insn_chain *, int,
FILE *));
! static void find_reload_regs PROTO((struct insn_chain *, FILE *));
! static void select_reload_regs PROTO((FILE *));
static void delete_caller_save_insns PROTO((void));
static void spill_failure PROTO((rtx));
static void maybe_mark_pseudo_spilled PROTO((int));
static void delete_dead_insn PROTO((rtx));
static void alter_reg PROTO((int, int));
*************** static void mark_reload_reg_in_use PROTO
*** 420,429 ****
static void clear_reload_reg_in_use PROTO((int, int, enum reload_type,
enum machine_mode));
static int reload_reg_free_p PROTO((int, int, enum reload_type));
! static int reload_reg_free_for_value_p PROTO((int, int, enum reload_type, rtx, rtx, int, int));
static int reload_reg_reaches_end_p PROTO((int, int, enum reload_type));
static int allocate_reload_reg PROTO((struct insn_chain *, int, int,
int));
static void choose_reload_regs_init PROTO((struct insn_chain *, rtx *));
static void choose_reload_regs PROTO((struct insn_chain *));
static void merge_assigned_reloads PROTO((rtx));
--- 415,427 ----
static void clear_reload_reg_in_use PROTO((int, int, enum reload_type,
enum machine_mode));
static int reload_reg_free_p PROTO((int, int, enum reload_type));
! static int reload_reg_free_for_value_p PROTO((int, int, enum reload_type,
! rtx, rtx, int, int));
static int reload_reg_reaches_end_p PROTO((int, int, enum reload_type));
static int allocate_reload_reg PROTO((struct insn_chain *, int, int,
int));
+ static void failed_reload PROTO((rtx, int));
+ static int set_reload_reg PROTO((int, int));
static void choose_reload_regs_init PROTO((struct insn_chain *, rtx *));
static void choose_reload_regs PROTO((struct insn_chain *));
static void merge_assigned_reloads PROTO((rtx));
*************** reload (first, global, dumpfile)
*** 842,848 ****
{
int something_changed;
int did_spill;
- struct insn_chain *chain;
HOST_WIDE_INT starting_frame_size;
--- 840,845 ----
*************** reload (first, global, dumpfile)
*** 960,983 ****
something_changed = 1;
}
}
-
- CLEAR_HARD_REG_SET (used_spill_regs);
- /* Try to satisfy the needs for each insn. */
- for (chain = insns_need_reload; chain != 0;
- chain = chain->next_need_reload)
- find_reload_regs (chain, dumpfile);
! if (failure)
! goto failed;
! if (insns_need_reload != 0 || did_spill)
! something_changed |= finish_spills (global, dumpfile);
if (! something_changed)
break;
if (caller_save_needed)
delete_caller_save_insns ();
}
/* If global-alloc was run, notify it of any register eliminations we have
--- 957,982 ----
something_changed = 1;
}
}
! /* No point in trying to select reload registers if we know we're
! going to re-run everything again. */
! if (! something_changed)
! {
! select_reload_regs (dumpfile);
! if (failure)
! goto failed;
+ if (insns_need_reload != 0 || did_spill)
+ something_changed |= finish_spills (global, dumpfile);
+ }
if (! something_changed)
break;
if (caller_save_needed)
delete_caller_save_insns ();
+
+ obstack_free (&reload_obstack, reload_firstobj);
}
/* If global-alloc was run, notify it of any register eliminations we have
*************** maybe_fix_stack_asms ()
*** 1318,1325 ****
#endif
}
-
/* Walk the chain of insns, and determine for each whether it needs reloads
and/or eliminations. Build the corresponding insns_need_reload list, and
set something_needs_elimination as appropriate. */
--- 1317,1337 ----
#endif
}
+ /* Copy the global variables n_reloads and rld into the corresponding elts
+ of CHAIN. */
+ static void
+ copy_reloads (chain)
+ struct insn_chain *chain;
+ {
+ chain->n_reloads = n_reloads;
+ chain->rld
+ = (struct reload *) obstack_alloc (&reload_obstack,
+ n_reloads * sizeof (struct reload));
+ memcpy (chain->rld, rld, n_reloads * sizeof (struct reload));
+ reload_insn_firstobj = (char *) obstack_alloc (&reload_obstack, 0);
+ }
+
/* Walk the chain of insns, and determine for each whether it needs reloads
and/or eliminations. Build the corresponding insns_need_reload list, and
set something_needs_elimination as appropriate. */
*************** calculate_needs_all_insns (global)
*** 1332,1342 ****
something_needs_elimination = 0;
for (chain = reload_insn_chain; chain != 0; chain = chain->next)
{
rtx insn = chain->insn;
! /* Clear out the shortcuts, in case they were set last time through. */
chain->need_elim = 0;
chain->need_reload = 0;
chain->need_operand_change = 0;
--- 1344,1355 ----
something_needs_elimination = 0;
+ reload_insn_firstobj = (char *) obstack_alloc (&reload_obstack, 0);
for (chain = reload_insn_chain; chain != 0; chain = chain->next)
{
rtx insn = chain->insn;
! /* Clear out the shortcuts. */
chain->need_elim = 0;
chain->need_reload = 0;
chain->need_operand_change = 0;
*************** calculate_needs_all_insns (global)
*** 1406,1412 ****
/* Discard any register replacements done. */
if (did_elimination)
{
! obstack_free (&reload_obstack, reload_firstobj);
PATTERN (insn) = old_body;
INSN_CODE (insn) = old_code;
REG_NOTES (insn) = old_notes;
--- 1419,1425 ----
/* Discard any register replacements done. */
if (did_elimination)
{
! obstack_free (&reload_obstack, reload_insn_firstobj);
PATTERN (insn) = old_body;
INSN_CODE (insn) = old_code;
REG_NOTES (insn) = old_notes;
*************** calculate_needs_all_insns (global)
*** 1417,1815 ****
if (n_reloads != 0)
{
*pprev_reload = chain;
pprev_reload = &chain->next_need_reload;
-
- calculate_needs (chain);
}
}
}
*pprev_reload = 0;
}
!
! /* Compute the most additional registers needed by one instruction,
! given by CHAIN. Collect information separately for each class of regs.
!
! To compute the number of reload registers of each class needed for an
! insn, we must simulate what choose_reload_regs can do. We do this by
! splitting an insn into an "input" and an "output" part. RELOAD_OTHER
! reloads are used in both. The input part uses those reloads,
! RELOAD_FOR_INPUT reloads, which must be live over the entire input section
! of reloads, and the maximum of all the RELOAD_FOR_INPUT_ADDRESS and
! RELOAD_FOR_OPERAND_ADDRESS reloads, which conflict with the inputs.
!
! The registers needed for output are RELOAD_OTHER and RELOAD_FOR_OUTPUT,
! which are live for the entire output portion, and the maximum of all the
! RELOAD_FOR_OUTPUT_ADDRESS reloads for each operand.
!
! The total number of registers needed is the maximum of the
! inputs and outputs. */
! static void
! calculate_needs (chain)
! struct insn_chain *chain;
{
! int i;
!
! /* Each `struct needs' corresponds to one RELOAD_... type. */
! struct {
! struct needs other;
! struct needs input;
! struct needs output;
! struct needs insn;
! struct needs other_addr;
! struct needs op_addr;
! struct needs op_addr_reload;
! struct needs in_addr[MAX_RECOG_OPERANDS];
! struct needs in_addr_addr[MAX_RECOG_OPERANDS];
! struct needs out_addr[MAX_RECOG_OPERANDS];
! struct needs out_addr_addr[MAX_RECOG_OPERANDS];
! } insn_needs;
!
! bzero ((char *) chain->group_size, sizeof chain->group_size);
! for (i = 0; i < N_REG_CLASSES; i++)
! chain->group_mode[i] = VOIDmode;
! bzero ((char *) &insn_needs, sizeof insn_needs);
!
! /* Count each reload once in every class
! containing the reload's own class. */
!
! for (i = 0; i < n_reloads; i++)
! {
! register enum reg_class *p;
! enum reg_class class = rld[i].class;
! int size;
! enum machine_mode mode;
! struct needs *this_needs;
!
! /* Don't count the dummy reloads, for which one of the
! regs mentioned in the insn can be used for reloading.
! Don't count optional reloads.
! Don't count reloads that got combined with others. */
! if (rld[i].reg_rtx != 0
! || rld[i].optional != 0
! || (rld[i].out == 0 && rld[i].in == 0
! && ! rld[i].secondary_p))
! continue;
!
! mode = rld[i].mode;
! size = rld[i].nregs;
!
! /* Decide which time-of-use to count this reload for. */
! switch (rld[i].when_needed)
! {
! case RELOAD_OTHER:
! this_needs = &insn_needs.other;
! break;
! case RELOAD_FOR_INPUT:
! this_needs = &insn_needs.input;
! break;
! case RELOAD_FOR_OUTPUT:
! this_needs = &insn_needs.output;
! break;
! case RELOAD_FOR_INSN:
! this_needs = &insn_needs.insn;
! break;
! case RELOAD_FOR_OTHER_ADDRESS:
! this_needs = &insn_needs.other_addr;
! break;
! case RELOAD_FOR_INPUT_ADDRESS:
! this_needs = &insn_needs.in_addr[rld[i].opnum];
! break;
! case RELOAD_FOR_INPADDR_ADDRESS:
! this_needs = &insn_needs.in_addr_addr[rld[i].opnum];
! break;
! case RELOAD_FOR_OUTPUT_ADDRESS:
! this_needs = &insn_needs.out_addr[rld[i].opnum];
! break;
! case RELOAD_FOR_OUTADDR_ADDRESS:
! this_needs = &insn_needs.out_addr_addr[rld[i].opnum];
! break;
! case RELOAD_FOR_OPERAND_ADDRESS:
! this_needs = &insn_needs.op_addr;
! break;
! case RELOAD_FOR_OPADDR_ADDR:
! this_needs = &insn_needs.op_addr_reload;
! break;
! default:
! abort();
! }
!
! if (size > 1)
! {
! enum machine_mode other_mode, allocate_mode;
!
! /* Count number of groups needed separately from
! number of individual regs needed. */
! this_needs->groups[(int) class]++;
! p = reg_class_superclasses[(int) class];
! while (*p != LIM_REG_CLASSES)
! this_needs->groups[(int) *p++]++;
! /* Record size and mode of a group of this class. */
! /* If more than one size group is needed,
! make all groups the largest needed size. */
! if (chain->group_size[(int) class] < size)
! {
! other_mode = chain->group_mode[(int) class];
! allocate_mode = mode;
! chain->group_size[(int) class] = size;
! chain->group_mode[(int) class] = mode;
! }
! else
! {
! other_mode = mode;
! allocate_mode = chain->group_mode[(int) class];
! }
! /* Crash if two dissimilar machine modes both need
! groups of consecutive regs of the same class. */
! if (other_mode != VOIDmode && other_mode != allocate_mode
! && ! modes_equiv_for_class_p (allocate_mode,
! other_mode, class))
! fatal_insn ("Two dissimilar machine modes both need groups of consecutive regs of the same class",
! chain->insn);
! }
! else if (size == 1)
! {
! this_needs->regs[(unsigned char)rld[i].nongroup][(int) class] += 1;
! p = reg_class_superclasses[(int) class];
! while (*p != LIM_REG_CLASSES)
! this_needs->regs[(unsigned char)rld[i].nongroup][(int) *p++] += 1;
! }
! else
! abort ();
! }
! /* All reloads have been counted for this insn;
! now merge the various times of use.
! This sets insn_needs, etc., to the maximum total number
! of registers needed at any point in this insn. */
! for (i = 0; i < N_REG_CLASSES; i++)
! {
! int j, in_max, out_max;
! /* Compute normal and nongroup needs. */
! for (j = 0; j <= 1; j++)
! {
! int k;
! for (in_max = 0, out_max = 0, k = 0; k < reload_n_operands; k++)
! {
! in_max = MAX (in_max,
! (insn_needs.in_addr[k].regs[j][i]
! + insn_needs.in_addr_addr[k].regs[j][i]));
! out_max = MAX (out_max, insn_needs.out_addr[k].regs[j][i]);
! out_max = MAX (out_max,
! insn_needs.out_addr_addr[k].regs[j][i]);
! }
! /* RELOAD_FOR_INSN reloads conflict with inputs, outputs,
! and operand addresses but not things used to reload
! them. Similarly, RELOAD_FOR_OPERAND_ADDRESS reloads
! don't conflict with things needed to reload inputs or
! outputs. */
! in_max = MAX (MAX (insn_needs.op_addr.regs[j][i],
! insn_needs.op_addr_reload.regs[j][i]),
! in_max);
! out_max = MAX (out_max, insn_needs.insn.regs[j][i]);
! insn_needs.input.regs[j][i]
! = MAX (insn_needs.input.regs[j][i]
! + insn_needs.op_addr.regs[j][i]
! + insn_needs.insn.regs[j][i],
! in_max + insn_needs.input.regs[j][i]);
! insn_needs.output.regs[j][i] += out_max;
! insn_needs.other.regs[j][i]
! += MAX (MAX (insn_needs.input.regs[j][i],
! insn_needs.output.regs[j][i]),
! insn_needs.other_addr.regs[j][i]);
! }
! /* Now compute group needs. */
! for (in_max = 0, out_max = 0, j = 0; j < reload_n_operands; j++)
! {
! in_max = MAX (in_max, insn_needs.in_addr[j].groups[i]);
! in_max = MAX (in_max, insn_needs.in_addr_addr[j].groups[i]);
! out_max = MAX (out_max, insn_needs.out_addr[j].groups[i]);
! out_max = MAX (out_max, insn_needs.out_addr_addr[j].groups[i]);
! }
! in_max = MAX (MAX (insn_needs.op_addr.groups[i],
! insn_needs.op_addr_reload.groups[i]),
! in_max);
! out_max = MAX (out_max, insn_needs.insn.groups[i]);
! insn_needs.input.groups[i]
! = MAX (insn_needs.input.groups[i]
! + insn_needs.op_addr.groups[i]
! + insn_needs.insn.groups[i],
! in_max + insn_needs.input.groups[i]);
! insn_needs.output.groups[i] += out_max;
! insn_needs.other.groups[i]
! += MAX (MAX (insn_needs.input.groups[i],
! insn_needs.output.groups[i]),
! insn_needs.other_addr.groups[i]);
}
! /* Record the needs for later. */
! chain->need = insn_needs.other;
! }
!
! /* Find a group of exactly 2 registers.
! First try to fill out the group by spilling a single register which
! would allow completion of the group.
! Then try to create a new group from a pair of registers, neither of
! which are explicitly used.
! Then try to create a group from any pair of registers. */
! static void
! find_tworeg_group (chain, class, dumpfile)
! struct insn_chain *chain;
! int class;
! FILE *dumpfile;
! {
! int i;
! /* First, look for a register that will complete a group. */
for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)
{
! int j, other;
!
! j = potential_reload_regs[i];
! if (j >= 0 && ! TEST_HARD_REG_BIT (bad_spill_regs, j)
! && ((j > 0 && (other = j - 1, spill_reg_order[other] >= 0)
! && TEST_HARD_REG_BIT (reg_class_contents[class], j)
! && TEST_HARD_REG_BIT (reg_class_contents[class], other)
! && HARD_REGNO_MODE_OK (other, chain->group_mode[class])
! && ! TEST_HARD_REG_BIT (chain->counted_for_nongroups, other)
! /* We don't want one part of another group.
! We could get "two groups" that overlap! */
! && ! TEST_HARD_REG_BIT (chain->counted_for_groups, other))
! || (j < FIRST_PSEUDO_REGISTER - 1
! && (other = j + 1, spill_reg_order[other] >= 0)
! && TEST_HARD_REG_BIT (reg_class_contents[class], j)
! && TEST_HARD_REG_BIT (reg_class_contents[class], other)
! && HARD_REGNO_MODE_OK (j, chain->group_mode[class])
! && ! TEST_HARD_REG_BIT (chain->counted_for_nongroups, other)
! && ! TEST_HARD_REG_BIT (chain->counted_for_groups, other))))
! {
! register enum reg_class *p;
!
! /* We have found one that will complete a group,
! so count off one group as provided. */
! chain->need.groups[class]--;
! p = reg_class_superclasses[class];
! while (*p != LIM_REG_CLASSES)
! {
! if (chain->group_size [(int) *p] <= chain->group_size [class])
! chain->need.groups[(int) *p]--;
! p++;
! }
! /* Indicate both these regs are part of a group. */
! SET_HARD_REG_BIT (chain->counted_for_groups, j);
! SET_HARD_REG_BIT (chain->counted_for_groups, other);
! break;
! }
}
! /* We can't complete a group, so start one. */
! if (i == FIRST_PSEUDO_REGISTER)
! for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)
! {
! int j, k;
! j = potential_reload_regs[i];
! /* Verify that J+1 is a potential reload reg. */
! for (k = 0; k < FIRST_PSEUDO_REGISTER; k++)
! if (potential_reload_regs[k] == j + 1)
! break;
! if (j >= 0 && j + 1 < FIRST_PSEUDO_REGISTER
! && k < FIRST_PSEUDO_REGISTER
! && spill_reg_order[j] < 0 && spill_reg_order[j + 1] < 0
! && TEST_HARD_REG_BIT (reg_class_contents[class], j)
! && TEST_HARD_REG_BIT (reg_class_contents[class], j + 1)
! && HARD_REGNO_MODE_OK (j, chain->group_mode[class])
! && ! TEST_HARD_REG_BIT (chain->counted_for_nongroups, j + 1)
! && ! TEST_HARD_REG_BIT (bad_spill_regs, j + 1))
! break;
! }
!
! /* I should be the index in potential_reload_regs
! of the new reload reg we have found. */
!
! new_spill_reg (chain, i, class, 0, dumpfile);
! }
!
! /* Find a group of more than 2 registers.
! Look for a sufficient sequence of unspilled registers, and spill them all
! at once. */
!
! static void
! find_group (chain, class, dumpfile)
! struct insn_chain *chain;
! int class;
! FILE *dumpfile;
! {
! int i;
!
for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)
{
! int j = potential_reload_regs[i];
! if (j >= 0
! && j + chain->group_size[class] <= FIRST_PSEUDO_REGISTER
! && HARD_REGNO_MODE_OK (j, chain->group_mode[class]))
! {
! int k;
! /* Check each reg in the sequence. */
! for (k = 0; k < chain->group_size[class]; k++)
! if (! (spill_reg_order[j + k] < 0
! && ! TEST_HARD_REG_BIT (bad_spill_regs, j + k)
! && TEST_HARD_REG_BIT (reg_class_contents[class], j + k)))
! break;
! /* We got a full sequence, so spill them all. */
! if (k == chain->group_size[class])
! {
! register enum reg_class *p;
! for (k = 0; k < chain->group_size[class]; k++)
! {
! int idx;
! SET_HARD_REG_BIT (chain->counted_for_groups, j + k);
! for (idx = 0; idx < FIRST_PSEUDO_REGISTER; idx++)
! if (potential_reload_regs[idx] == j + k)
! break;
! new_spill_reg (chain, idx, class, 0, dumpfile);
! }
! /* We have found one that will complete a group,
! so count off one group as provided. */
! chain->need.groups[class]--;
! p = reg_class_superclasses[class];
! while (*p != LIM_REG_CLASSES)
! {
! if (chain->group_size [(int) *p]
! <= chain->group_size [class])
! chain->need.groups[(int) *p]--;
! p++;
! }
! return;
! }
! }
! }
! /* There are no groups left. */
! spill_failure (chain->insn);
! failure = 1;
}
/* If pseudo REG conflicts with one of our reload registers, mark it as
spilled. */
static void
--- 1430,1634 ----
if (n_reloads != 0)
{
+ copy_reloads (chain);
*pprev_reload = chain;
pprev_reload = &chain->next_need_reload;
}
}
}
*pprev_reload = 0;
}
!
! /* Comparison function for qsort to decide which of two reloads
! should be handled first. *P1 and *P2 are the reload numbers. */
! static int
! reload_reg_class_lower (r1p, r2p)
! const PTR r1p;
! const PTR r2p;
{
! register int r1 = *(short *)r1p, r2 = *(short *)r2p;
! register int t;
! /* Consider required reloads before optional ones. */
! t = rld[r1].optional - rld[r2].optional;
! if (t != 0)
! return t;
! /* Count all solitary classes before non-solitary ones. */
! t = ((reg_class_size[(int) rld[r2].class] == 1)
! - (reg_class_size[(int) rld[r1].class] == 1));
! if (t != 0)
! return t;
! /* Aside from solitaires, consider all multi-reg groups first. */
! t = rld[r2].nregs - rld[r1].nregs;
! if (t != 0)
! return t;
! /* Consider reloads in order of increasing reg-class number. */
! t = (int) rld[r1].class - (int) rld[r2].class;
! if (t != 0)
! return t;
! /* If reloads are equally urgent, sort by reload number,
! so that the results of qsort leave nothing to chance. */
! return r1 - r2;
! }
!
! /* The cost of spilling each hard reg. */
! static int spill_cost[FIRST_PSEUDO_REGISTER];
! static int
! hard_reg_use_compare (p1p, p2p)
! const PTR p1p;
! const PTR p2p;
! {
! struct hard_reg_n_uses *p1 = (struct hard_reg_n_uses *)p1p;
! struct hard_reg_n_uses *p2 = (struct hard_reg_n_uses *)p2p;
! int bad1 = TEST_HARD_REG_BIT (bad_spill_regs, p1->regno);
! int bad2 = TEST_HARD_REG_BIT (bad_spill_regs, p2->regno);
! if (bad1 && bad2)
! return p1->regno - p2->regno;
! if (bad1)
! return 1;
! if (bad2)
! return -1;
! if (p1->uses > p2->uses)
! return 1;
! if (p1->uses < p2->uses)
! return -1;
! /* If regs are equally good, sort by regno,
! so that the results of qsort leave nothing to chance. */
! return p1->regno - p2->regno;
! }
! /* Used for communication between order_regs_for_reload and count_pseudo.
! Used to avoid counting one pseudo twice. */
! static regset pseudos_counted;
! /* Update the costs in N_USES, considering that pseudo REG is live. */
! static void
! count_pseudo (n_uses, reg)
! struct hard_reg_n_uses *n_uses;
! int reg;
! {
! int r = reg_renumber[reg];
! int nregs;
! if (REGNO_REG_SET_P (pseudos_counted, reg))
! return;
! SET_REGNO_REG_SET (pseudos_counted, reg);
! if (r < 0)
! abort ();
! nregs = HARD_REGNO_NREGS (r, PSEUDO_REGNO_MODE (reg));
! while (nregs-- > 0)
! n_uses[r++].uses += REG_N_REFS (reg);
! }
! /* Choose the order to consider regs for use as reload registers
! based on how much trouble would be caused by spilling one.
! Store them in order of decreasing preference in potential_reload_regs. */
! static void
! order_regs_for_reload (chain)
! struct insn_chain *chain;
! {
! register int i, j;
! register int o = 0;
! struct hard_reg_n_uses hard_reg_n_uses[FIRST_PSEUDO_REGISTER];
! pseudos_counted = ALLOCA_REG_SET ();
! COPY_HARD_REG_SET (bad_spill_regs, bad_spill_regs_global);
! /* Count number of uses of each hard reg by pseudo regs allocated to it
! and then order them by decreasing use. */
! for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)
! {
! hard_reg_n_uses[i].regno = i;
! hard_reg_n_uses[i].uses = 0;
! /* Test the various reasons why we can't use a register for
! spilling in this insn. */
! if (fixed_regs[i]
! || REGNO_REG_SET_P (chain->live_before, i)
! || REGNO_REG_SET_P (chain->live_after, i))
! SET_HARD_REG_BIT (bad_spill_regs, i);
}
+ /* Now find out which pseudos are allocated to it, and update
+ hard_reg_n_uses. */
+ CLEAR_REG_SET (pseudos_counted);
! EXECUTE_IF_SET_IN_REG_SET
! (chain->live_before, FIRST_PSEUDO_REGISTER, j,
! {
! count_pseudo (hard_reg_n_uses, j);
! });
! EXECUTE_IF_SET_IN_REG_SET
! (chain->live_after, FIRST_PSEUDO_REGISTER, j,
! {
! count_pseudo (hard_reg_n_uses, j);
! });
! FREE_REG_SET (pseudos_counted);
! for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)
! spill_cost[i] = hard_reg_n_uses[i].uses;
! /* Prefer registers not so far used, for use in temporary loading.
! Among them, if REG_ALLOC_ORDER is defined, use that order.
! Otherwise, prefer registers not preserved by calls. */
! #ifdef REG_ALLOC_ORDER
for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)
{
! int regno = reg_alloc_order[i];
! if (hard_reg_n_uses[regno].uses == 0
! && ! TEST_HARD_REG_BIT (bad_spill_regs, regno))
! potential_reload_regs[o++] = regno;
}
! #else
! for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)
! {
! if (hard_reg_n_uses[i].uses == 0 && call_used_regs[i]
! && ! TEST_HARD_REG_BIT (bad_spill_regs, i))
! potential_reload_regs[o++] = i;
! }
for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)
{
! if (hard_reg_n_uses[i].uses == 0 && ! call_used_regs[i]
! && ! TEST_HARD_REG_BIT (bad_spill_regs, i))
! potential_reload_regs[o++] = i;
! }
! #endif
! qsort (hard_reg_n_uses, FIRST_PSEUDO_REGISTER,
! sizeof hard_reg_n_uses[0], hard_reg_use_compare);
! /* Now add the regs that are already used,
! preferring those used less often. The fixed and otherwise forbidden
! registers will be at the end of this list. */
!
! for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)
! if (hard_reg_n_uses[i].uses != 0
! && ! TEST_HARD_REG_BIT (bad_spill_regs, hard_reg_n_uses[i].regno))
! potential_reload_regs[o++] = hard_reg_n_uses[i].regno;
! for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)
! if (TEST_HARD_REG_BIT (bad_spill_regs, hard_reg_n_uses[i].regno))
! potential_reload_regs[o++] = hard_reg_n_uses[i].regno;
}
+
+ /* Vector of reload-numbers showing the order in which the reloads should
+ be processed. */
+ static short reload_order[MAX_RELOADS];
+ /* This is used to keep track of the spill regs used in one insn. */
+ static HARD_REG_SET used_spill_regs_local;
+
/* If pseudo REG conflicts with one of our reload registers, mark it as
spilled. */
static void
*************** maybe_mark_pseudo_spilled (reg)
*** 1823,1981 ****
if (r < 0)
abort ();
nregs = HARD_REGNO_NREGS (r, PSEUDO_REGNO_MODE (reg));
! for (i = 0; i < n_spills; i++)
! if (r <= spill_regs[i] && r + nregs > spill_regs[i])
{
SET_REGNO_REG_SET (spilled_pseudos, reg);
return;
}
}
/* Find more reload regs to satisfy the remaining need of an insn, which
is given by CHAIN.
Do it by ascending class number, since otherwise a reg
might be spilled for a big class and might fail to count
! for a smaller class even though it belongs to that class.
- Count spilled regs in `spills', and add entries to
- `spill_regs' and `spill_reg_order'.
-
- ??? Note there is a problem here.
- When there is a need for a group in a high-numbered class,
- and also need for non-group regs that come from a lower class,
- the non-group regs are chosen first. If there aren't many regs,
- they might leave no room for a group.
-
- This was happening on the 386. To fix it, we added the code
- that calls possible_group_p, so that the lower class won't
- break up the last possible group.
-
- Really fixing the problem would require changes above
- in counting the regs already spilled, and in choose_reload_regs.
- It might be hard to avoid introducing bugs there. */
-
static void
find_reload_regs (chain, dumpfile)
struct insn_chain *chain;
FILE *dumpfile;
{
! int i, class;
! short *group_needs = chain->need.groups;
! short *simple_needs = chain->need.regs[0];
! short *nongroup_needs = chain->need.regs[1];
!
! if (dumpfile)
! fprintf (dumpfile, "Spilling for insn %d.\n", INSN_UID (chain->insn));
!
! /* Compute the order of preference for hard registers to spill.
! Store them by decreasing preference in potential_reload_regs. */
!
! order_regs_for_reload (chain);
!
! /* So far, no hard regs have been spilled. */
! n_spills = 0;
! for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)
! spill_reg_order[i] = -1;
! CLEAR_HARD_REG_SET (chain->used_spill_regs);
! CLEAR_HARD_REG_SET (chain->counted_for_groups);
! CLEAR_HARD_REG_SET (chain->counted_for_nongroups);
! for (class = 0; class < N_REG_CLASSES; class++)
{
! /* First get the groups of registers.
! If we got single registers first, we might fragment
! possible groups. */
! while (group_needs[class] > 0)
{
! /* If any single spilled regs happen to form groups,
! count them now. Maybe we don't really need
! to spill another group. */
! count_possible_groups (chain, class);
!
! if (group_needs[class] <= 0)
! break;
!
! /* Groups of size 2, the only groups used on most machines,
! are treated specially. */
! if (chain->group_size[class] == 2)
! find_tworeg_group (chain, class, dumpfile);
! else
! find_group (chain, class, dumpfile);
! if (failure)
! return;
}
! /* Now similarly satisfy all need for single registers. */
! while (simple_needs[class] > 0 || nongroup_needs[class] > 0)
! {
! /* If we spilled enough regs, but they weren't counted
! against the non-group need, see if we can count them now.
! If so, we can avoid some actual spilling. */
! if (simple_needs[class] <= 0 && nongroup_needs[class] > 0)
! for (i = 0; i < n_spills; i++)
! {
! int regno = spill_regs[i];
! if (TEST_HARD_REG_BIT (reg_class_contents[class], regno)
! && !TEST_HARD_REG_BIT (chain->counted_for_groups, regno)
! && !TEST_HARD_REG_BIT (chain->counted_for_nongroups, regno)
! && nongroup_needs[class] > 0)
! {
! register enum reg_class *p;
! SET_HARD_REG_BIT (chain->counted_for_nongroups, regno);
! nongroup_needs[class]--;
! p = reg_class_superclasses[class];
! while (*p != LIM_REG_CLASSES)
! nongroup_needs[(int) *p++]--;
! }
! }
! if (simple_needs[class] <= 0 && nongroup_needs[class] <= 0)
! break;
! /* Consider the potential reload regs that aren't
! yet in use as reload regs, in order of preference.
! Find the most preferred one that's in this class. */
! for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)
! {
! int regno = potential_reload_regs[i];
! if (regno >= 0
! && TEST_HARD_REG_BIT (reg_class_contents[class], regno)
! /* If this reg will not be available for groups,
! pick one that does not foreclose possible groups.
! This is a kludge, and not very general,
! but it should be sufficient to make the 386 work,
! and the problem should not occur on machines with
! more registers. */
! && (nongroup_needs[class] == 0
! || possible_group_p (chain, regno)))
! break;
! }
!
! /* If we couldn't get a register, try to get one even if we
! might foreclose possible groups. This may cause problems
! later, but that's better than aborting now, since it is
! possible that we will, in fact, be able to form the needed
! group even with this allocation. */
!
! if (i >= FIRST_PSEUDO_REGISTER
! && asm_noperands (chain->insn) < 0)
! for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)
! if (potential_reload_regs[i] >= 0
! && TEST_HARD_REG_BIT (reg_class_contents[class],
! potential_reload_regs[i]))
! break;
! /* I should be the index in potential_reload_regs
! of the new reload reg we have found. */
! new_spill_reg (chain, i, class, 1, dumpfile);
! if (failure)
return;
! }
}
/* We know which hard regs to use, now mark the pseudos that live in them
--- 1642,1787 ----
if (r < 0)
abort ();
nregs = HARD_REGNO_NREGS (r, PSEUDO_REGNO_MODE (reg));
! for (i = 0; i < nregs; i++)
! if (TEST_HARD_REG_BIT (used_spill_regs_local, r + i))
{
SET_REGNO_REG_SET (spilled_pseudos, reg);
return;
}
}
+ /* Find reload register to use for reload number ORDER. */
+
+ static int
+ find_reg (chain, order, dumpfile)
+ struct insn_chain *chain;
+ int order;
+ FILE *dumpfile;
+ {
+ int rnum = reload_order[order];
+ struct reload *rl = rld + rnum;
+ int best_cost = INT_MAX;
+ int best_reg = -1;
+ int i, j;
+ HARD_REG_SET not_usable;
+ HARD_REG_SET used_by_other_reload;
+
+ COPY_HARD_REG_SET (not_usable, bad_spill_regs);
+ IOR_HARD_REG_SET (not_usable, bad_spill_regs_global);
+ IOR_COMPL_HARD_REG_SET (not_usable, reg_class_contents[rl->class]);
+
+ CLEAR_HARD_REG_SET (used_by_other_reload);
+ for (i = 0; i < order; i++)
+ {
+ int other = reload_order[i];
+ if (rld[other].regno >= 0 && reloads_conflict (other, rnum))
+ for (j = 0; j < rld[other].nregs; j++)
+ SET_HARD_REG_BIT (used_by_other_reload, rld[other].regno + j);
+ }
+
+ for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)
+ {
+ int regno = potential_reload_regs[i];
+ if (! TEST_HARD_REG_BIT (not_usable, regno)
+ && ! TEST_HARD_REG_BIT (used_by_other_reload, regno)
+ && HARD_REGNO_MODE_OK (regno, rl->mode))
+ {
+ int this_cost = 0;
+ int ok = 1;
+ int this_nregs = HARD_REGNO_NREGS (regno, rl->mode);
+
+ for (j = 0; j < this_nregs; j++)
+ {
+ this_cost += spill_cost[regno + j];
+ if ((TEST_HARD_REG_BIT (not_usable, regno + j))
+ || TEST_HARD_REG_BIT (used_by_other_reload, regno + j))
+ ok = 0;
+ }
+ if (rl->in && GET_CODE (rl->in) == REG && REGNO (rl->in) == regno)
+ this_cost--;
+ if (rl->out && GET_CODE (rl->out) == REG && REGNO (rl->out) == regno)
+ this_cost--;
+ if (ok && this_cost < best_cost)
+ {
+ best_reg = regno;
+ best_cost = this_cost;
+ }
+ }
+ }
+ if (best_reg == -1)
+ return 0;
+ if (dumpfile)
+ fprintf (dumpfile, "Using reg %d for reload %d\n", best_reg, rnum);
+ rl->nregs = HARD_REGNO_NREGS (best_reg, rl->mode);
+ rl->regno = best_reg;
+ for (i = 0; i < rl->nregs; i++)
+ {
+ spill_cost[best_reg + i] = 0;
+ SET_HARD_REG_BIT (used_spill_regs_local, best_reg + i);
+ }
+ return 1;
+ }
+
/* Find more reload regs to satisfy the remaining need of an insn, which
is given by CHAIN.
Do it by ascending class number, since otherwise a reg
might be spilled for a big class and might fail to count
! for a smaller class even though it belongs to that class. */
static void
find_reload_regs (chain, dumpfile)
struct insn_chain *chain;
FILE *dumpfile;
{
! int i;
! /* In order to be certain of getting the registers we need,
! we must sort the reloads into order of increasing register class.
! Then our grabbing of reload registers will parallel the process
! that provided the reload registers. */
! for (i = 0; i < chain->n_reloads; i++)
{
! /* Show whether this reload already has a hard reg. */
! if (chain->rld[i].reg_rtx)
{
! int regno = REGNO (chain->rld[i].reg_rtx);
! chain->rld[i].regno = regno;
! chain->rld[i].nregs = HARD_REGNO_NREGS (regno, GET_MODE (chain->rld[i].reg_rtx));
}
+ else
+ chain->rld[i].regno = -1;
+ reload_order[i] = i;
+ }
! n_reloads = chain->n_reloads;
! memcpy (rld, chain->rld, n_reloads * sizeof (struct reload));
! CLEAR_HARD_REG_SET (used_spill_regs_local);
! if (dumpfile)
! fprintf (dumpfile, "Spilling for insn %d.\n", INSN_UID (chain->insn));
! qsort (reload_order, n_reloads, sizeof (short), reload_reg_class_lower);
! /* Compute the order of preference for hard registers to spill. */
! order_regs_for_reload (chain);
! for (i = 0; i < n_reloads; i++)
! {
! int r = reload_order[i];
! /* Ignore reloads that got marked inoperative. */
! if ((rld[r].out != 0 || rld[r].in != 0 || rld[r].secondary_p)
! && ! rld[r].optional
! && rld[r].regno == -1)
! if (! find_reg (chain, i, dumpfile))
! {
! spill_failure (chain->insn);
! failure = 1;
return;
! }
}
/* We know which hard regs to use, now mark the pseudos that live in them
*************** find_reload_regs (chain, dumpfile)
*** 1990,2027 ****
{
maybe_mark_pseudo_spilled (i);
});
! IOR_HARD_REG_SET (used_spill_regs, chain->used_spill_regs);
}
! void
! dump_needs (chain, dumpfile)
! struct insn_chain *chain;
FILE *dumpfile;
{
! static const char * const reg_class_names[] = REG_CLASS_NAMES;
! int i;
! struct needs *n = &chain->need;
! for (i = 0; i < N_REG_CLASSES; i++)
! {
! if (n->regs[i][0] > 0)
! fprintf (dumpfile,
! ";; Need %d reg%s of class %s.\n",
! n->regs[i][0], n->regs[i][0] == 1 ? "" : "s",
! reg_class_names[i]);
! if (n->regs[i][1] > 0)
! fprintf (dumpfile,
! ";; Need %d nongroup reg%s of class %s.\n",
! n->regs[i][1], n->regs[i][1] == 1 ? "" : "s",
! reg_class_names[i]);
! if (n->groups[i] > 0)
! fprintf (dumpfile,
! ";; Need %d group%s (%smode) of class %s.\n",
! n->groups[i], n->groups[i] == 1 ? "" : "s",
! GET_MODE_NAME(chain->group_mode[i]),
! reg_class_names[i]);
! }
}
/* Delete all insns that were inserted by emit_caller_save_insns during
--- 1796,1817 ----
{
maybe_mark_pseudo_spilled (i);
});
+ COPY_HARD_REG_SET (chain->used_spill_regs, used_spill_regs_local);
+ IOR_HARD_REG_SET (used_spill_regs, used_spill_regs_local);
! memcpy (chain->rld, rld, n_reloads * sizeof (struct reload));
}
! static void
! select_reload_regs (dumpfile)
FILE *dumpfile;
{
! struct insn_chain *chain;
! /* Try to satisfy the needs for each insn. */
! for (chain = insns_need_reload; chain != 0;
! chain = chain->next_need_reload)
! find_reload_regs (chain, dumpfile);
}
/* Delete all insns that were inserted by emit_caller_save_insns during
*************** delete_caller_save_insns ()
*** 2058,2312 ****
unused_insn_chains = c;
c = next;
}
! if (c != 0)
! c = c->next;
! }
! }
!
! /* Nonzero if, after spilling reg REGNO for non-groups,
! it will still be possible to find a group if we still need one. */
!
! static int
! possible_group_p (chain, regno)
! struct insn_chain *chain;
! int regno;
! {
! int i;
! int class = (int) NO_REGS;
!
! for (i = 0; i < (int) N_REG_CLASSES; i++)
! if (chain->need.groups[i] > 0)
! {
! class = i;
! break;
! }
!
! if (class == (int) NO_REGS)
! return 1;
!
! /* Consider each pair of consecutive registers. */
! for (i = 0; i < FIRST_PSEUDO_REGISTER - 1; i++)
! {
! /* Ignore pairs that include reg REGNO. */
! if (i == regno || i + 1 == regno)
! continue;
!
! /* Ignore pairs that are outside the class that needs the group.
! ??? Here we fail to handle the case where two different classes
! independently need groups. But this never happens with our
! current machine descriptions. */
! if (! (TEST_HARD_REG_BIT (reg_class_contents[class], i)
! && TEST_HARD_REG_BIT (reg_class_contents[class], i + 1)))
! continue;
!
! /* A pair of consecutive regs we can still spill does the trick. */
! if (spill_reg_order[i] < 0 && spill_reg_order[i + 1] < 0
! && ! TEST_HARD_REG_BIT (bad_spill_regs, i)
! && ! TEST_HARD_REG_BIT (bad_spill_regs, i + 1))
! return 1;
!
! /* A pair of one already spilled and one we can spill does it
! provided the one already spilled is not otherwise reserved. */
! if (spill_reg_order[i] < 0
! && ! TEST_HARD_REG_BIT (bad_spill_regs, i)
! && spill_reg_order[i + 1] >= 0
! && ! TEST_HARD_REG_BIT (chain->counted_for_groups, i + 1)
! && ! TEST_HARD_REG_BIT (chain->counted_for_nongroups, i + 1))
! return 1;
! if (spill_reg_order[i + 1] < 0
! && ! TEST_HARD_REG_BIT (bad_spill_regs, i + 1)
! && spill_reg_order[i] >= 0
! && ! TEST_HARD_REG_BIT (chain->counted_for_groups, i)
! && ! TEST_HARD_REG_BIT (chain->counted_for_nongroups, i))
! return 1;
! }
!
! return 0;
! }
!
! /* Count any groups of CLASS that can be formed from the registers recently
! spilled. */
!
! static void
! count_possible_groups (chain, class)
! struct insn_chain *chain;
! int class;
! {
! HARD_REG_SET new;
! int i, j;
!
! /* Now find all consecutive groups of spilled registers
! and mark each group off against the need for such groups.
! But don't count them against ordinary need, yet. */
!
! if (chain->group_size[class] == 0)
! return;
!
! CLEAR_HARD_REG_SET (new);
!
! /* Make a mask of all the regs that are spill regs in class I. */
! for (i = 0; i < n_spills; i++)
! {
! int regno = spill_regs[i];
!
! if (TEST_HARD_REG_BIT (reg_class_contents[class], regno)
! && ! TEST_HARD_REG_BIT (chain->counted_for_groups, regno)
! && ! TEST_HARD_REG_BIT (chain->counted_for_nongroups, regno))
! SET_HARD_REG_BIT (new, regno);
! }
!
! /* Find each consecutive group of them. */
! for (i = 0; i < FIRST_PSEUDO_REGISTER && chain->need.groups[class] > 0; i++)
! if (TEST_HARD_REG_BIT (new, i)
! && i + chain->group_size[class] <= FIRST_PSEUDO_REGISTER
! && HARD_REGNO_MODE_OK (i, chain->group_mode[class]))
! {
! for (j = 1; j < chain->group_size[class]; j++)
! if (! TEST_HARD_REG_BIT (new, i + j))
! break;
!
! if (j == chain->group_size[class])
! {
! /* We found a group. Mark it off against this class's need for
! groups, and against each superclass too. */
! register enum reg_class *p;
!
! chain->need.groups[class]--;
! p = reg_class_superclasses[class];
! while (*p != LIM_REG_CLASSES)
! {
! if (chain->group_size [(int) *p] <= chain->group_size [class])
! chain->need.groups[(int) *p]--;
! p++;
! }
!
! /* Don't count these registers again. */
! for (j = 0; j < chain->group_size[class]; j++)
! SET_HARD_REG_BIT (chain->counted_for_groups, i + j);
! }
!
! /* Skip to the last reg in this group. When i is incremented above,
! it will then point to the first reg of the next possible group. */
! i += j - 1;
! }
! }
!
! /* ALLOCATE_MODE is a register mode that needs to be reloaded. OTHER_MODE is
! another mode that needs to be reloaded for the same register class CLASS.
! If any reg in CLASS allows ALLOCATE_MODE but not OTHER_MODE, fail.
! ALLOCATE_MODE will never be smaller than OTHER_MODE.
!
! This code used to also fail if any reg in CLASS allows OTHER_MODE but not
! ALLOCATE_MODE. This test is unnecessary, because we will never try to put
! something of mode ALLOCATE_MODE into an OTHER_MODE register. Testing this
! causes unnecessary failures on machines requiring alignment of register
! groups when the two modes are different sizes, because the larger mode has
! more strict alignment rules than the smaller mode. */
!
! static int
! modes_equiv_for_class_p (allocate_mode, other_mode, class)
! enum machine_mode allocate_mode, other_mode;
! enum reg_class class;
! {
! register int regno;
! for (regno = 0; regno < FIRST_PSEUDO_REGISTER; regno++)
! {
! if (TEST_HARD_REG_BIT (reg_class_contents[(int) class], regno)
! && HARD_REGNO_MODE_OK (regno, allocate_mode)
! && ! HARD_REGNO_MODE_OK (regno, other_mode))
! return 0;
! }
! return 1;
! }
!
! /* Handle the failure to find a register to spill.
! INSN should be one of the insns which needed this particular spill reg. */
!
! static void
! spill_failure (insn)
! rtx insn;
! {
! if (asm_noperands (PATTERN (insn)) >= 0)
! error_for_asm (insn, "`asm' needs too many reloads");
! else
! fatal_insn ("Unable to find a register to spill.", insn);
! }
!
! /* Add a new register to the tables of available spill-registers.
! CHAIN is the insn for which the register will be used; we decrease the
! needs of that insn.
! I is the index of this register in potential_reload_regs.
! CLASS is the regclass whose need is being satisfied.
! NONGROUP is 0 if this register is part of a group.
! DUMPFILE is the same as the one that `reload' got. */
!
! static void
! new_spill_reg (chain, i, class, nongroup, dumpfile)
! struct insn_chain *chain;
! int i;
! int class;
! int nongroup;
! FILE *dumpfile;
! {
! register enum reg_class *p;
! int regno = potential_reload_regs[i];
!
! if (i >= FIRST_PSEUDO_REGISTER)
! {
! spill_failure (chain->insn);
! failure = 1;
! return;
! }
!
! if (TEST_HARD_REG_BIT (bad_spill_regs, regno))
! {
! static const char * const reg_class_names[] = REG_CLASS_NAMES;
!
! if (asm_noperands (PATTERN (chain->insn)) < 0)
! {
! /* The error message is still correct - we know only that it wasn't
! an asm statement that caused the problem, but one of the global
! registers declared by the users might have screwed us. */
! error ("fixed or forbidden register %d (%s) was spilled for class %s.",
! regno, reg_names[regno], reg_class_names[class]);
! error ("This may be due to a compiler bug or to impossible asm");
! error ("statements or clauses.");
! fatal_insn ("This is the instruction:", chain->insn);
! }
! error_for_asm (chain->insn, "Invalid `asm' statement:");
! error_for_asm (chain->insn,
! "fixed or forbidden register %d (%s) was spilled for class %s.",
! regno, reg_names[regno], reg_class_names[class]);
! failure = 1;
! return;
! }
!
! /* Make reg REGNO an additional reload reg. */
!
! potential_reload_regs[i] = -1;
! spill_regs[n_spills] = regno;
! spill_reg_order[regno] = n_spills;
! if (dumpfile)
! fprintf (dumpfile, "Spilling reg %d.\n", regno);
! SET_HARD_REG_BIT (chain->used_spill_regs, regno);
!
! /* Clear off the needs we just satisfied. */
!
! chain->need.regs[0][class]--;
! p = reg_class_superclasses[class];
! while (*p != LIM_REG_CLASSES)
! chain->need.regs[0][(int) *p++]--;
!
! if (nongroup && chain->need.regs[1][class] > 0)
! {
! SET_HARD_REG_BIT (chain->counted_for_nongroups, regno);
! chain->need.regs[1][class]--;
! p = reg_class_superclasses[class];
! while (*p != LIM_REG_CLASSES)
! chain->need.regs[1][(int) *p++]--;
}
! n_spills++;
}
/* Delete an unneeded INSN and any previous insns who sole purpose is loading
--- 1848,1869 ----
unused_insn_chains = c;
c = next;
}
! if (c != 0)
! c = c->next;
}
+ }
+
+ /* Handle the failure to find a register to spill.
+ INSN should be one of the insns which needed this particular spill reg. */
! static void
! spill_failure (insn)
! rtx insn;
! {
! if (asm_noperands (PATTERN (insn)) >= 0)
! error_for_asm (insn, "`asm' needs too many reloads");
! else
! fatal_insn ("Unable to find a register to spill.", insn);
}
/* Delete an unneeded INSN and any previous insns who sole purpose is loading
*************** scan_paradoxical_subregs (x)
*** 4147,4292 ****
}
}
- static int
- hard_reg_use_compare (p1p, p2p)
- const PTR p1p;
- const PTR p2p;
- {
- const struct hard_reg_n_uses *p1 = (const struct hard_reg_n_uses *)p1p;
- const struct hard_reg_n_uses *p2 = (const struct hard_reg_n_uses *)p2p;
- int bad1 = TEST_HARD_REG_BIT (bad_spill_regs, p1->regno);
- int bad2 = TEST_HARD_REG_BIT (bad_spill_regs, p2->regno);
- if (bad1 && bad2)
- return p1->regno - p2->regno;
- if (bad1)
- return 1;
- if (bad2)
- return -1;
- if (p1->uses > p2->uses)
- return 1;
- if (p1->uses < p2->uses)
- return -1;
- /* If regs are equally good, sort by regno,
- so that the results of qsort leave nothing to chance. */
- return p1->regno - p2->regno;
- }
-
- /* Used for communication between order_regs_for_reload and count_pseudo.
- Used to avoid counting one pseudo twice. */
- static regset pseudos_counted;
-
- /* Update the costs in N_USES, considering that pseudo REG is live. */
- static void
- count_pseudo (n_uses, reg)
- struct hard_reg_n_uses *n_uses;
- int reg;
- {
- int r = reg_renumber[reg];
- int nregs;
-
- if (REGNO_REG_SET_P (pseudos_counted, reg))
- return;
- SET_REGNO_REG_SET (pseudos_counted, reg);
-
- if (r < 0)
- abort ();
-
- nregs = HARD_REGNO_NREGS (r, PSEUDO_REGNO_MODE (reg));
- while (nregs-- > 0)
- n_uses[r++].uses += REG_N_REFS (reg);
- }
- /* Choose the order to consider regs for use as reload registers
- based on how much trouble would be caused by spilling one.
- Store them in order of decreasing preference in potential_reload_regs. */
-
- static void
- order_regs_for_reload (chain)
- struct insn_chain *chain;
- {
- register int i;
- register int o = 0;
- struct hard_reg_n_uses hard_reg_n_uses[FIRST_PSEUDO_REGISTER];
-
- pseudos_counted = ALLOCA_REG_SET ();
-
- COPY_HARD_REG_SET (bad_spill_regs, bad_spill_regs_global);
-
- /* Count number of uses of each hard reg by pseudo regs allocated to it
- and then order them by decreasing use. */
-
- for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)
- {
- hard_reg_n_uses[i].regno = i;
- hard_reg_n_uses[i].uses = 0;
-
- /* Test the various reasons why we can't use a register for
- spilling in this insn. */
- if (fixed_regs[i]
- || REGNO_REG_SET_P (chain->live_before, i)
- || REGNO_REG_SET_P (chain->live_after, i))
- SET_HARD_REG_BIT (bad_spill_regs, i);
- }
-
- /* Now compute hard_reg_n_uses. */
- CLEAR_REG_SET (pseudos_counted);
-
- EXECUTE_IF_SET_IN_REG_SET
- (chain->live_before, FIRST_PSEUDO_REGISTER, i,
- {
- count_pseudo (hard_reg_n_uses, i);
- });
- EXECUTE_IF_SET_IN_REG_SET
- (chain->live_after, FIRST_PSEUDO_REGISTER, i,
- {
- count_pseudo (hard_reg_n_uses, i);
- });
-
- FREE_REG_SET (pseudos_counted);
-
- /* Prefer registers not so far used, for use in temporary loading.
- Among them, if REG_ALLOC_ORDER is defined, use that order.
- Otherwise, prefer registers not preserved by calls. */
-
- #ifdef REG_ALLOC_ORDER
- for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)
- {
- int regno = reg_alloc_order[i];
-
- if (hard_reg_n_uses[regno].uses == 0
- && ! TEST_HARD_REG_BIT (bad_spill_regs, regno))
- potential_reload_regs[o++] = regno;
- }
- #else
- for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)
- {
- if (hard_reg_n_uses[i].uses == 0 && call_used_regs[i]
- && ! TEST_HARD_REG_BIT (bad_spill_regs, i))
- potential_reload_regs[o++] = i;
- }
- for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)
- {
- if (hard_reg_n_uses[i].uses == 0 && ! call_used_regs[i]
- && ! TEST_HARD_REG_BIT (bad_spill_regs, i))
- potential_reload_regs[o++] = i;
- }
- #endif
-
- qsort (hard_reg_n_uses, FIRST_PSEUDO_REGISTER,
- sizeof hard_reg_n_uses[0], hard_reg_use_compare);
-
- /* Now add the regs that are already used,
- preferring those used less often. The fixed and otherwise forbidden
- registers will be at the end of this list. */
-
- for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)
- if (hard_reg_n_uses[i].uses != 0
- && ! TEST_HARD_REG_BIT (bad_spill_regs, hard_reg_n_uses[i].regno))
- potential_reload_regs[o++] = hard_reg_n_uses[i].regno;
- for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)
- if (TEST_HARD_REG_BIT (bad_spill_regs, hard_reg_n_uses[i].regno))
- potential_reload_regs[o++] = hard_reg_n_uses[i].regno;
- }
-
/* Reload pseudo-registers into hard regs around each insn as needed.
Additional register load insns are output before the insn that needs it
and perhaps store insns after insns that modify the reloaded pseudo reg.
--- 3704,3709 ----
*************** forget_old_reloads_1 (x, ignored, data)
*** 4636,4678 ****
reg_last_reload_reg[regno + nr] = 0;
}
- /* Comparison function for qsort to decide which of two reloads
- should be handled first. *P1 and *P2 are the reload numbers. */
-
- static int
- reload_reg_class_lower (r1p, r2p)
- const PTR r1p;
- const PTR r2p;
- {
- register int r1 = *(const short *)r1p, r2 = *(const short *)r2p;
- register int t;
-
- /* Consider required reloads before optional ones. */
- t = rld[r1].optional - rld[r2].optional;
- if (t != 0)
- return t;
-
- /* Count all solitary classes before non-solitary ones. */
- t = ((reg_class_size[(int) rld[r2].class] == 1)
- - (reg_class_size[(int) rld[r1].class] == 1));
- if (t != 0)
- return t;
-
- /* Aside from solitaires, consider all multi-reg groups first. */
- t = rld[r2].nregs - rld[r1].nregs;
- if (t != 0)
- return t;
-
- /* Consider reloads in order of increasing reg-class number. */
- t = (int) rld[r1].class - (int) rld[r2].class;
- if (t != 0)
- return t;
-
- /* If reloads are equally urgent, sort by reload number,
- so that the results of qsort leave nothing to chance. */
- return r1 - r2;
- }
-
/* The following HARD_REG_SETs indicate when each hard register is
used for a reload of various parts of the current insn. */
--- 4053,4058 ----
*************** reloads_conflict (r1, r2)
*** 5250,5259 ****
}
}
- /* Vector of reload-numbers showing the order in which the reloads should
- be processed. */
- short reload_order[MAX_RELOADS];
-
/* Indexed by reload number, 1 if incoming value
inherited from previous insns. */
char reload_inherited[MAX_RELOADS];
--- 4630,4635 ----
*************** allocate_reload_reg (chain, r, last_relo
*** 5682,5703 ****
break;
}
/* Otherwise check that as many consecutive regs as we need
! are available here.
! Also, don't use for a group registers that are
! needed for nongroups. */
! if (! TEST_HARD_REG_BIT (chain->counted_for_nongroups, regnum))
! while (nr > 1)
! {
! int regno = regnum + nr - 1;
! if (!(TEST_HARD_REG_BIT (reg_class_contents[class], regno)
! && spill_reg_order[regno] >= 0
! && reload_reg_free_p (regno, rld[r].opnum,
! rld[r].when_needed)
! && ! TEST_HARD_REG_BIT (chain->counted_for_nongroups,
! regno)))
! break;
! nr--;
! }
if (nr == 1)
break;
}
--- 5058,5074 ----
break;
}
/* Otherwise check that as many consecutive regs as we need
! are available here. */
! while (nr > 1)
! {
! int regno = regnum + nr - 1;
! if (!(TEST_HARD_REG_BIT (reg_class_contents[class], regno)
! && spill_reg_order[regno] >= 0
! && reload_reg_free_p (regno, rld[r].opnum,
! rld[r].when_needed)))
! break;
! nr--;
! }
if (nr == 1)
break;
}
*************** allocate_reload_reg (chain, r, last_relo
*** 5707,5729 ****
if (count < n_spills)
break;
}
!
/* We should have found a spill register by now. */
! if (count == n_spills)
{
! if (noerror)
! return 0;
! goto failure;
! }
! if (set_reload_reg (i, r))
! return 1;
- /* The reg is not OK. */
if (noerror)
return 0;
- failure:
failed_reload (insn, r);
return 1;
--- 5078,5097 ----
if (count < n_spills)
break;
}
!
/* We should have found a spill register by now. */
! if (count < n_spills)
{
! /* I is the index in SPILL_REG_RTX of the reload register we are to
! allocate. Get an rtx for it and find its register number. */
! if (set_reload_reg (i, r))
! return 1;
! }
if (noerror)
return 0;
failed_reload (insn, r);
return 1;
*************** choose_reload_regs (chain)
*** 5800,5807 ****
register int i, j;
int max_group_size = 1;
enum reg_class group_class = NO_REGS;
! int inheritance;
! int pass;
rtx save_reload_reg_rtx[MAX_RELOADS];
--- 5168,5174 ----
register int i, j;
int max_group_size = 1;
enum reg_class group_class = NO_REGS;
! int pass, win;
rtx save_reload_reg_rtx[MAX_RELOADS];
*************** choose_reload_regs (chain)
*** 5836,5843 ****
Using inheritance when not optimizing leads to paradoxes
with fp on the 68k: fp numbers (not NaNs) fail to be equal to themselves
because one side of the comparison might be inherited. */
!
! for (inheritance = optimize > 0; inheritance >= 0; inheritance--)
{
choose_reload_regs_init (chain, save_reload_reg_rtx);
--- 5203,5210 ----
Using inheritance when not optimizing leads to paradoxes
with fp on the 68k: fp numbers (not NaNs) fail to be equal to themselves
because one side of the comparison might be inherited. */
! win = 0;
! if (optimize > 0)
{
choose_reload_regs_init (chain, save_reload_reg_rtx);
*************** choose_reload_regs (chain)
*** 5894,5900 ****
|| rld[reload_order[i]].secondary_p)
&& ! rld[reload_order[i]].optional
&& rld[reload_order[i]].reg_rtx == 0)
! allocate_reload_reg (chain, reload_order[i], 0, inheritance);
#endif
/* First see if this pseudo is already available as reloaded
--- 5261,5267 ----
|| rld[reload_order[i]].secondary_p)
&& ! rld[reload_order[i]].optional
&& rld[reload_order[i]].reg_rtx == 0)
! allocate_reload_reg (chain, reload_order[i], 0, 1);
#endif
/* First see if this pseudo is already available as reloaded
*************** choose_reload_regs (chain)
*** 5911,6087 ****
register be allocated here. In `emit_reload_insns' we suppress
one of the loads in the case described above. */
! if (inheritance)
! {
! int word = 0;
! register int regno = -1;
! enum machine_mode mode = VOIDmode;
!
! if (rld[r].in == 0)
! ;
! else if (GET_CODE (rld[r].in) == REG)
! {
! regno = REGNO (rld[r].in);
! mode = GET_MODE (rld[r].in);
! }
! else if (GET_CODE (rld[r].in_reg) == REG)
! {
! regno = REGNO (rld[r].in_reg);
! mode = GET_MODE (rld[r].in_reg);
! }
! else if (GET_CODE (rld[r].in_reg) == SUBREG
! && GET_CODE (SUBREG_REG (rld[r].in_reg)) == REG)
! {
! word = SUBREG_WORD (rld[r].in_reg);
! regno = REGNO (SUBREG_REG (rld[r].in_reg));
! if (regno < FIRST_PSEUDO_REGISTER)
! regno += word;
! mode = GET_MODE (rld[r].in_reg);
! }
#ifdef AUTO_INC_DEC
! else if ((GET_CODE (rld[r].in_reg) == PRE_INC
! || GET_CODE (rld[r].in_reg) == PRE_DEC
! || GET_CODE (rld[r].in_reg) == POST_INC
! || GET_CODE (rld[r].in_reg) == POST_DEC)
! && GET_CODE (XEXP (rld[r].in_reg, 0)) == REG)
! {
! regno = REGNO (XEXP (rld[r].in_reg, 0));
! mode = GET_MODE (XEXP (rld[r].in_reg, 0));
! rld[r].out = rld[r].in;
! }
#endif
#if 0
! /* This won't work, since REGNO can be a pseudo reg number.
! Also, it takes much more hair to keep track of all the things
! that can invalidate an inherited reload of part of a pseudoreg. */
! else if (GET_CODE (rld[r].in) == SUBREG
! && GET_CODE (SUBREG_REG (rld[r].in)) == REG)
! regno = REGNO (SUBREG_REG (rld[r].in)) + SUBREG_WORD (rld[r].in);
#endif
! if (regno >= 0 && reg_last_reload_reg[regno] != 0)
! {
! enum reg_class class = rld[r].class, last_class;
! rtx last_reg = reg_last_reload_reg[regno];
! i = REGNO (last_reg) + word;
! last_class = REGNO_REG_CLASS (i);
! if ((GET_MODE_SIZE (GET_MODE (last_reg))
! >= GET_MODE_SIZE (mode) + word * UNITS_PER_WORD)
! && reg_reloaded_contents[i] == regno
! && TEST_HARD_REG_BIT (reg_reloaded_valid, i)
! && HARD_REGNO_MODE_OK (i, rld[r].mode)
! && (TEST_HARD_REG_BIT (reg_class_contents[(int) class], i)
! /* Even if we can't use this register as a reload
! register, we might use it for reload_override_in,
! if copying it to the desired class is cheap
! enough. */
! || ((REGISTER_MOVE_COST (last_class, class)
! < MEMORY_MOVE_COST (mode, class, 1))
#ifdef SECONDARY_INPUT_RELOAD_CLASS
! && (SECONDARY_INPUT_RELOAD_CLASS (class, mode,
! last_reg)
! == NO_REGS)
#endif
#ifdef SECONDARY_MEMORY_NEEDED
! && ! SECONDARY_MEMORY_NEEDED (last_class, class,
! mode)
#endif
! ))
! && (rld[r].nregs == max_group_size
! || ! TEST_HARD_REG_BIT (reg_class_contents[(int) group_class],
! i))
! && reload_reg_free_for_value_p (i, rld[r].opnum,
! rld[r].when_needed,
! rld[r].in,
! const0_rtx, r, 1))
! {
! /* If a group is needed, verify that all the subsequent
! registers still have their values intact. */
! int nr
! = HARD_REGNO_NREGS (i, rld[r].mode);
! int k;
!
! for (k = 1; k < nr; k++)
! if (reg_reloaded_contents[i + k] != regno
! || ! TEST_HARD_REG_BIT (reg_reloaded_valid, i + k))
! break;
! if (k == nr)
! {
! int i1;
! last_reg = (GET_MODE (last_reg) == mode
! ? last_reg : gen_rtx_REG (mode, i));
! /* We found a register that contains the
! value we need. If this register is the
! same as an `earlyclobber' operand of the
! current insn, just mark it as a place to
! reload from since we can't use it as the
! reload register itself. */
!
! for (i1 = 0; i1 < n_earlyclobbers; i1++)
! if (reg_overlap_mentioned_for_reload_p
! (reg_last_reload_reg[regno],
! reload_earlyclobbers[i1]))
! break;
!
! if (i1 != n_earlyclobbers
! || ! (reload_reg_free_for_value_p
! (i, rld[r].opnum, rld[r].when_needed,
! rld[r].in, rld[r].out, r, 1))
! /* Don't use it if we'd clobber a pseudo reg. */
! || (TEST_HARD_REG_BIT (reg_used_in_insn, i)
! && rld[r].out
! && ! TEST_HARD_REG_BIT (reg_reloaded_dead, i))
! /* Don't clobber the frame pointer. */
! || (i == HARD_FRAME_POINTER_REGNUM && rld[r].out)
! /* Don't really use the inherited spill reg
! if we need it wider than we've got it. */
! || (GET_MODE_SIZE (rld[r].mode)
! > GET_MODE_SIZE (mode))
! || ! TEST_HARD_REG_BIT (reg_class_contents[(int) rld[r].class],
! i)
!
! /* If find_reloads chose reload_out as reload
! register, stay with it - that leaves the
! inherited register for subsequent reloads. */
! || (rld[r].out && rld[r].reg_rtx
! && rtx_equal_p (rld[r].out, rld[r].reg_rtx)))
! {
! reload_override_in[r] = last_reg;
! reload_inheritance_insn[r]
! = reg_reloaded_insn[i];
! }
! else
! {
! int k;
! /* We can use this as a reload reg. */
! /* Mark the register as in use for this part of
! the insn. */
! mark_reload_reg_in_use (i,
! rld[r].opnum,
! rld[r].when_needed,
! rld[r].mode);
! rld[r].reg_rtx = last_reg;
! reload_inherited[r] = 1;
! reload_inheritance_insn[r]
! = reg_reloaded_insn[i];
! reload_spill_index[r] = i;
! for (k = 0; k < nr; k++)
! SET_HARD_REG_BIT (reload_reg_used_for_inherit,
! i + k);
! }
! }
! }
! }
! }
/* Here's another way to see if the value is already lying around. */
! if (inheritance
! && rld[r].in != 0
&& ! reload_inherited[r]
&& rld[r].out == 0
&& (CONSTANT_P (rld[r].in)
--- 5278,5454 ----
register be allocated here. In `emit_reload_insns' we suppress
one of the loads in the case described above. */
! {
! int word = 0;
! register int regno = -1;
! enum machine_mode mode = VOIDmode;
!
! if (rld[r].in == 0)
! ;
! else if (GET_CODE (rld[r].in) == REG)
! {
! regno = REGNO (rld[r].in);
! mode = GET_MODE (rld[r].in);
! }
! else if (GET_CODE (rld[r].in_reg) == REG)
! {
! regno = REGNO (rld[r].in_reg);
! mode = GET_MODE (rld[r].in_reg);
! }
! else if (GET_CODE (rld[r].in_reg) == SUBREG
! && GET_CODE (SUBREG_REG (rld[r].in_reg)) == REG)
! {
! word = SUBREG_WORD (rld[r].in_reg);
! regno = REGNO (SUBREG_REG (rld[r].in_reg));
! if (regno < FIRST_PSEUDO_REGISTER)
! regno += word;
! mode = GET_MODE (rld[r].in_reg);
! }
#ifdef AUTO_INC_DEC
! else if ((GET_CODE (rld[r].in_reg) == PRE_INC
! || GET_CODE (rld[r].in_reg) == PRE_DEC
! || GET_CODE (rld[r].in_reg) == POST_INC
! || GET_CODE (rld[r].in_reg) == POST_DEC)
! && GET_CODE (XEXP (rld[r].in_reg, 0)) == REG)
! {
! regno = REGNO (XEXP (rld[r].in_reg, 0));
! mode = GET_MODE (XEXP (rld[r].in_reg, 0));
! rld[r].out = rld[r].in;
! }
#endif
#if 0
! /* This won't work, since REGNO can be a pseudo reg number.
! Also, it takes much more hair to keep track of all the things
! that can invalidate an inherited reload of part of a pseudoreg. */
! else if (GET_CODE (rld[r].in) == SUBREG
! && GET_CODE (SUBREG_REG (rld[r].in)) == REG)
! regno = REGNO (SUBREG_REG (rld[r].in)) + SUBREG_WORD (rld[r].in);
#endif
! if (regno >= 0 && reg_last_reload_reg[regno] != 0)
! {
! enum reg_class class = rld[r].class, last_class;
! rtx last_reg = reg_last_reload_reg[regno];
! i = REGNO (last_reg) + word;
! last_class = REGNO_REG_CLASS (i);
! if ((GET_MODE_SIZE (GET_MODE (last_reg))
! >= GET_MODE_SIZE (mode) + word * UNITS_PER_WORD)
! && reg_reloaded_contents[i] == regno
! && TEST_HARD_REG_BIT (reg_reloaded_valid, i)
! && HARD_REGNO_MODE_OK (i, rld[r].mode)
! && (TEST_HARD_REG_BIT (reg_class_contents[(int) class], i)
! /* Even if we can't use this register as a reload
! register, we might use it for reload_override_in,
! if copying it to the desired class is cheap
! enough. */
! || ((REGISTER_MOVE_COST (last_class, class)
! < MEMORY_MOVE_COST (mode, class, 1))
#ifdef SECONDARY_INPUT_RELOAD_CLASS
! && (SECONDARY_INPUT_RELOAD_CLASS (class, mode,
! last_reg)
! == NO_REGS)
#endif
#ifdef SECONDARY_MEMORY_NEEDED
! && ! SECONDARY_MEMORY_NEEDED (last_class, class,
! mode)
#endif
! ))
! && (rld[r].nregs == max_group_size
! || ! TEST_HARD_REG_BIT (reg_class_contents[(int) group_class],
! i))
! && reload_reg_free_for_value_p (i, rld[r].opnum,
! rld[r].when_needed,
! rld[r].in,
! const0_rtx, r, 1))
! {
! /* If a group is needed, verify that all the subsequent
! registers still have their values intact. */
! int nr
! = HARD_REGNO_NREGS (i, rld[r].mode);
! int k;
!
! for (k = 1; k < nr; k++)
! if (reg_reloaded_contents[i + k] != regno
! || ! TEST_HARD_REG_BIT (reg_reloaded_valid, i + k))
! break;
! if (k == nr)
! {
! int i1;
! last_reg = (GET_MODE (last_reg) == mode
! ? last_reg : gen_rtx_REG (mode, i));
! /* We found a register that contains the
! value we need. If this register is the
! same as an `earlyclobber' operand of the
! current insn, just mark it as a place to
! reload from since we can't use it as the
! reload register itself. */
!
! for (i1 = 0; i1 < n_earlyclobbers; i1++)
! if (reg_overlap_mentioned_for_reload_p
! (reg_last_reload_reg[regno],
! reload_earlyclobbers[i1]))
! break;
!
! if (i1 != n_earlyclobbers
! || ! (reload_reg_free_for_value_p
! (i, rld[r].opnum, rld[r].when_needed,
! rld[r].in, rld[r].out, r, 1))
! /* Don't use it if we'd clobber a pseudo reg. */
! || (TEST_HARD_REG_BIT (reg_used_in_insn, i)
! && rld[r].out
! && ! TEST_HARD_REG_BIT (reg_reloaded_dead, i))
! /* Don't clobber the frame pointer. */
! || (i == HARD_FRAME_POINTER_REGNUM
! && rld[r].out)
! /* Don't really use the inherited spill reg
! if we need it wider than we've got it. */
! || (GET_MODE_SIZE (rld[r].mode)
! > GET_MODE_SIZE (mode))
! || ! TEST_HARD_REG_BIT (reg_class_contents[(int) rld[r].class],
! i)
!
! /* If find_reloads chose reload_out as reload
! register, stay with it - that leaves the
! inherited register for subsequent reloads. */
! || (rld[r].out && rld[r].reg_rtx
! && rtx_equal_p (rld[r].out,
! rld[r].reg_rtx)))
! {
! reload_override_in[r] = last_reg;
! reload_inheritance_insn[r]
! = reg_reloaded_insn[i];
! }
! else
! {
! int k;
! /* We can use this as a reload reg. */
! /* Mark the register as in use for this part of
! the insn. */
! mark_reload_reg_in_use (i,
! rld[r].opnum,
! rld[r].when_needed,
! rld[r].mode);
! rld[r].reg_rtx = last_reg;
! reload_inherited[r] = 1;
! reload_inheritance_insn[r]
! = reg_reloaded_insn[i];
! reload_spill_index[r] = i;
! for (k = 0; k < nr; k++)
! SET_HARD_REG_BIT (reload_reg_used_for_inherit,
! i + k);
! }
! }
! }
! }
! }
/* Here's another way to see if the value is already lying around. */
! if (rld[r].in != 0
&& ! reload_inherited[r]
&& rld[r].out == 0
&& (CONSTANT_P (rld[r].in)
*************** choose_reload_regs (chain)
*** 6093,6099 ****
search_equiv = rld[r].in;
/* If this is an output reload from a simple move insn, look
if an equivalence for the input is available. */
! else if (inheritance && rld[r].in == 0 && rld[r].out != 0)
{
rtx set = single_set (insn);
--- 5460,5466 ----
search_equiv = rld[r].in;
/* If this is an output reload from a simple move insn, look
if an equivalence for the input is available. */
! else if (rld[r].in == 0 && rld[r].out != 0)
{
rtx set = single_set (insn);
*************** choose_reload_regs (chain)
*** 6251,6257 ****
if (i == n_reloads)
continue;
! allocate_reload_reg (chain, r, j == n_reloads - 1, inheritance);
#endif
}
--- 5618,5624 ----
if (i == n_reloads)
continue;
! allocate_reload_reg (chain, r, j == n_reloads - 1, 1);
#endif
}
*************** choose_reload_regs (chain)
*** 6270,6284 ****
if (rld[r].reg_rtx != 0 || rld[r].optional)
continue;
! if (! allocate_reload_reg (chain, r, j == n_reloads - 1, inheritance))
! break;
}
! /* If that loop got all the way, we have won. */
! if (j == n_reloads)
! break;
! /* Loop around and try without any inheritance. */
}
/* If we thought we could inherit a reload, because it seemed that
--- 5637,5672 ----
if (rld[r].reg_rtx != 0 || rld[r].optional)
continue;
! if (! allocate_reload_reg (chain, r, j == n_reloads - 1, 1))
! {
! win = 0;
! break;
! }
}
+ }
! if (! win)
! {
! /* First undo everything done by the failed attempt
! to allocate with inheritance. */
! choose_reload_regs_init (chain, save_reload_reg_rtx);
!
! /* Some sanity tests to verify that the reloads found in the first
! pass are identical to the ones we have now. */
! if (chain->n_reloads != n_reloads)
! abort ();
! for (i = 0; i < n_reloads; i++)
! {
! if (chain->rld[i].regno < 0 || chain->rld[i].reg_rtx != 0)
! continue;
! if (chain->rld[i].when_needed != rld[i].when_needed)
! abort ();
! for (j = 0; j < n_spills; j++)
! if (spill_regs[j] == chain->rld[i].regno)
! if (! set_reload_reg (j, i))
! failed_reload (chain->insn, i);
! }
}
/* If we thought we could inherit a reload, because it seemed that