===================================================================
@@ -79,6 +79,7 @@
#include "shrink-wrap.h"
#include "regcprop.h"
#include "rtl-iter.h"
+#include "valtrack.h"
#ifdef HAVE_simple_return
@@ -182,6 +183,24 @@
return live_edge;
}
+/* Return true if INSN df shows a use of a reg in the range
+ [REGNO,END_REGNO). */
+
+static bool
+insn_uses_reg (rtx_insn *insn, unsigned int regno, unsigned int end_regno)
+{
+ df_ref use;
+
+ FOR_EACH_INSN_USE (use, insn)
+ {
+ rtx reg = DF_REF_REG (use);
+
+ if (REG_P (reg) && REGNO (reg) >= regno && REGNO (reg) < end_regno)
+ return true;
+ }
+ return false;
+}
+
/* Try to move INSN from BB to a successor. Return true on success.
USES and DEFS are the set of registers that are used and defined
after INSN in BB. SPLIT_P indicates whether a live edge from BB
@@ -193,7 +212,7 @@
const HARD_REG_SET defs,
bool *split_p)
{
- rtx set, src, dest;
+ rtx set, src, orig_src, dest;
bitmap live_out, live_in, bb_uses, bb_defs;
unsigned int i, dregno, end_dregno;
unsigned int sregno = FIRST_PSEUDO_REGISTER;
@@ -209,7 +228,7 @@
set = PATTERN (insn);
if (GET_CODE (set) != SET)
return false;
- src = SET_SRC (set);
+ orig_src = src = SET_SRC (set);
dest = SET_DEST (set);
/* For the destination, we want only a register. Also disallow STACK
@@ -342,8 +361,11 @@
/* At this point we are committed to moving INSN, but let's try to
move it as far as we can. */
+ auto_vec<basic_block, 5> live_bbs;
do
{
+ if (MAY_HAVE_DEBUG_INSNS)
+ live_bbs.safe_push (bb);
live_out = df_get_live_out (bb);
live_in = df_get_live_in (next_block);
bb = next_block;
@@ -426,6 +448,71 @@
SET_REGNO_REG_SET (bb_uses, i);
}
+ /* Try to fix up debug insns in the tail of the entry block and any
+ intervening blocks that use regs set by the insn we are moving. */
+ if (MAY_HAVE_DEBUG_INSNS)
+ {
+ basic_block *elt;
+ unsigned int indx;
+ bool do_prop = false;
+
+ FOR_EACH_VEC_ELT (live_bbs, indx, elt)
+ {
+ rtx_insn *dinsn;
+ basic_block tmp_bb = *elt;
+
+ if (indx == 0)
+ {
+ /* First check that we have some debug info relevant to
+ the insn being moved. It ought to be just after
+ insn. */
+ dinsn = insn;
+ while (dinsn != BB_END (tmp_bb))
+ {
+ dinsn = NEXT_INSN (dinsn);
+ if (!DEBUG_INSN_P (dinsn))
+ break;
+ if (insn_uses_reg (dinsn, dregno, end_dregno))
+ {
+ do_prop = true;
+ break;
+ }
+ }
+
+ if (do_prop)
+ {
+ /* Put debug info for the insn we'll be moving
+ into the destination block. */
+ rtx_insn *newdinsn = bb_note (bb);
+
+ dinsn = insn;
+ while (dinsn != BB_END (tmp_bb))
+ {
+ dinsn = NEXT_INSN (dinsn);
+ if (!DEBUG_INSN_P (dinsn))
+ break;
+ newdinsn
+ = emit_debug_insn_after (copy_rtx (PATTERN (dinsn)),
+ newdinsn);
+ df_insn_rescan (newdinsn);
+ }
+ }
+ if (dump_file)
+ fprintf (dump_file,
+ "Propagating %sdebug for insn %d.\n",
+ do_prop ? "" : "no ", INSN_UID (insn));
+ }
+ dinsn = insn;
+ if (indx != 0)
+ dinsn = BB_HEAD (tmp_bb);
+
+ if (do_prop)
+ propagate_for_debug (dinsn, BB_END (tmp_bb),
+ dest, orig_src,
+ tmp_bb);
+ }
+ }
+
emit_insn_after (PATTERN (insn), bb_note (bb));
delete_insn (insn);
return true;
===================================================================
@@ -0,0 +1,64 @@
+/* { dg-do run } */
+/* { dg-options "-O2 -g" } */
+/* { dg-additional-options "-mrelocatable" { target powerpc-*-rtems* } } */
+
+unsigned long __attribute__ ((noinline))
+adler32 (unsigned long adler, unsigned char *buf, unsigned int len)
+{
+ unsigned long s1 = adler & 0xffff;
+ unsigned long s2 = (adler >> 16) & 0xffff;
+ int k;
+
+ if (buf == 0)
+ return 1L;
+
+ while (len > 0)
+ {
+ k = len < 5552 ? len : 5552;
+ len -= k;
+ while (k >= 16)
+ {
+ s1 += *buf++; s2 += s1;
+ s1 += *buf++; s2 += s1;
+ s1 += *buf++; s2 += s1;
+ s1 += *buf++; s2 += s1;
+ s1 += *buf++; s2 += s1;
+ s1 += *buf++; s2 += s1;
+ s1 += *buf++; s2 += s1;
+ s1 += *buf++; s2 += s1;
+ s1 += *buf++; s2 += s1;
+ s1 += *buf++; s2 += s1;
+ s1 += *buf++; s2 += s1;
+ s1 += *buf++; s2 += s1;
+ s1 += *buf++; s2 += s1;
+ s1 += *buf++; s2 += s1;
+ s1 += *buf++; s2 += s1;
+ s1 += *buf++; s2 += s1;
+ k -= 16;
+ }
+ if (k != 0)
+ do
+ {
+ s1 += *buf++; s2 += s1;
+ } while (--k);
+ s1 &= 0xffffffffUL;
+ s2 &= 0xffffffffUL;
+ s1 %= 65521L;
+ s2 %= 65521L;
+ }
+ return (s2 << 16) | s1;
+}
+
+unsigned char buf[] = { 0, 1, 2, 3, 4, 5, 6, 7,
+ 8, 9, 10, 11, 12, 13, 14, 15,
+ 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
+ 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
+ 0x55, 0xaa };
+int
+main ()
+{
+ unsigned long x = adler32 (0, buf, sizeof buf);
+ if (x != 0x640409efUL)
+ __builtin_abort ();
+ return 0;
+}