From 663fd8c7b9730ad815ac35157be3d5a82e9066ae Mon Sep 17 00:00:00 2001 From: clyon Date: Tue, 4 Nov 2014 11:23:10 +0000 Subject: [PATCH] [AArch64] Fix predicate and constraint mismatch in logical atomic operations 2014-11-04 Michael Collison * config/aarch64/iterators.md (lconst_atomic): New mode attribute to support constraints for CONST_INT in atomic operations. * config/aarch64/atomics.md (atomic_): Use lconst_atomic constraint. (atomic_nand): Likewise. (atomic_fetch_): Likewise. (atomic_fetch_nand): Likewise. (atomic__fetch): Likewise. (atomic_nand_fetch): Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@217076 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 12 ++++++++++++ gcc/config/aarch64/atomics.md | 12 ++++++------ gcc/config/aarch64/iterators.md | 3 +++ 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index edf2b5db2a8..5eb313d252c 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,15 @@ +2014-11-04 Michael Collison + + * config/aarch64/iterators.md (lconst_atomic): New mode attribute + to support constraints for CONST_INT in atomic operations. + * config/aarch64/atomics.md + (atomic_): Use lconst_atomic constraint. + (atomic_nand): Likewise. + (atomic_fetch_): Likewise. + (atomic_fetch_nand): Likewise. + (atomic__fetch): Likewise. + (atomic_nand_fetch): Likewise. + 2014-11-04 Ramana Radhakrishnan * config/arm/arm.h (TARGET_CPU_CPP_BUILTINS): Fix typo in definition diff --git a/gcc/config/aarch64/atomics.md b/gcc/config/aarch64/atomics.md index bffa465defc..eb7daa1aec9 100644 --- a/gcc/config/aarch64/atomics.md +++ b/gcc/config/aarch64/atomics.md @@ -119,7 +119,7 @@ [(set (match_operand:ALLI 0 "aarch64_sync_memory_operand" "+Q") (unspec_volatile:ALLI [(atomic_op:ALLI (match_dup 0) - (match_operand:ALLI 1 "" "rn")) + (match_operand:ALLI 1 "" "r")) (match_operand:SI 2 "const_int_operand")] ;; model UNSPECV_ATOMIC_OP)) (clobber (reg:CC CC_REGNUM)) @@ -141,7 +141,7 @@ (unspec_volatile:ALLI [(not:ALLI (and:ALLI (match_dup 0) - (match_operand:ALLI 1 "aarch64_logical_operand" "rn"))) + (match_operand:ALLI 1 "aarch64_logical_operand" "r"))) (match_operand:SI 2 "const_int_operand")] ;; model UNSPECV_ATOMIC_OP)) (clobber (reg:CC CC_REGNUM)) @@ -164,7 +164,7 @@ (set (match_dup 1) (unspec_volatile:ALLI [(atomic_op:ALLI (match_dup 1) - (match_operand:ALLI 2 "" "rn")) + (match_operand:ALLI 2 "" "r")) (match_operand:SI 3 "const_int_operand")] ;; model UNSPECV_ATOMIC_OP)) (clobber (reg:CC CC_REGNUM)) @@ -188,7 +188,7 @@ (unspec_volatile:ALLI [(not:ALLI (and:ALLI (match_dup 1) - (match_operand:ALLI 2 "aarch64_logical_operand" "rn"))) + (match_operand:ALLI 2 "aarch64_logical_operand" "r"))) (match_operand:SI 3 "const_int_operand")] ;; model UNSPECV_ATOMIC_OP)) (clobber (reg:CC CC_REGNUM)) @@ -209,7 +209,7 @@ [(set (match_operand:ALLI 0 "register_operand" "=&r") (atomic_op:ALLI (match_operand:ALLI 1 "aarch64_sync_memory_operand" "+Q") - (match_operand:ALLI 2 "" "rn"))) + (match_operand:ALLI 2 "" "r"))) (set (match_dup 1) (unspec_volatile:ALLI [(match_dup 1) (match_dup 2) @@ -233,7 +233,7 @@ (not:ALLI (and:ALLI (match_operand:ALLI 1 "aarch64_sync_memory_operand" "+Q") - (match_operand:ALLI 2 "aarch64_logical_operand" "rn")))) + (match_operand:ALLI 2 "aarch64_logical_operand" "r")))) (set (match_dup 1) (unspec_volatile:ALLI [(match_dup 1) (match_dup 2) diff --git a/gcc/config/aarch64/iterators.md b/gcc/config/aarch64/iterators.md index 74c71fcc804..99351679794 100644 --- a/gcc/config/aarch64/iterators.md +++ b/gcc/config/aarch64/iterators.md @@ -361,6 +361,9 @@ ;; Attribute to describe constants acceptable in logical operations (define_mode_attr lconst [(SI "K") (DI "L")]) +;; Attribute to describe constants acceptable in atomic logical operations +(define_mode_attr lconst_atomic [(QI "K") (HI "K") (SI "K") (DI "L")]) + ;; Map a mode to a specific constraint character. (define_mode_attr cmode [(QI "q") (HI "h") (SI "s") (DI "d")]) -- 2.11.4.GIT