Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/gnu/dist/gcc4/gcc/config/vax Use REG_P, CONST_INT_P, and gcc...



details:   https://anonhg.NetBSD.org/src/rev/1eb55f4d02b0
branches:  trunk
changeset: 773541:1eb55f4d02b0
user:      matt <matt%NetBSD.org@localhost>
date:      Sun Feb 05 17:34:34 2012 +0000

description:
Use REG_P, CONST_INT_P, and gcc_unreachable.

diffstat:

 gnu/dist/gcc4/gcc/config/vax/vax.c  |  14 +++++-----
 gnu/dist/gcc4/gcc/config/vax/vax.md |  49 ++++++++++++++++++------------------
 2 files changed, 31 insertions(+), 32 deletions(-)

diffs (232 lines):

diff -r c9d0b87660d0 -r 1eb55f4d02b0 gnu/dist/gcc4/gcc/config/vax/vax.c
--- a/gnu/dist/gcc4/gcc/config/vax/vax.c        Sun Feb 05 16:08:28 2012 +0000
+++ b/gnu/dist/gcc4/gcc/config/vax/vax.c        Sun Feb 05 17:34:34 2012 +0000
@@ -1097,14 +1097,14 @@
              || GET_CODE (XEXP (operands[0], 0)) == PRE_DEC
              || GET_CODE (XEXP (operands[0], 0)) == POST_INC
              || !illegal_addsub_di_memory_operand (operands[0], DImode))
