As per the subject. Tested by making sure that there were no new
warnings building bfin-elf, and that there were no changes in the
assembly output for the C and C++ testsuite. OK to install?
Richard
gcc/
* config/bfin/bfin.md: Use match_test rather than eq/ne symbol_ref
throughout file.
Index: gcc/config/bfin/bfin.md
===================================================================
--- gcc/config/bfin/bfin.md 2011-09-13 18:43:40.000000000 +0100
+++ gcc/config/bfin/bfin.md 2011-09-13 18:47:34.000000000 +0100
@@ -237,14 +237,12 @@ (define_insn_reservation "dsp32" 1
(define_insn_reservation "dsp32shiftimm" 1
(and (eq_attr "type" "dsp32shiftimm")
- (eq (symbol_ref "ENABLE_WA_05000074")
- (const_int 0)))
+ (not (match_test "ENABLE_WA_05000074")))
"slot0")
(define_insn_reservation "dsp32shiftimm_anomaly_05000074" 1
(and (eq_attr "type" "dsp32shiftimm")
- (ne (symbol_ref "ENABLE_WA_05000074")
- (const_int 0)))
+ (match_test "ENABLE_WA_05000074"))
"slot0+anomaly_05000074")
(define_insn_reservation "load32" 1
@@ -277,8 +275,7 @@ (define_insn_reservation "storep" 1
(and (eq_attr "type" "mcst")
(ior (eq_attr "addrtype" "preg")
(eq_attr "addrtype" "spreg"))))
- (ior (eq (symbol_ref "ENABLE_WA_05000074")
- (const_int 0))
+ (ior (not (match_test "ENABLE_WA_05000074"))
(eq_attr "storereg" "other")))
"slot1+pregs+store")
@@ -287,24 +284,21 @@ (define_insn_reservation "storep_anomaly
(and (eq_attr "type" "mcst")
(ior (eq_attr "addrtype" "preg")
(eq_attr "addrtype" "spreg"))))
- (and (ne (symbol_ref "ENABLE_WA_05000074")
- (const_int 0))
+ (and (match_test "ENABLE_WA_05000074")
(eq_attr "storereg" "preg")))
"slot1+anomaly_05000074+pregs+store")
(define_insn_reservation "storei" 1
(and (and (not (eq_attr "seq_insns" "multi"))
(and (eq_attr "type" "mcst") (eq_attr "addrtype" "ireg")))
- (ior (eq (symbol_ref "ENABLE_WA_05000074")
- (const_int 0))
+ (ior (not (match_test "ENABLE_WA_05000074"))
(eq_attr "storereg" "other")))
"(slot1|slot2)+store")
(define_insn_reservation "storei_anomaly_05000074" 1
(and (and (not (eq_attr "seq_insns" "multi"))
(and (eq_attr "type" "mcst") (eq_attr "addrtype" "ireg")))
- (and (ne (symbol_ref "ENABLE_WA_05000074")
- (const_int 0))
+ (and (match_test "ENABLE_WA_05000074")
(eq_attr "storereg" "preg")))
"((slot1+anomaly_05000074)|slot2)+store")
