diff options
| author | J"orn Rennecke <amylaar@cygnus.co.uk> | 1998-08-28 07:18:52 +0000 |
|---|---|---|
| committer | Joern Rennecke <amylaar@gcc.gnu.org> | 1998-08-28 08:18:52 +0100 |
| commit | 3bb806ed995be40284e8617d32bc908f76626aee (patch) | |
| tree | dd67eeb902cd6b83a2c3b8cae6fc9ee53c874209 /gcc | |
| parent | 8ed69d0908630adcf3d385266d168f49d3ba1b5e (diff) | |
| download | gcc-3bb806ed995be40284e8617d32bc908f76626aee.zip gcc-3bb806ed995be40284e8617d32bc908f76626aee.tar.gz gcc-3bb806ed995be40284e8617d32bc908f76626aee.tar.bz2 | |
regmove.c (regclass_compatible_p): New function.
* regmove.c (regclass_compatible_p): New function.
(regmove_optimize): Use it.
Use NREGS parameter insted of calling max_reg_num.
(fixup_match_1): Don't use code = MINUS when later tieing with
a hard register is likely.
From-SVN: r22052
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 10 | ||||
| -rw-r--r-- | gcc/regmove.c | 40 |
2 files changed, 37 insertions, 13 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 9341194..a4c535a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,13 @@ +Fri Aug 28 15:13:25 1998 J"orn Rennecke <amylaar@cygnus.co.uk> + + * regmove.c (regclass_compatible_p): New function. + (regmove_optimize): Use it. + + Use NREGS parameter insted of calling max_reg_num. + + (fixup_match_1): Don't use code = MINUS when later tieing with + a hard register is likely. + Fri Aug 28 14:54:07 1998 J"orn Rennecke <amylaar@cygnus.co.uk> * loop.c (check_dbra_loop): Fix calculation of FINAL_VALUE when diff --git a/gcc/regmove.c b/gcc/regmove.c index d470bd5..8df75e5 100644 --- a/gcc/regmove.c +++ b/gcc/regmove.c @@ -60,8 +60,22 @@ static int fixup_match_1 PROTO((rtx, rtx, rtx, rtx, rtx, int, int, int, FILE *)) ; static int reg_is_remote_constant_p PROTO((rtx, rtx, rtx)); static int stable_but_for_p PROTO((rtx, rtx, rtx)); +static int regclass_compatible_p PROTO((int, int)); static int loop_depth; +/* Return non-zero if registers with CLASS1 and CLASS2 can be merged without + causing too much register allocation problems. */ +static int +regclass_compatible_p (class0, class1) + int class0, class1; +{ + return (class0 == class1 + || (reg_class_subset_p (class0, class1) + && ! CLASS_LIKELY_SPILLED_P (class0)) + || (reg_class_subset_p (class1, class0) + && ! CLASS_LIKELY_SPILLED_P (class1))); +} + /* Generate and return an insn body to add r1 and c, storing the result in r0. */ static rtx @@ -894,11 +908,11 @@ regmove_optimize (f, nregs, regmove_dump_file) rtx insn; struct match match; int pass; - int maxregnum = max_reg_num (), i; + int i; rtx copy_src, copy_dst; - regno_src_regno = (int *)alloca (sizeof *regno_src_regno * maxregnum); - for (i = maxregnum; --i >= 0; ) regno_src_regno[i] = -1; + regno_src_regno = (int *)alloca (sizeof *regno_src_regno * nregs); + for (i = nregs; --i >= 0; ) regno_src_regno[i] = -1; regmove_bb_head = (int *)alloca (sizeof (int) * (get_max_uid () + 1)); for (i = get_max_uid (); i >= 0; i--) regmove_bb_head[i] = -1; @@ -1052,11 +1066,7 @@ regmove_optimize (f, nregs, regmove_dump_file) src_class = reg_preferred_class (REGNO (src)); dst_class = reg_preferred_class (REGNO (dst)); - if (src_class != dst_class - && (! reg_class_subset_p (src_class, dst_class) - || CLASS_LIKELY_SPILLED_P (src_class)) - && (! reg_class_subset_p (dst_class, src_class) - || CLASS_LIKELY_SPILLED_P (dst_class))) + if (! regclass_compatible_p (src_class, dst_class)) continue; if (fixup_match_1 (insn, set, src, src_subreg, dst, pass, @@ -1164,11 +1174,7 @@ regmove_optimize (f, nregs, regmove_dump_file) } src_class = reg_preferred_class (REGNO (src)); dst_class = reg_preferred_class (REGNO (dst)); - if (src_class != dst_class - && (! reg_class_subset_p (src_class, dst_class) - || CLASS_LIKELY_SPILLED_P (src_class)) - && (! reg_class_subset_p (dst_class, src_class) - || CLASS_LIKELY_SPILLED_P (dst_class))) + if (! regclass_compatible_p (src_class, dst_class)) { if (!copy_src) { @@ -1604,6 +1610,14 @@ fixup_match_1 (insn, set, src, src_subreg, dst, backward, operand_number, This also gives opportunities for subsequent optimizations in the backward pass, so do it there. */ if (code == PLUS && backward + /* Don't do this if we can likely tie DST to SET_DEST + of P later; we can't do this tying here if we got a + hard register. */ + && ! (dst_note && ! REG_N_CALLS_CROSSED (REGNO (dst)) + && single_set (p) + && GET_CODE (SET_DEST (single_set (p))) == REG + && (REGNO (SET_DEST (single_set (p))) + < FIRST_PSEUDO_REGISTER)) #ifdef HAVE_cc0 /* We may not emit an insn directly after P if the latter sets CC0. */ |