From 12c4ecb13a60ac686ec32b61ece46372d0d19760 Mon Sep 17 00:00:00 2001 From: Richard Sandiford Date: Tue, 12 Jul 2011 14:30:32 +0000 Subject: [PATCH] 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): Replace predicates with neon_struct_or_register_operand. (*movmisalign_neon_store, *movmisalign_neon_load): Use neon_struct_operand instead of memory_operand. From-SVN: r176204 --- gcc/ChangeLog | 10 ++++++++++ gcc/config/arm/neon.md | 16 ++++++++-------- gcc/config/arm/predicates.md | 6 +++++- 3 files changed, 23 insertions(+), 9 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d121c5c40f1..792508d4ef1 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,13 @@ +2011-07-12 Richard Sandiford + + * config/arm/predicates.md (neon_struct_operand): Make a normal + predicate. + (neon_struct_or_register_operand): New predicate. + * config/arm/neon.md (movmisalign): Replace predicates + with neon_struct_or_register_operand. + (*movmisalign_neon_store, *movmisalign_neon_load): Use + neon_struct_operand instead of memory_operand. + 2011-07-12 Martin Jambor * cgraph.h (cgraph_get_node_or_alias): Removed declaration. diff --git a/gcc/config/arm/neon.md b/gcc/config/arm/neon.md index becb5240a32..1f9ea676dec 100644 --- a/gcc/config/arm/neon.md +++ b/gcc/config/arm/neon.md @@ -372,8 +372,8 @@ }) (define_expand "movmisalign" - [(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_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_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.\t{%P0}, %A1" [(set_attr "neon_type" "neon_vld1_1_2_regs")]) (define_insn "*movmisalign_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_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.\t{%q0}, %A1" diff --git a/gcc/config/arm/predicates.md b/gcc/config/arm/predicates.md index 215d58df516..678a31c86e6 100644 --- 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")) -- 2.30.2