From: Jeff Law <law@redhat.com>
Date: Sat, 26 Sep 2015 07:33:05 +0000 (-0600)
Subject: [PATCH] Fix undefined behaviour in cris port
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c4362b608bdaaa5b7b326bd60116040b38b0dbdd;p=gcc.git

[PATCH] Fix undefined behaviour in cris port

[PATCH] Fix undefined behaviour in cris port
	* config/cris/cris.md (asrandb): Fix left shift undefined
	behaviour.
	(asrandw): Likewise.

From-SVN: r228163
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 910fd4f3d7a..98c1bd9c913 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2015-09-26  Jeff Law  <law@redhat.com>
+
+	* config/cris/cris.md (asrandb): Fix left shift undefined
+	behaviour.
+	(asrandw): Likewise.
+
 2015-09-25  Vladimir Makarov  <vmakarov@redhat.com>
 
 	PR target/61578
diff --git a/gcc/config/cris/cris.md b/gcc/config/cris/cris.md
index 3c2409bd1d8..b90d6b1b3a1 100644
--- a/gcc/config/cris/cris.md
+++ b/gcc/config/cris/cris.md
@@ -4634,7 +4634,8 @@
    && INTVAL (operands[1]) > 23
    /* Check that the and-operation enables us to use logical-shift.  */
    && (INTVAL (operands[2])
-	  & ((HOST_WIDE_INT) -1 << (32 - INTVAL (operands[1])))) == 0"
+       & ((HOST_WIDE_INT) (HOST_WIDE_INT_M1U
+			   << (32 - INTVAL (operands[1]))))) == 0"
   [(set (match_dup 0) (lshiftrt:SI (match_dup 0) (match_dup 1)))
    (set (match_dup 3) (and:QI (match_dup 3) (match_dup 4)))]
   ;; FIXME: CC0 is valid except for the M bit.
@@ -4655,7 +4656,8 @@
    && INTVAL (operands[1]) > 15
    /* Check that the and-operation enables us to use logical-shift.  */
    && (INTVAL (operands[2])
-       & ((HOST_WIDE_INT) -1 << (32 - INTVAL (operands[1])))) == 0"
+       & ((HOST_WIDE_INT) (HOST_WIDE_INT_M1U
+			   << (32 - INTVAL (operands[1]))))) == 0"
   [(set (match_dup 0) (lshiftrt:SI (match_dup 0) (match_dup 1)))
    (set (match_dup 3) (and:HI (match_dup 3) (match_dup 4)))]
   ;; FIXME: CC0 is valid except for the M bit.