re PR middle-end/6100 (sparc-sun-solaris2.7 gcc-3.1 RTL checking failure w/-m64 on...

	PR middle-end/6100
	* config/sparc/sparc.c (output_cbranch): Use REG_BR_PROB, not
	REG_BR_PRED.
	(output_v9branch): Likewise.

From-SVN: r51663

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9e687a51278f6870c3d3525ad0d2d831d380f5b9..3e3765ad7a8bdc0a76cbc167e3820a64c7f68505 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2002-03-31  Jakub Jelinek  <jakub@redhat.com>
+
+       PR middle-end/6100
+       * config/sparc/sparc.c (output_cbranch): Use REG_BR_PROB, not
+       REG_BR_PRED.
+       (output_v9branch): Likewise.
+
 2002-03-31  Alexandre Oliva  <aoliva@redhat.com>
 
        * gcc.c: Revert previous patch for now.

diff --git a/gcc/config/sparc/sparc.c b/gcc/config/sparc/sparc.c
index f2b91886e5917b4ec9eda1b54fdbbefaa71107a4..014656f3e06823f5fa841318c57af65c94178146 100644 (file)
--- a/gcc/config/sparc/sparc.c
+++ b/gcc/config/sparc/sparc.c
@@ -5226,10 +5226,10 @@ output_cbranch (op, dest, label, reversed, annul, noop, insn)
            labelno = "";
        }
 
-      if (*labelno && insn && (note = find_reg_note (insn, REG_BR_PRED, NULL_RTX)))
+      if (*labelno && insn && (note = find_reg_note (insn, REG_BR_PROB, NULL_RTX)))
        {
          strcpy (p,
-                 (((INTVAL (XEXP (note, 0)) & ATTR_FLAG_likely) != 0) ^ far)
+                 ((INTVAL (XEXP (note, 0)) >= REG_BR_PROB_BASE / 2) ^ far)
                  ? ",pt" : ",pn");
          p += 3;
          spaces -= 3;
@@ -5534,10 +5534,10 @@ output_v9branch (op, dest, reg, label, reversed, annul, noop, insn)
       p += 2;
     }
 
-  if (insn && (note = find_reg_note (insn, REG_BR_PRED, NULL_RTX)))
+  if (insn && (note = find_reg_note (insn, REG_BR_PROB, NULL_RTX)))
     {
       strcpy (p,
-             (((INTVAL (XEXP (note, 0)) & ATTR_FLAG_likely) != 0) ^ far)
+             ((INTVAL (XEXP (note, 0)) >= REG_BR_PROB_BASE / 2) ^ far)
              ? ",pt" : ",pn");
       p += 3;
     }