OSDN Git Service

2010-09-02 Marcus Shawcroft <marcus.shawcroft@arm.com>
authormshawcroft <mshawcroft@138bc75d-0d04-0410-961f-82ee72b054a4>
Thu, 2 Sep 2010 09:01:56 +0000 (09:01 +0000)
committermshawcroft <mshawcroft@138bc75d-0d04-0410-961f-82ee72b054a4>
Thu, 2 Sep 2010 09:01:56 +0000 (09:01 +0000)
* config/arm/predicates.md (arm_sync_memory_operand): New.
* config/arm/sync.md (arm_sync_compare_and_swapsi): Change predicate
        to arm_sync_memory_operand and constraint to Q.
(arm_sync_compare_and_swap<mode>): Likewise.
(arm_sync_compare_and_swap<mode>): Likewise.
(arm_sync_lock_test_and_setsi): Likewise.
(arm_sync_lock_test_and_set<mode>): Likewise.
        (arm_sync_new_<sync_optab>si): Likewise.
        (arm_sync_new_nandsi): Likewise.
        (arm_sync_new_<sync_optab><mode>): Likewise.
        (arm_sync_new_nand<mode>): Likewise.
        (arm_sync_old_<sync_optab>si): Likewise.
        (arm_sync_old_nandsi): Likewise.
        (arm_sync_old_<sync_optab><mode>): Likewise.
        (arm_sync_old_nand<mode>): Likewise.

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

gcc/config/arm/predicates.md
gcc/config/arm/sync.md

index 032b2ec..54f4861 100644 (file)
                (and (match_test "TARGET_32BIT")
                     (match_operand 0 "arm_di_operand"))))
 
+;; True if the operand is memory reference suitable for a ldrex/strex.
+(define_predicate "arm_sync_memory_operand"
+  (and (match_operand 0 "memory_operand")
+       (match_code "reg" "0")))
+
 ;; Predicates for parallel expanders based on mode.
 (define_special_predicate "vect_par_constant_high" 
   (match_code "parallel")
index 7fd38d7..f942d1f 100644 (file)
 (define_insn "arm_sync_compare_and_swapsi"
   [(set (match_operand:SI 0 "s_register_operand" "=&r")
         (unspec_volatile:SI
-         [(match_operand:SI 1 "memory_operand" "+m")
+         [(match_operand:SI 1 "arm_sync_memory_operand" "+Q")
           (match_operand:SI 2 "s_register_operand" "r")
           (match_operand:SI 3 "s_register_operand" "r")]
          VUNSPEC_SYNC_COMPARE_AND_SWAP))
   [(set (match_operand:SI 0 "s_register_operand" "=&r")
         (zero_extend:SI
          (unspec_volatile:NARROW
-           [(match_operand:NARROW 1 "memory_operand" "+m")
+           [(match_operand:NARROW 1 "arm_sync_memory_operand" "+Q")
             (match_operand:SI 2 "s_register_operand" "r")
             (match_operand:SI 3 "s_register_operand" "r")]
            VUNSPEC_SYNC_COMPARE_AND_SWAP)))
 
 (define_insn "arm_sync_lock_test_and_setsi"
   [(set (match_operand:SI 0 "s_register_operand" "=&r")
-        (match_operand:SI 1 "memory_operand" "+m"))
+        (match_operand:SI 1 "arm_sync_memory_operand" "+Q"))
    (set (match_dup 1)
         (unspec_volatile:SI [(match_operand:SI 2 "s_register_operand" "r")]
                            VUNSPEC_SYNC_LOCK))
 
 (define_insn "arm_sync_lock_test_and_set<mode>"
   [(set (match_operand:SI 0 "s_register_operand" "=&r")
-        (zero_extend:SI (match_operand:NARROW 1 "memory_operand" "+m")))
+        (zero_extend:SI (match_operand:NARROW 1 "arm_sync_memory_operand" "+Q")))
    (set (match_dup 1)
         (unspec_volatile:NARROW [(match_operand:SI 2 "s_register_operand" "r")]
                                VUNSPEC_SYNC_LOCK))
 (define_insn "arm_sync_new_<sync_optab>si"
   [(set (match_operand:SI 0 "s_register_operand" "=&r")
         (unspec_volatile:SI [(syncop:SI
-                               (match_operand:SI 1 "memory_operand" "+m")
+                               (match_operand:SI 1 "arm_sync_memory_operand" "+Q")
                                (match_operand:SI 2 "s_register_operand" "r"))
                            ]
                            VUNSPEC_SYNC_NEW_OP))
 (define_insn "arm_sync_new_nandsi"
   [(set (match_operand:SI 0 "s_register_operand" "=&r")
         (unspec_volatile:SI [(not:SI (and:SI
-                               (match_operand:SI 1 "memory_operand" "+m")
+                               (match_operand:SI 1 "arm_sync_memory_operand" "+Q")
                                (match_operand:SI 2 "s_register_operand" "r")))
                            ]
                            VUNSPEC_SYNC_NEW_OP))
   [(set (match_operand:SI 0 "s_register_operand" "=&r")
         (unspec_volatile:SI [(syncop:SI
                                (zero_extend:SI
-                                (match_operand:NARROW 1 "memory_operand" "+m"))
+                                (match_operand:NARROW 1 "arm_sync_memory_operand" "+Q"))
                                (match_operand:SI 2 "s_register_operand" "r"))
                            ]
                            VUNSPEC_SYNC_NEW_OP))
          [(not:SI
             (and:SI
                (zero_extend:SI   
-                (match_operand:NARROW 1 "memory_operand" "+m"))
+                (match_operand:NARROW 1 "arm_sync_memory_operand" "+Q"))
                (match_operand:SI 2 "s_register_operand" "r")))
          ] VUNSPEC_SYNC_NEW_OP))
    (set (match_dup 1)
 (define_insn "arm_sync_old_<sync_optab>si"
   [(set (match_operand:SI 0 "s_register_operand" "=&r")
         (unspec_volatile:SI [(syncop:SI
-                               (match_operand:SI 1 "memory_operand" "+m")
+                               (match_operand:SI 1 "arm_sync_memory_operand" "+Q")
                                (match_operand:SI 2 "s_register_operand" "r"))
                            ]
                            VUNSPEC_SYNC_OLD_OP))
 (define_insn "arm_sync_old_nandsi"
   [(set (match_operand:SI 0 "s_register_operand" "=&r")
         (unspec_volatile:SI [(not:SI (and:SI
-                               (match_operand:SI 1 "memory_operand" "+m")
+                               (match_operand:SI 1 "arm_sync_memory_operand" "+Q")
                                (match_operand:SI 2 "s_register_operand" "r")))
                            ]
                            VUNSPEC_SYNC_OLD_OP))
   [(set (match_operand:SI 0 "s_register_operand" "=&r")
         (unspec_volatile:SI [(syncop:SI
                                (zero_extend:SI
-                                (match_operand:NARROW 1 "memory_operand" "+m"))
+                                (match_operand:NARROW 1 "arm_sync_memory_operand" "+Q"))
                                (match_operand:SI 2 "s_register_operand" "r"))
                            ]
                            VUNSPEC_SYNC_OLD_OP))
   [(set (match_operand:SI 0 "s_register_operand" "=&r")
         (unspec_volatile:SI [(not:SI (and:SI
                                (zero_extend:SI
-                                (match_operand:NARROW 1 "memory_operand" "+m"))
+                                (match_operand:NARROW 1 "arm_sync_memory_operand" "+Q"))
                                (match_operand:SI 2 "s_register_operand" "r")))
                            ]
                            VUNSPEC_SYNC_OLD_OP))