htm.md (ttest): Use correct shift value to get CR0.

gcc/
	* config/rs6000/htm.md (ttest): Use correct shift value to get CR0.

gcc/testsuite/
	* gcc.target/powerpc/htm-ttest.c: New test.

From-SVN: r210815

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f09c3b7b40f81efb4cb8217a0a9d18a3ed6594ce..1e11b1a54faca38927e157af94ffebe6b9f7d759 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2014-05-22  Peter Bergner  <bergner@vnet.ibm.com>
+
+       * config/rs6000/htm.md (ttest): Use correct shift value to get CR0.
+
 2014-05-22  Richard Earnshaw  <rearnsha@arm.com>
 
        PR target/61208

diff --git a/gcc/config/rs6000/htm.md b/gcc/config/rs6000/htm.md
index 9dbb499ce218a36e625ec56a1ff9fcedbab0e46b..ca7f7fdf4fb720f8dd8a7e92afb7e4eb765d6c57 100644 (file)
--- a/gcc/config/rs6000/htm.md
+++ b/gcc/config/rs6000/htm.md
@@ -179,7 +179,7 @@
                             (const_int 0)]
                            UNSPECV_HTM_TABORTWCI))
    (set (subreg:CC (match_dup 2) 0) (match_dup 1))
-   (set (match_dup 3) (lshiftrt:SI (match_dup 2) (const_int 24)))
+   (set (match_dup 3) (lshiftrt:SI (match_dup 2) (const_int 28)))
    (parallel [(set (match_operand:SI 0 "int_reg_operand" "")
                   (and:SI (match_dup 3) (const_int 15)))
               (clobber (scratch:CC))])]

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4d814635755a51b06fd08644f5d2426f9240a3f5..84052373e9166755068b7b32e36c4c05d38fd85a 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2014-05-22  Peter Bergner  <bergner@vnet.ibm.com>
+
+       * gcc.target/powerpc/htm-ttest.c: New test.
+
 2014-05-22  Eric Botcazou  <ebotcazou@adacore.com>
 
        * gnat.dg/opt37.ad[sb]: New test.

diff --git a/gcc/testsuite/gcc.target/powerpc/htm-ttest.c b/gcc/testsuite/gcc.target/powerpc/htm-ttest.c
new file mode 100644 (file)
index 0000000..29cbd5b
--- /dev/null
+++ b/gcc/testsuite/gcc.target/powerpc/htm-ttest.c
@@ -0,0 +1,14 @@
+/* { dg-do compile { target { powerpc*-*-* } } } */
+/* { dg-skip-if "" { powerpc*-*-darwin* } { "*" } { "" } } */
+/* { dg-require-effective-target powerpc_htm_ok } */
+/* { dg-options "-O2 -mhtm" } */
+
+/* { dg-final { scan-assembler "rlwinm r?\[0-9\]+,r?\[0-9\]+,3,30,31" { target { ilp32 } } } } */
+/* { dg-final { scan-assembler "rldicl r?\[0-9\]+,r?\[0-9\]+,35,62" { target { lp64 } } } } */
+
+#include <htmintrin.h>
+long
+ttest (void)
+{
+  return _HTM_STATE(__builtin_ttest());
+}