aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaz Kojima <kkojima@gcc.gnu.org>2011-06-05 21:50:29 +0000
committerKaz Kojima <kkojima@gcc.gnu.org>2011-06-05 21:50:29 +0000
commit0e5b7f61e598cba804a914f30cb5284f2cd5b603 (patch)
tree0e77fa1561cdd7b60ab8fdb2b44b7baf58083e68
parent89c30d25fa321941d7ec74ebc4f2d7a5021f6ab0 (diff)
PR target/49186
* config/sh/sh.c (expand_cbranchdi4): Set msw_skip when the high part of the second operand is 0. * gcc.c-torture/execute/pr49186.c: New. git-svn-id: https://gcc.gnu.org/svn/gcc/branches/gcc-4_5-branch@174666 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ChangeLog9
-rw-r--r--gcc/config/sh/sh.c5
-rw-r--r--gcc/testsuite/ChangeLog8
-rw-r--r--gcc/testsuite/gcc.c-torture/execute/pr49186.c15
4 files changed, 36 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bfb35c908d8..d0e23893d66 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2011-06-05 Kaz Kojima <kkojima@gcc.gnu.org>
+
+ Backport from mainline
+ 2011-05-30 Kaz Kojima <kkojima@gcc.gnu.org>
+
+ PR target/49186
+ * config/sh/sh.c (expand_cbranchdi4): Set msw_skip when the high
+ part of the second operand is 0.
+
2011-06-04 Ira Rosen <ira.rosen@linaro.org>
PR tree-optimization/49038
diff --git a/gcc/config/sh/sh.c b/gcc/config/sh/sh.c
index f06f4fd83d0..5ee090c192f 100644
--- a/gcc/config/sh/sh.c
+++ b/gcc/config/sh/sh.c
@@ -1945,7 +1945,10 @@ expand_cbranchdi4 (rtx *operands, enum rtx_code comparison)
else if (op2h != CONST0_RTX (SImode))
msw_taken = LTU;
else
- break;
+ {
+ msw_skip = swap_condition (LTU);
+ break;
+ }
msw_skip = swap_condition (msw_taken);
}
break;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 87edb9e4918..f0a88d93b8c 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2011-06-05 Kaz Kojima <kkojima@gcc.gnu.org>
+
+ Backport from mainline
+ 2011-05-30 Kaz Kojima <kkojima@gcc.gnu.org>
+
+ PR target/49186
+ * gcc.c-torture/execute/pr49186.c: New.
+
2011-06-04 Ira Rosen <ira.rosen@linaro.org>
PR tree-optimization/49038
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr49186.c b/gcc/testsuite/gcc.c-torture/execute/pr49186.c
new file mode 100644
index 00000000000..743815b9802
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/execute/pr49186.c
@@ -0,0 +1,15 @@
+/* PR target/49186 */
+extern void abort (void);
+
+int
+main ()
+{
+ int x;
+ unsigned long long uv = 0x1000000001ULL;
+
+ x = (uv < 0x80) ? 1 : ((uv < 0x800) ? 2 : 3);
+ if (x != 3)
+ abort ();
+
+ return 0;
+}