PR target/54436

	* config/i386/i386.md (*mov<mode>_insv_1_rex64, *movsi_insv_1): If
	operands[1] is CONST_INT_P, convert it to QImode before printing.

	* gcc.dg/torture/pr54436.c: New test.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@190849 138bc75d-0d04-0410-961f-82ee72b054a4

4 files changed, 59 insertions, 2 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 45325cb3e9d..c9790e8af99 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2012-09-01  Jakub Jelinek  <jakub@redhat.com>
+
+	PR target/54436
+	* config/i386/i386.md (*mov<mode>_insv_1_rex64, *movsi_insv_1): If
+	operands[1] is CONST_INT_P, convert it to QImode before printing.
+
 2012-09-01  Andrew Pinski  <apinski@cavium.com>
 
 	* simplify-rtx.c (simplify_unary_operation_1 <case TRUNCATE>):
diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md
index 33000174fca..16cee7a9dbe 100644
--- a/gcc/config/i386/i386.md
+++ b/gcc/config/i386/i386.md
@@ -2690,7 +2690,11 @@
 			     (const_int 8))
 	(match_operand:SWI48x 1 "nonmemory_operand" "Qn"))]
   "TARGET_64BIT"
-  "mov{b}\t{%b1, %h0|%h0, %b1}"
+{
+  if (CONST_INT_P (operands[1]))
+    operands[1] = simplify_gen_subreg (QImode, operands[1], <MODE>mode, 0);
+  return "mov{b}\t{%b1, %h0|%h0, %b1}";
+}
   [(set_attr "type" "imov")
    (set_attr "mode" "QI")])
 
@@ -2700,7 +2704,11 @@
 			 (const_int 8))
 	(match_operand:SI 1 "general_operand" "Qmn"))]
   "!TARGET_64BIT"
-  "mov{b}\t{%b1, %h0|%h0, %b1}"
+{
+  if (CONST_INT_P (operands[1]))
+    operands[1] = simplify_gen_subreg (QImode, operands[1], SImode, 0);
+  return "mov{b}\t{%b1, %h0|%h0, %b1}";
+}
   [(set_attr "type" "imov")
    (set_attr "mode" "QI")])
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 648b014af69..6c433056ba4 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-09-01  Jakub Jelinek  <jakub@redhat.com>
+
+	PR target/54436
+	* gcc.dg/torture/pr54436.c: New test.
+
 2012-09-01  Andrew Pinski  <apinski@cavium.com>
 
 	* gcc.target/mips/truncate-8.c: New testcase.
diff --git a/gcc/testsuite/gcc.dg/torture/pr54436.c b/gcc/testsuite/gcc.dg/torture/pr54436.c
new file mode 100644
index 00000000000..4bce3240906
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/torture/pr54436.c
@@ -0,0 +1,38 @@
+/* PR target/54436 */
+/* { dg-do assemble } */
+
+#if __SIZEOF_SHORT__ == 2 && __SIZEOF_LONG_LONG__ == 8
+static inline unsigned short
+baz (unsigned short *x)
+{
+  union U { unsigned short a; unsigned char b[2]; } u = { *x };
+  u.b[0] = ((u.b[0] * 0x0802ULL & 0x22110ULL)
+	    | (u.b[0] * 0x8020ULL & 0x88440ULL)) * 0x10101ULL >> 16;
+  u.b[1] = ((u.b[1] * 0x0802ULL & 0x22110ULL)
+	    | (u.b[1] * 0x8020ULL & 0x88440ULL)) * 0x10101ULL >> 16;
+  unsigned char t = u.b[0];
+  u.b[0] = u.b[1];
+  u.b[1] = t;
+  return u.a;
+}
+
+static inline unsigned long long
+bar (unsigned long long *x)
+{
+  union U { unsigned long long a; unsigned short b[4]; } u = { *x };
+  u.b[0] = baz (&u.b[0]);
+  return u.a;
+}
+
+void
+foo (void)
+{
+  unsigned long long l = -1ULL;
+  __asm volatile ("" : : "r" (bar (&l)));
+}
+#else
+void
+foo (void)
+{
+}
+#endif