From bf0b8cbee52bf89f558d515a05b2fa5d03e9080d Mon Sep 17 00:00:00 2001 From: Richard Sandiford Date: Sun, 11 Sep 2011 17:21:50 +0000 Subject: [PATCH] cris.md: Use match_test rather than eq/ne symbol_ref throughout file. gcc/ * config/cris/cris.md: Use match_test rather than eq/ne symbol_ref throughout file. From-SVN: r178760 --- gcc/ChangeLog | 5 +++++ gcc/config/cris/cris.md | 17 ++++++----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 415c19f52afe..4ae39c27ae18 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2011-09-11 Richard Sandiford + + * config/cris/cris.md: Use match_test rather than eq/ne symbol_ref + throughout file. + 2011-09-11 Richard Sandiford * config/mips/mips.md: Use match_test rather than eq/ne symbol_ref diff --git a/gcc/config/cris/cris.md b/gcc/config/cris/cris.md index 8af8a06531d1..592bbadf489d 100644 --- a/gcc/config/cris/cris.md +++ b/gcc/config/cris/cris.md @@ -191,10 +191,8 @@ (define_delay (eq_attr "slottable" "has_call_slot") [(and (eq_attr "slottable" "yes") - (ior (eq (symbol_ref "RTX_FRAME_RELATED_P (insn)") - (const_int 0)) - (eq (symbol_ref "flag_exceptions") - (const_int 0)))) + (ior (not (match_test "RTX_FRAME_RELATED_P (insn)")) + (not (match_test "flag_exceptions")))) (nil) (nil)]) ;; The insn in the return insn slot must not be the @@ -204,8 +202,7 @@ ;; naked RETURN in middle-end. (define_delay (eq_attr "slottable" "has_return_slot") [(and (eq_attr "slottable" "yes") - (eq (symbol_ref "dead_or_set_regno_p (insn, CRIS_SRP_REGNUM)") - (const_int 0))) + (not (match_test "dead_or_set_regno_p (insn, CRIS_SRP_REGNUM)"))) (nil) (nil)]) @@ -2578,7 +2575,7 @@ "TARGET_HAS_MUL_INSNS" "%!mul %2,%0" [(set (attr "slottable") - (if_then_else (ne (symbol_ref "TARGET_MUL_BUG") (const_int 0)) + (if_then_else (match_test "TARGET_MUL_BUG") (const_string "no") (const_string "yes"))) ;; For umuls.[bwd] it's just N unusable here, but let's be safe. @@ -2601,7 +2598,7 @@ "TARGET_HAS_MUL_INSNS" "%!muls.d %2,%0" [(set (attr "slottable") - (if_then_else (ne (symbol_ref "TARGET_MUL_BUG") (const_int 0)) + (if_then_else (match_test "TARGET_MUL_BUG") (const_string "no") (const_string "yes"))) ;; Just N unusable here, but let's be safe. @@ -3493,9 +3490,7 @@ } [(set (attr "slottable") (if_then_else - (ne (symbol_ref - "(cris_return_address_on_stack_for_return ())") - (const_int 0)) + (match_test "cris_return_address_on_stack_for_return ()") (const_string "no") (const_string "has_return_slot")))]) -- 2.47.3