-         && ((GET_CODE (operands[1]) == CONST_INT
+         && ((CONST_INT_P (operands[1])
               && (unsigned HOST_WIDE_INT) INTVAL (operands[1]) >= 64)
              || GET_CODE (operands[1]) == CONST_DOUBLE))
        {
          hi[0] = operands[0];
          hi[1] = operands[1];
 
-         split_quadword_operands(insn, SET, hi, lo, 2);
+         split_quadword_operands (insn, SET, hi, lo, 2);
 
          pattern_lo = vax_output_int_move (NULL, lo, SImode);
          pattern_hi = vax_output_int_move (NULL, hi, SImode);
@@ -1549,12 +1549,12 @@
       rtx b = XEXP (base, 1);
       if (GET_CODE (b) == CONST)
        b = XEXP (b, 0);
-      if (GET_CODE (b) == CONST_INT)
+      if (CONST_INT_P (b))
        {
           off += INTVAL (b);
           base = a;
        }
-      else if (GET_CODE (a) == REG && GET_CODE (b) == SYMBOL_REF)
+      else if (REG_P (a) && GET_CODE (b) == SYMBOL_REF)
        {
          if (off != 0)
            {
@@ -1562,7 +1562,7 @@
              off = 0;
            }
        }
-      else if (GET_CODE (a) == REG && GET_CODE (b) == PLUS)
+      else if (REG_P (a) && GET_CODE (b) == PLUS)
        {
           off += INTVAL (XEXP (b, 1));
          base = gen_rtx_PLUS (Pmode, a, plus_constant(XEXP (b, 0), off));
@@ -1570,8 +1570,8 @@
        }
       else
         {
-         print_rtl(stderr, base); fprintf(stderr, "\n");
-         gcc_assert(0);
+         debug_rtx(base);
+         gcc_unreachable ();
        }
     }
   if (code == POST_INC)
diff -r c9d0b87660d0 -r 1eb55f4d02b0 gnu/dist/gcc4/gcc/config/vax/vax.md
--- a/gnu/dist/gcc4/gcc/config/vax/vax.md       Sun Feb 05 16:08:28 2012 +0000
+++ b/gnu/dist/gcc4/gcc/config/vax/vax.md       Sun Feb 05 17:34:34 2012 +0000
@@ -191,7 +191,7 @@
   ""
   "*
 {
-  if (GET_CODE (operands[1]) == CONST_INT)
+  if (CONST_INT_P (operands[1]))
     {
       int i = INTVAL (operands[1]);
       if (i == 0)
@@ -212,7 +212,7 @@
   ""
   "*
 {
-  if (GET_CODE (operands[1]) == CONST_INT)
+  if (CONST_INT_P (operands[1]))
     {
       int i = INTVAL (operands[1]);
       if (i == 0)
@@ -565,14 +565,14 @@
   rtx op1 = operands[1];
 
   /* If there is a constant argument, complement that one.  */
-  if (GET_CODE (operands[2]) == CONST_INT && GET_CODE (op1) != CONST_INT)
+  if (CONST_INT_P (operands[2]) && ! CONST_INT_P (op1))
     {
       operands[1] = operands[2];
       operands[2] = op1;
       op1 = operands[1];
     }
 
-  if (GET_CODE (op1) == CONST_INT)
+  if (CONST_INT_P (op1))
     operands[1] = GEN_INT (~INTVAL (op1));
   else
     operands[1] = expand_unop (<MODE>mode, one_cmpl_optab, op1, 0, 1);
@@ -658,7 +658,7 @@
   ""
   "
 {
-  if (GET_CODE (operands[2]) != CONST_INT)
+  if (! CONST_INT_P (operands[2]))
     operands[2] = gen_rtx_NEG (QImode, negate_rtx (QImode, operands[2]));
 }")
 
@@ -685,8 +685,7 @@
 {
   if (operands[2] == const1_rtx && rtx_equal_p (operands[0], operands[1]))
     return \"addl2 %0,%0\";
-  if (GET_CODE (operands[1]) == REG
-      && GET_CODE (operands[2]) == CONST_INT)
+  if (REG_P (operands[1]) && CONST_INT_P (operands[2]))
     {
       int i = INTVAL (operands[2]);
       if (i == 1)
@@ -760,7 +759,7 @@
   ""
   "
 {
-  if (GET_CODE (operands[2]) != CONST_INT)
+  if (! CONST_INT_P (operands[2]))
     operands[2] = gen_rtx_NEG (QImode, negate_rtx (QImode, operands[2]));
 }")
 
@@ -806,7 +805,7 @@
        (match_operand:SI 3 "general_operand" "g"))]
    "(INTVAL (operands[1]) == 8 || INTVAL (operands[1]) == 16)
    && INTVAL (operands[2]) % INTVAL (operands[1]) == 0
-   && (GET_CODE (operands[0]) == REG
+   && (REG_P (operands[0])
        || ! mode_dependent_address_p (XEXP (operands[0], 0)))"
   "*
 {
@@ -834,7 +833,7 @@
                         (match_operand:SI 3 "const_int_operand" "n")))]
   "(INTVAL (operands[2]) == 8 || INTVAL (operands[2]) == 16)
    && INTVAL (operands[3]) % INTVAL (operands[2]) == 0
-   && (GET_CODE (operands[1]) == REG
+   && (REG_P (operands[1])
        || ! mode_dependent_address_p (XEXP (operands[1], 0)))"
   "*
 {
@@ -861,7 +860,7 @@
                         (match_operand:SI 3 "const_int_operand" "n")))]
   "(INTVAL (operands[2]) == 8 || INTVAL (operands[2]) == 16)
    && INTVAL (operands[3]) % INTVAL (operands[2]) == 0
-   && (GET_CODE (operands[1]) == REG
+   && (REG_P (operands[1])
        || ! mode_dependent_address_p (XEXP (operands[1], 0)))"
   "*
 {
@@ -916,8 +915,8 @@
   ""
   "*
 {
-  if (GET_CODE (operands[3]) != CONST_INT || GET_CODE (operands[2]) != CONST_INT
-      || GET_CODE (operands[0]) != REG
+  if (! CONST_INT_P (operands[3]) || ! CONST_INT_P (operands[2])
+      || ! REG_P (operands[0])
       || (INTVAL (operands[2]) != 8 && INTVAL (operands[2]) != 16))
     return \"extv %3,%2,%1,%0\";
   if (INTVAL (operands[2]) == 8)
@@ -933,8 +932,8 @@
   ""
   "*
 {
-  if (GET_CODE (operands[3]) != CONST_INT || GET_CODE (operands[2]) != CONST_INT
-      || GET_CODE (operands[0]) != REG)
+  if (! CONST_INT_P (operands[3]) || ! CONST_INT_P (operands[2])
+      || ! REG_P (operands[0]))
     return \"extzv %3,%2,%1,%0\";
   if (INTVAL (operands[2]) == 8)
     return \"rotl %R3,%1,%0\;movzbl %0,%0\";
@@ -979,8 +978,8 @@
   ""
   "*
 {
-  if (!REG_P (operands[0]) || !CONST_INT_P (operands[2])
-      || !CONST_INT_P (operands[3])
+  if (! REG_P (operands[0]) || ! CONST_INT_P (operands[2])
+      || ! CONST_INT_P (operands[3])
       || (INTVAL (operands[2]) != 8 && INTVAL (operands[2]) != 16)
       || INTVAL (operands[2]) + INTVAL (operands[3]) > 32
       || side_effects_p (operands[1])
@@ -1008,8 +1007,8 @@
   ""
   "*
 {
-  if (!REG_P (operands[0]) || !CONST_INT_P (operands[2])
-      || !CONST_INT_P (operands[3])
+  if (! REG_P (operands[0]) || ! CONST_INT_P (operands[2])
+      || ! CONST_INT_P (operands[3])
       || INTVAL (operands[2]) + INTVAL (operands[3]) > 32
       || side_effects_p (operands[1])
       || (MEM_P (operands[1])
@@ -1137,8 +1136,8 @@
         (pc)))]
   "! mode_dependent_address_p (XEXP (operands[0], 0))
    && (GET_CODE (XEXP (operands[0], 0)) != PLUS
-       || !REG_P (XEXP (XEXP (operands[0], 0), 0))
-       || !CONST_INT_P (XEXP (XEXP (operands[0], 0), 1))
+       || ! REG_P (XEXP (XEXP (operands[0], 0), 0))
+       || ! CONST_INT_P (XEXP (XEXP (operands[0], 0), 1))
        || (INTVAL (XEXP (XEXP (operands[0], 0), 1)) & 3) == 0)"
   "jlbs %0,%l1")
 
@@ -1165,8 +1164,8 @@
         (pc)))]
   "! mode_dependent_address_p (XEXP (operands[0], 0))
    && (GET_CODE (XEXP (operands[0], 0)) != PLUS
-       || !REG_P (XEXP (XEXP (operands[0], 0), 0))
-       || !CONST_INT_P (XEXP (XEXP (operands[0], 0), 1))
+       || ! REG_P (XEXP (XEXP (operands[0], 0), 0))
+       || ! CONST_INT_P (XEXP (XEXP (operands[0], 0), 1))
        || (INTVAL (XEXP (XEXP (operands[0], 0), 1)) & 3) == 0)"
   "jlbc %0,%l1")
 
@@ -1269,7 +1268,7 @@
    (set (match_dup 0)
        (plus:SI (match_dup 0)
                 (const_int 1)))]
-  "!TARGET_UNIX_ASM && GET_CODE (operands[1]) == CONST_INT"
+  "!TARGET_UNIX_ASM && CONST_INT_P (operands[1])"
   "jaoblss %P1,%0,%l2")
 
 (define_insn ""
@@ -1296,7 +1295,7 @@
    (set (match_dup 0)
        (plus:SI (match_dup 0)
                 (const_int 1)))]
-  "!TARGET_UNIX_ASM && GET_CODE (operands[1]) == CONST_INT"
+  "!TARGET_UNIX_ASM && CONST_INT_P (operands[1])"
   "jaobleq %P1,%0,%l2")
 
 ;; Something like a sob insn, but compares against -1.



Home | Main Index | Thread Index | Old Index