simplify-rtx.c (simplify_byte_swapping_operation): Use proper macro for constant...

	* simplify-rtx.c (simplify_byte_swapping_operation): Use proper macro
	for constant scalar integers.
	(simplify_relational_operation_1): Likewise.

From-SVN: r199556

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 889c6d286a3b2728edf311100ba5b8211211abff..0894c50d81ff93553ab1f2a596a13be4f7e755e1 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2013-05-31  Eric Botcazou  <ebotcazou@adacore.com>
+
+       * simplify-rtx.c (simplify_byte_swapping_operation): Use proper macro
+       for constant scalar integers.
+       (simplify_relational_operation_1): Likewise.
+
 2013-05-31  Segher Boessenkool  <segher@kernel.crashing.org>
 
        * config/rs6000/rs6000-opts.h (enum processor_type): Reorder.

diff --git a/gcc/simplify-rtx.c b/gcc/simplify-rtx.c
index 5c1dd25d8a4380596da8df3b8e550d0a47aa5cb9..9bb31e76ed9812632f828037b5ca69c8a88b9339 100644 (file)
--- a/gcc/simplify-rtx.c
+++ b/gcc/simplify-rtx.c
@@ -2067,8 +2067,7 @@ simplify_byte_swapping_operation (enum rtx_code code, enum machine_mode mode,
   rtx tem;
 
   /* (op (bswap x) C1)) -> (bswap (op x C2)) with C2 swapped.  */
-  if (GET_CODE (op0) == BSWAP
-      && (CONST_INT_P (op1) || CONST_DOUBLE_AS_INT_P (op1)))
+  if (GET_CODE (op0) == BSWAP && CONST_SCALAR_INT_P (op1))
     {
       tem = simplify_gen_binary (code, mode, XEXP (op0, 0),
                                 simplify_gen_unary (BSWAP, mode, op1, mode));
@@ -4814,7 +4813,7 @@ simplify_relational_operation_1 (enum rtx_code code, enum machine_mode mode,
   /* (eq/ne (bswap x) C1) simplifies to (eq/ne x C2) with C2 swapped.  */
   if ((code == EQ || code == NE)
       && GET_CODE (op0) == BSWAP
-      && (CONST_INT_P (op1) || CONST_DOUBLE_AS_INT_P (op1)))
+      && CONST_SCALAR_INT_P (op1))
     return simplify_gen_relational (code, mode, cmp_mode, XEXP (op0, 0),
                                    simplify_gen_unary (BSWAP, cmp_mode,
                                                        op1, cmp_mode));