predicates.md (neon_struct_operand): Make a normal predicate.

gcc/
	* config/arm/predicates.md (neon_struct_operand): Make a normal
	predicate.
	(neon_struct_or_register_operand): New predicate.
	* config/arm/neon.md (movmisalign<mode>): Replace predicates
	with neon_struct_or_register_operand.
	(*movmisalign<mode>_neon_store, *movmisalign<mode>_neon_load): Use
	neon_struct_operand instead of memory_operand.

From-SVN: r176204

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d121c5c40f1e2a2c555db71975f63d545242ec55..792508d4ef1188b92e2e117155c4c1dce0bf9d63 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2011-07-12  Richard Sandiford  <richard.sandiford@linaro.org>
+
+       * config/arm/predicates.md (neon_struct_operand): Make a normal
+       predicate.
+       (neon_struct_or_register_operand): New predicate.
+       * config/arm/neon.md (movmisalign<mode>): Replace predicates
+       with neon_struct_or_register_operand.
+       (*movmisalign<mode>_neon_store, *movmisalign<mode>_neon_load): Use
+       neon_struct_operand instead of memory_operand.
+
 2011-07-12  Martin Jambor  <mjambor@suse.cz>
 
        * cgraph.h (cgraph_get_node_or_alias): Removed declaration.

diff --git a/gcc/config/arm/neon.md b/gcc/config/arm/neon.md
index becb5240a321496e103b07b14ada4bd350923ce8..1f9ea676dec6ffe44b363642de59582ebe8ea291 100644 (file)
--- a/gcc/config/arm/neon.md
+++ b/gcc/config/arm/neon.md
@@ -372,8 +372,8 @@
 })
 
 (define_expand "movmisalign<mode>"
-  [(set (match_operand:VDQX 0 "nonimmediate_operand"         "")
-       (unspec:VDQX [(match_operand:VDQX 1 "general_operand" "")]
+  [(set (match_operand:VDQX 0 "neon_struct_or_register_operand")
+       (unspec:VDQX [(match_operand:VDQX 1 "neon_struct_or_register_operand")]
                     UNSPEC_MISALIGNED_ACCESS))]
   "TARGET_NEON && !BYTES_BIG_ENDIAN"
 {
@@ -386,7 +386,7 @@
 })
 
 (define_insn "*movmisalign<mode>_neon_store"
-  [(set (match_operand:VDX 0 "memory_operand"                 "=Um")
+  [(set (match_operand:VDX 0 "neon_struct_operand"            "=Um")
        (unspec:VDX [(match_operand:VDX 1 "s_register_operand" " w")]
                    UNSPEC_MISALIGNED_ACCESS))]
   "TARGET_NEON && !BYTES_BIG_ENDIAN"
@@ -394,15 +394,15 @@
   [(set_attr "neon_type" "neon_vst1_1_2_regs_vst2_2_regs")])
 
 (define_insn "*movmisalign<mode>_neon_load"
-  [(set (match_operand:VDX 0 "s_register_operand"         "=w")
-       (unspec:VDX [(match_operand:VDX 1 "memory_operand" " Um")]
+  [(set (match_operand:VDX 0 "s_register_operand"              "=w")
+       (unspec:VDX [(match_operand:VDX 1 "neon_struct_operand" " Um")]
                    UNSPEC_MISALIGNED_ACCESS))]
   "TARGET_NEON && !BYTES_BIG_ENDIAN"
   "vld1.<V_sz_elem>\t{%P0}, %A1"
   [(set_attr "neon_type" "neon_vld1_1_2_regs")])
 
 (define_insn "*movmisalign<mode>_neon_store"
-  [(set (match_operand:VQX 0 "memory_operand"                 "=Um")
+  [(set (match_operand:VQX 0 "neon_struct_operand"            "=Um")
        (unspec:VQX [(match_operand:VQX 1 "s_register_operand" " w")]
                    UNSPEC_MISALIGNED_ACCESS))]
   "TARGET_NEON && !BYTES_BIG_ENDIAN"
@@ -410,8 +410,8 @@
   [(set_attr "neon_type" "neon_vst1_1_2_regs_vst2_2_regs")])
 
 (define_insn "*movmisalign<mode>_neon_load"
-  [(set (match_operand:VQX 0 "s_register_operand"         "=w")
-       (unspec:VQX [(match_operand:VQX 1 "memory_operand" " Um")]
+  [(set (match_operand:VQX 0 "s_register_operand"               "=w")
+       (unspec:VQX [(match_operand:VQX 1 "neon_struct_operand" " Um")]
                    UNSPEC_MISALIGNED_ACCESS))]
   "TARGET_NEON && !BYTES_BIG_ENDIAN"
   "vld1.<V_sz_elem>\t{%q0}, %A1"

diff --git a/gcc/config/arm/predicates.md b/gcc/config/arm/predicates.md
index 215d58df5168c44c2c4e5f8e2d5e668222f0cfdd..678a31c86e63b3a58a95852b82d6268a30d92e4c 100644 (file)
--- a/gcc/config/arm/predicates.md
+++ b/gcc/config/arm/predicates.md
@@ -732,9 +732,13 @@
   return true; 
 })
 
-(define_special_predicate "neon_struct_operand"
+(define_predicate "neon_struct_operand"
   (and (match_code "mem")
        (match_test "TARGET_32BIT && neon_vector_mem_operand (op, 2)")))
 
+(define_predicate "neon_struct_or_register_operand"
+  (ior (match_operand 0 "neon_struct_operand")
+       (match_operand 0 "s_register_operand")))
+
 (define_special_predicate "add_operator"
   (match_code "plus"))