Fix twolf ICE for ARM

2009-08-19  Ramana Radhakrishnan  <ramana.radhakrishnan@arm.com>
            Richard Earnshaw  <richard.earnshaw@arm.com>

        * config/arm/arm.c (arm_emit_movpair): Handle CONST_INT.
        * config/arm/arm.md (*arm_movtas_ze): New pattern for
        movt.

2009-08-19  Ramana Radhakrishnan  <ramana.radhakrishnan@arm.com>
            Richard Earnshaw  <richard.earnshaw@arm.com>

        * testsuite/gcc.target/arm/20090811-1.c: New test.

Co-Authored-By: Richard Earnshaw <rearnsha@arm.com>

From-SVN: r150953

5 files changed, 73 insertions, 8 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3749881..51f783e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2009-08-20  Ramana Radhakrishnan  <ramana.radhakrishnan@arm.com>
+            Richard Earnshaw  <richard.earnshaw@arm.com>
+
+        * config/arm/arm.c (arm_emit_movpair): Handle CONST_INT.
+        * config/arm/arm.md (*arm_movtas_ze): New pattern for
+        movt.
+
 2009-08-19  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
 
 	* pa.md (reload_inhi, reload_outhi, reload_inqi, reload_outqi): New
diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index 993d121..e7e6bee 100644
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -11558,14 +11558,23 @@ output_mov_long_double_arm_from_arm (rtx *operands)
   return "";
 }
 
-
-/* Emit a MOVW/MOVT pair.  */
-void arm_emit_movpair (rtx dest, rtx src)
-{
-  emit_set_insn (dest, gen_rtx_HIGH (SImode, src));
-  emit_set_insn (dest, gen_rtx_LO_SUM (SImode, dest, src));
-}
-
+void
+arm_emit_movpair (rtx dest, rtx src)
+ {
+  /* If the src is an immediate, simplify it.  */
+  if (CONST_INT_P (src))
+    {
+      HOST_WIDE_INT val = INTVAL (src);
+      emit_set_insn (dest, GEN_INT (val & 0x0000ffff));
+      if ((val >> 16) & 0x0000ffff)
+        emit_set_insn (gen_rtx_ZERO_EXTRACT (SImode, dest, GEN_INT (16),
+                                             GEN_INT (16)),
+                       GEN_INT ((val >> 16) & 0x0000ffff));
+      return;
+    }
+   emit_set_insn (dest, gen_rtx_HIGH (SImode, src));
+   emit_set_insn (dest, gen_rtx_LO_SUM (SImode, dest, src));
+ }
 
 /* Output a move from arm registers to an fpa registers.
    OPERANDS[0] is an fpa register.
diff --git a/gcc/config/arm/arm.md b/gcc/config/arm/arm.md
index 5d12f90..09a1b08 100644
--- a/gcc/config/arm/arm.md
+++ b/gcc/config/arm/arm.md
@@ -11050,6 +11050,17 @@
   [(set_attr "conds" "clob")]
 )
 
+(define_insn "*arm_movtas_ze" 
+  [(set (zero_extract:SI (match_operand:SI 0 "s_register_operand" "+r")
+                   (const_int 16)
+                   (const_int 16))
+        (match_operand:SI 1 "const_int_operand" ""))]
+  "TARGET_32BIT"
+  "movt%?\t%0, %c1"
+ [(set_attr "predicable" "yes")
+   (set_attr "length" "4")]
+)
+
 ;; Load the FPA co-processor patterns
 (include "fpa.md")
 ;; Load the Maverick co-processor patterns
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 993f2c3..b4ba797 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-19  Ramana Radhakrishnan  <ramana.radhakrishnan@arm.com>
+            Richard Earnshaw  <richard.earnshaw@arm.com>
+
+        * testsuite/gcc.target/arm/20090811-1.c: New test.
+
 2009-08-19  Jakub Jelinek  <jakub@redhat.com>
 
 	PR middle-end/41123
diff --git a/gcc/testsuite/gcc.target/arm/20090811-1.c b/gcc/testsuite/gcc.target/arm/20090811-1.c
new file mode 100644
index 0000000..bc0dc93
--- /dev/null
+++ b/gcc/testsuite/gcc.target/arm/20090811-1.c
@@ -0,0 +1,33 @@
+/* { dg-do compile } */
+/* { dg-options "-O3 -mcpu=cortex-a8 -mfpu=vfp3 -mfloat-abi=softfp" } */
+
+typedef struct cb
+{
+  int cxc;
+  short int pside;
+}  *CBPTR;
+typedef struct rwb
+{
+  int stx;
+} RWB;
+extern CBPTR *car;
+extern RWB *rwAr;
+extern int nts;
+extern int nRws;
+void f()
+{
+  CBPTR pptr ;
+  int  k_lt, k_rt, k_span, rw, p, rt;
+  int sa ;
+  k_rt = 0;
+  k_lt = 10000000;
+  for (rw = 1; rw <= nRws; rw++)
+    k_lt = rwAr[rw].stx;
+  k_span = k_rt - k_lt;
+  for (; p <= nts; p++)
+    {
+      pptr = car[p];
+      if (pptr->pside == 3)
+        pptr->cxc += (int)(((double)rt / (double) k_span) *((double) sa));
+    }
+}