Patchwork [HPPA] Use match_test rather than eq/ne symbol_ref

login
register
mail settings
Submitter Richard Sandiford
Date Sept. 13, 2011, 6:01 p.m.
Message ID <8762kw7258.fsf@firetop.home>
Download mbox | patch
Permalink /patch/114525/
State New
Headers show

Comments

Richard Sandiford - Sept. 13, 2011, 6:01 p.m.
As per the subject.  Tested by making sure that there were no new
warnings building hppa64-hp-hpux11.23, and that there were no changes
in the assembly output for the C and C++ testsuite.  OK to install?

Richard


gcc/
	* config/pa/pa.md: Use match_test rather than eq/ne symbol_ref
	throughout file.
Jeff Law - Sept. 13, 2011, 6:04 p.m.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 09/13/11 12:01, Richard Sandiford wrote:
> As per the subject.  Tested by making sure that there were no new 
> warnings building hppa64-hp-hpux11.23, and that there were no
> changes in the assembly output for the C and C++ testsuite.  OK to
> install?
> 
> Richard
> 
> 
> gcc/ * config/pa/pa.md: Use match_test rather than eq/ne
> symbol_ref throughout file.
OK.

Though I wonder if we could kill TARGET_PORTABLE_RUNTIME which would
simplify some of this stuff.  I guess the pa-linux folks probably use
this stuff :(


jeff
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQEcBAEBAgAGBQJOb5tGAAoJEBRtltQi2kC7R2MH/09N4lIgbp9+nOcqX17Z7ZY0
YhPzvXxcEQLNabinKdT8EZ0saZfZNOsV+ZrbNt+EN8we1InRE6F4GDcgRVAP71vw
jJSY19XBypmEEQAyNJ0fVAdUySOuBJyXbCC7SSD1zcsWuS0w1HDSc8AumLWbwOuU
n5Oiv+EjGy1vB09mx2sCuDN0LucApAsgGFuO2bxWGGpZLvrdQWIF6mCh0Pvy+pD9
mlEcjr+3P8gXkbGosfxG4oM9n24Wynv6r+PJvRekgOhRcSCFfY3NMowHe+F8jvBo
+aoKyix068rOY1tMjiGEpoG8S15rup9nkpHRQIZZnXWCWdB4k8QhJ3oe3vJ6Dy8=
=9LX5
-----END PGP SIGNATURE-----
John David Anglin - Sept. 13, 2011, 6:37 p.m.
On 9/13/2011 2:04 PM, Jeff Law wrote:
> Though I wonder if we could kill TARGET_PORTABLE_RUNTIME which would
> simplify some of this stuff.  I guess the pa-linux folks probably use
> this stuff:(
I don't think it is used much if at all.  There were a couple of parisc 
portables (tadpole?)
that had somewhat crippled processors.  The main linux interest is for 
servers and the
last generation of workstations.

Dave

Patch

Index: gcc/config/pa/pa.md
===================================================================
--- gcc/config/pa/pa.md	2011-09-13 18:43:39.000000000 +0100
+++ gcc/config/pa/pa.md	2011-09-13 19:00:48.000000000 +0100
@@ -143,8 +143,7 @@  (define_attr "in_call_delay" "false,true
 	      (eq_attr "length" "4"))
 	   (const_string "true")
 	 (eq_attr "type" "uncond_branch")
-	   (if_then_else (ne (symbol_ref "TARGET_JUMP_IN_DELAY")
-			     (const_int 0))
+	   (if_then_else (match_test "TARGET_JUMP_IN_DELAY")
 			 (const_string "true")
 			 (const_string "false"))]
 	(const_string "false")))
@@ -181,8 +180,7 @@  (define_delay (eq_attr "type" "cbranch")
 	(attr_flag "backward"))])
 
 (define_delay (and (eq_attr "type" "uncond_branch")
-		   (eq (symbol_ref "following_call (insn)")
-		       (const_int 0)))
+		   (not (match_test "following_call (insn)")))
   [(eq_attr "in_branch_delay" "true") (nil) (nil)])
 
 ;; Memory. Disregarding Cache misses, the Mustang memory times are:
@@ -1348,9 +1346,9 @@  (define_insn ""
 	   (lt (abs (minus (match_dup 0) (plus (pc) (const_int 8))))
 	       (const_int MAX_17BIT_OFFSET))
 	   (const_int 8)
-	   (ne (symbol_ref "TARGET_PORTABLE_RUNTIME") (const_int 0))
+	   (match_test "TARGET_PORTABLE_RUNTIME")
 	   (const_int 24)
-	   (eq (symbol_ref "flag_pic") (const_int 0))
+	   (not (match_test "flag_pic"))
 	   (const_int 20)]
 	  (const_int 28)))])
 
@@ -1377,9 +1375,9 @@  (define_insn ""
 	   (lt (abs (minus (match_dup 0) (plus (pc) (const_int 8))))
 	       (const_int MAX_17BIT_OFFSET))
 	   (const_int 8)
-	   (ne (symbol_ref "TARGET_PORTABLE_RUNTIME") (const_int 0))
+	   (match_test "TARGET_PORTABLE_RUNTIME")
 	   (const_int 24)
-	   (eq (symbol_ref "flag_pic") (const_int 0))
+	   (not (match_test "flag_pic"))
 	   (const_int 20)]
 	  (const_int 28)))])
 
@@ -1404,9 +1402,9 @@  (define_insn ""
 	   (lt (abs (minus (match_dup 0) (plus (pc) (const_int 8))))
 	       (const_int MAX_17BIT_OFFSET))
 	   (const_int 8)
-	   (ne (symbol_ref "TARGET_PORTABLE_RUNTIME") (const_int 0))
+	   (match_test "TARGET_PORTABLE_RUNTIME")
 	   (const_int 24)
-	   (eq (symbol_ref "flag_pic") (const_int 0))
+	   (not (match_test "flag_pic"))
 	   (const_int 20)]
 	  (const_int 28)))])
 
@@ -1433,9 +1431,9 @@  (define_insn ""
 	   (lt (abs (minus (match_dup 0) (plus (pc) (const_int 8))))
 	       (const_int MAX_17BIT_OFFSET))
 	   (const_int 8)
-	   (ne (symbol_ref "TARGET_PORTABLE_RUNTIME") (const_int 0))
+	   (match_test "TARGET_PORTABLE_RUNTIME")
 	   (const_int 24)
-	   (eq (symbol_ref "flag_pic") (const_int 0))
+	   (not (match_test "flag_pic"))
 	   (const_int 20)]
 	  (const_int 28)))])
 (define_insn ""
@@ -1459,9 +1457,9 @@  (define_insn ""
 	   (lt (abs (minus (match_dup 0) (plus (pc) (const_int 8))))
 	       (const_int MAX_17BIT_OFFSET))
 	   (const_int 8)
-	   (ne (symbol_ref "TARGET_PORTABLE_RUNTIME") (const_int 0))
+	   (match_test "TARGET_PORTABLE_RUNTIME")
 	   (const_int 24)
-	   (eq (symbol_ref "flag_pic") (const_int 0))
+	   (not (match_test "flag_pic"))
 	   (const_int 20)]
 	  (const_int 28)))])
 
@@ -1488,9 +1486,9 @@  (define_insn ""
 	   (lt (abs (minus (match_dup 0) (plus (pc) (const_int 8))))
 	       (const_int MAX_17BIT_OFFSET))
 	   (const_int 8)
-	   (ne (symbol_ref "TARGET_PORTABLE_RUNTIME") (const_int 0))
+	   (match_test "TARGET_PORTABLE_RUNTIME")
 	   (const_int 24)
-	   (eq (symbol_ref "flag_pic") (const_int 0))
+	   (not (match_test "flag_pic"))
 	   (const_int 20)]
 	  (const_int 28)))])
 
@@ -1517,9 +1515,9 @@  (define_insn ""
 	   (lt (abs (minus (match_dup 2) (plus (pc) (const_int 8))))
 	       (const_int MAX_17BIT_OFFSET))
 	   (const_int 8)
-	   (ne (symbol_ref "TARGET_PORTABLE_RUNTIME") (const_int 0))
+	   (match_test "TARGET_PORTABLE_RUNTIME")
 	   (const_int 24)
-	   (eq (symbol_ref "flag_pic") (const_int 0))
+	   (not (match_test "flag_pic"))
 	   (const_int 20)]
 	  (const_int 28)))])
 
@@ -1545,9 +1543,9 @@  (define_insn ""
 	   (lt (abs (minus (match_dup 2) (plus (pc) (const_int 8))))
 	       (const_int MAX_17BIT_OFFSET))
 	   (const_int 8)
-	   (ne (symbol_ref "TARGET_PORTABLE_RUNTIME") (const_int 0))
+	   (match_test "TARGET_PORTABLE_RUNTIME")
 	   (const_int 24)
-	   (eq (symbol_ref "flag_pic") (const_int 0))
+	   (not (match_test "flag_pic"))
 	   (const_int 20)]
 	  (const_int 28)))])
 
@@ -1573,9 +1571,9 @@  (define_insn ""
 	   (lt (abs (minus (match_dup 2) (plus (pc) (const_int 8))))
 	       (const_int MAX_17BIT_OFFSET))
 	   (const_int 8)
-	   (ne (symbol_ref "TARGET_PORTABLE_RUNTIME") (const_int 0))
+	   (match_test "TARGET_PORTABLE_RUNTIME")
 	   (const_int 24)
-	   (eq (symbol_ref "flag_pic") (const_int 0))
+	   (not (match_test "flag_pic"))
 	   (const_int 20)]
 	  (const_int 28)))])
 
@@ -1601,9 +1599,9 @@  (define_insn ""
 	   (lt (abs (minus (match_dup 2) (plus (pc) (const_int 8))))
 	       (const_int MAX_17BIT_OFFSET))
 	   (const_int 8)
-	   (ne (symbol_ref "TARGET_PORTABLE_RUNTIME") (const_int 0))
+	   (match_test "TARGET_PORTABLE_RUNTIME")
 	   (const_int 24)
-	   (eq (symbol_ref "flag_pic") (const_int 0))
+	   (not (match_test "flag_pic"))
 	   (const_int 20)]
 	  (const_int 28)))])
 
@@ -1629,9 +1627,9 @@  (define_insn ""
 	   (lt (abs (minus (match_dup 2) (plus (pc) (const_int 8))))
 	       (const_int MAX_17BIT_OFFSET))
 	   (const_int 8)
-	   (ne (symbol_ref "TARGET_PORTABLE_RUNTIME") (const_int 0))
+	   (match_test "TARGET_PORTABLE_RUNTIME")
 	   (const_int 24)
-	   (eq (symbol_ref "flag_pic") (const_int 0))
+	   (not (match_test "flag_pic"))
 	   (const_int 20)]
 	  (const_int 28)))])
 
@@ -1657,9 +1655,9 @@  (define_insn ""
 	   (lt (abs (minus (match_dup 2) (plus (pc) (const_int 8))))
 	       (const_int MAX_17BIT_OFFSET))
 	   (const_int 8)
-	   (ne (symbol_ref "TARGET_PORTABLE_RUNTIME") (const_int 0))
+	   (match_test "TARGET_PORTABLE_RUNTIME")
 	   (const_int 24)
-	   (eq (symbol_ref "flag_pic") (const_int 0))
+	   (not (match_test "flag_pic"))
 	   (const_int 20)]
 	  (const_int 28)))])
 
@@ -1685,9 +1683,9 @@  (define_insn ""
 	   (lt (abs (minus (match_dup 2) (plus (pc) (const_int 8))))
 	       (const_int MAX_17BIT_OFFSET))
 	   (const_int 8)
-	   (ne (symbol_ref "TARGET_PORTABLE_RUNTIME") (const_int 0))
+	   (match_test "TARGET_PORTABLE_RUNTIME")
 	   (const_int 24)
-	   (eq (symbol_ref "flag_pic") (const_int 0))
+	   (not (match_test "flag_pic"))
 	   (const_int 20)]
 	  (const_int 28)))])
 
@@ -1713,9 +1711,9 @@  (define_insn ""
 	   (lt (abs (minus (match_dup 2) (plus (pc) (const_int 8))))
 	       (const_int MAX_17BIT_OFFSET))
 	   (const_int 8)
-	   (ne (symbol_ref "TARGET_PORTABLE_RUNTIME") (const_int 0))
+	   (match_test "TARGET_PORTABLE_RUNTIME")
 	   (const_int 24)
-	   (eq (symbol_ref "flag_pic") (const_int 0))
+	   (not (match_test "flag_pic"))
 	   (const_int 20)]
 	  (const_int 28)))])
 
@@ -1742,9 +1740,9 @@  (define_insn ""
 	   (lt (abs (minus (match_dup 2) (plus (pc) (const_int 8))))
 	       (const_int MAX_17BIT_OFFSET))
 	   (const_int 8)
-	   (ne (symbol_ref "TARGET_PORTABLE_RUNTIME") (const_int 0))
+	   (match_test "TARGET_PORTABLE_RUNTIME")
 	   (const_int 24)
-	   (eq (symbol_ref "flag_pic") (const_int 0))
+	   (not (match_test "flag_pic"))
 	   (const_int 20)]
 	  (const_int 28)))])
 
@@ -1770,9 +1768,9 @@  (define_insn ""
 	   (lt (abs (minus (match_dup 2) (plus (pc) (const_int 8))))
 	       (const_int MAX_17BIT_OFFSET))
 	   (const_int 8)
-	   (ne (symbol_ref "TARGET_PORTABLE_RUNTIME") (const_int 0))
+	   (match_test "TARGET_PORTABLE_RUNTIME")
 	   (const_int 24)
-	   (eq (symbol_ref "flag_pic") (const_int 0))
+	   (not (match_test "flag_pic"))
 	   (const_int 20)]
 	  (const_int 28)))])
 
@@ -1798,9 +1796,9 @@  (define_insn ""
 	   (lt (abs (minus (match_dup 2) (plus (pc) (const_int 8))))
 	       (const_int MAX_17BIT_OFFSET))
 	   (const_int 8)
-	   (ne (symbol_ref "TARGET_PORTABLE_RUNTIME") (const_int 0))
+	   (match_test "TARGET_PORTABLE_RUNTIME")
 	   (const_int 24)
-	   (eq (symbol_ref "flag_pic") (const_int 0))
+	   (not (match_test "flag_pic"))
 	   (const_int 20)]
 	  (const_int 28)))])
 
@@ -1826,9 +1824,9 @@  (define_insn ""
 	   (lt (abs (minus (match_dup 2) (plus (pc) (const_int 8))))
 	       (const_int MAX_17BIT_OFFSET))
 	   (const_int 8)
-	   (ne (symbol_ref "TARGET_PORTABLE_RUNTIME") (const_int 0))
+	   (match_test "TARGET_PORTABLE_RUNTIME")
 	   (const_int 24)
-	   (eq (symbol_ref "flag_pic") (const_int 0))
+	   (not (match_test "flag_pic"))
 	   (const_int 20)]
 	  (const_int 28)))])
 
@@ -1854,9 +1852,9 @@  (define_insn ""
 	   (lt (abs (minus (match_dup 2) (plus (pc) (const_int 8))))
 	       (const_int MAX_17BIT_OFFSET))
 	   (const_int 8)
-	   (ne (symbol_ref "TARGET_PORTABLE_RUNTIME") (const_int 0))
+	   (match_test "TARGET_PORTABLE_RUNTIME")
 	   (const_int 24)
-	   (eq (symbol_ref "flag_pic") (const_int 0))
+	   (not (match_test "flag_pic"))
 	   (const_int 20)]
 	  (const_int 28)))])
 
@@ -1882,9 +1880,9 @@  (define_insn ""
 	   (lt (abs (minus (match_dup 2) (plus (pc) (const_int 8))))
 	       (const_int MAX_17BIT_OFFSET))
 	   (const_int 8)
-	   (ne (symbol_ref "TARGET_PORTABLE_RUNTIME") (const_int 0))
+	   (match_test "TARGET_PORTABLE_RUNTIME")
 	   (const_int 24)
-	   (eq (symbol_ref "flag_pic") (const_int 0))
+	   (not (match_test "flag_pic"))
 	   (const_int 20)]
 	  (const_int 28)))])
 
@@ -1910,9 +1908,9 @@  (define_insn ""
 	   (lt (abs (minus (match_dup 2) (plus (pc) (const_int 8))))
 	       (const_int MAX_17BIT_OFFSET))
 	   (const_int 8)
-	   (ne (symbol_ref "TARGET_PORTABLE_RUNTIME") (const_int 0))
+	   (match_test "TARGET_PORTABLE_RUNTIME")
 	   (const_int 24)
-	   (eq (symbol_ref "flag_pic") (const_int 0))
+	   (not (match_test "flag_pic"))
 	   (const_int 20)]
 	  (const_int 28)))])
 
@@ -1938,9 +1936,9 @@  (define_insn ""
 	   (lt (abs (minus (match_dup 2) (plus (pc) (const_int 8))))
 	       (const_int MAX_17BIT_OFFSET))
 	   (const_int 8)
-	   (ne (symbol_ref "TARGET_PORTABLE_RUNTIME") (const_int 0))
+	   (match_test "TARGET_PORTABLE_RUNTIME")
 	   (const_int 24)
-	   (eq (symbol_ref "flag_pic") (const_int 0))
+	   (not (match_test "flag_pic"))
 	   (const_int 20)]
 	  (const_int 28)))])
 
@@ -1987,9 +1985,9 @@  (define_insn ""
     (cond [(lt (abs (minus (match_dup 0) (plus (pc) (const_int 8))))
 	       (const_int MAX_17BIT_OFFSET))
 	   (const_int 8)
-	   (ne (symbol_ref "TARGET_PORTABLE_RUNTIME") (const_int 0))
+	   (match_test "TARGET_PORTABLE_RUNTIME")
 	   (const_int 32)
-	   (eq (symbol_ref "flag_pic") (const_int 0))
+	   (not (match_test "flag_pic"))
 	   (const_int 28)]
 	  (const_int 36)))])
 
@@ -2031,9 +2029,9 @@  (define_insn ""
     (cond [(lt (abs (minus (match_dup 0) (plus (pc) (const_int 8))))
 	       (const_int MAX_17BIT_OFFSET))
 	   (const_int 12)
-	   (ne (symbol_ref "TARGET_PORTABLE_RUNTIME") (const_int 0))
+	   (match_test "TARGET_PORTABLE_RUNTIME")
 	   (const_int 28)
-	   (eq (symbol_ref "flag_pic") (const_int 0))
+	   (not (match_test "flag_pic"))
 	   (const_int 24)]
 	  (const_int 32)))])
 
@@ -2590,7 +2588,7 @@  (define_insn ""
 }"
   [(set_attr "type" "binary")
    (set (attr "length")
-      (if_then_else (eq (symbol_ref "TARGET_LONG_LOAD_STORE") (const_int 0))
+      (if_then_else (not (match_test "TARGET_LONG_LOAD_STORE"))
 		    (const_int 4)
 		    (const_int 8)))])
 
@@ -5997,8 +5995,7 @@  (define_insn "negdf2_slow"
 }"
   [(set_attr "type" "multi")
    (set (attr "length")
-	(if_then_else (ne (symbol_ref "rtx_equal_p (operands[0], operands[1])")
-			  (const_int 0))
+	(if_then_else (match_test "rtx_equal_p (operands[0], operands[1])")
 	    (const_int 12)
 	    (const_int 16)))])
 
@@ -6816,7 +6813,7 @@  (define_insn "jump"
   [(set_attr "type" "uncond_branch")
    (set_attr "pa_combine_type" "uncond_branch")
    (set (attr "length")
-    (cond [(eq (symbol_ref "jump_in_call_delay (insn)") (const_int 1))
+    (cond [(match_test "jump_in_call_delay (insn)")
 	   (if_then_else (lt (abs (minus (match_dup 0)
 					 (plus (pc) (const_int 8))))
 			     (const_int MAX_12BIT_OFFSET))
@@ -6825,9 +6822,9 @@  (define_insn "jump"
 	   (lt (abs (minus (match_dup 0) (plus (pc) (const_int 8))))
 	       (const_int MAX_17BIT_OFFSET))
 	   (const_int 4)
-	   (ne (symbol_ref "TARGET_PORTABLE_RUNTIME") (const_int 0))
+	   (match_test "TARGET_PORTABLE_RUNTIME")
 	   (const_int 20)
-	   (eq (symbol_ref "flag_pic") (const_int 0))
+	   (not (match_test "flag_pic"))
 	   (const_int 16)]
 	  (const_int 24)))])
 
@@ -7013,7 +7010,7 @@  (define_insn "casesi32p"
 {ldwx|ldw},s %0(%2),%3\;{addl|add,l} %2,%3,%3\;bv,n %%r0(%3)"
   [(set_attr "type" "multi")
    (set (attr "length")
-     (if_then_else (ne (symbol_ref "TARGET_PA_20") (const_int 0))
+     (if_then_else (match_test "TARGET_PA_20")
 	(const_int 20)
 	(const_int 24)))])
 
@@ -8610,9 +8607,9 @@  (define_insn "decrement_and_branch_until
 	   (lt (abs (minus (match_dup 3) (plus (pc) (const_int 8))))
 	       (const_int MAX_17BIT_OFFSET))
 	   (const_int 8)
-	   (ne (symbol_ref "TARGET_PORTABLE_RUNTIME") (const_int 0))
+	   (match_test "TARGET_PORTABLE_RUNTIME")
 	   (const_int 24)
-	   (eq (symbol_ref "flag_pic") (const_int 0))
+	   (not (match_test "flag_pic"))
 	   (const_int 20)]
 	  (const_int 28))
 
@@ -8626,9 +8623,9 @@  (define_insn "decrement_and_branch_until
 		    (lt (abs (minus (match_dup 3) (plus (pc) (const_int 24))))
 		      (const_int MAX_17BIT_OFFSET))
 		    (const_int 28)
-		    (ne (symbol_ref "TARGET_PORTABLE_RUNTIME") (const_int 0))
+		    (match_test "TARGET_PORTABLE_RUNTIME")
 		    (const_int 44)
-		    (eq (symbol_ref "flag_pic") (const_int 0))
+		    (not (match_test "flag_pic"))
 		    (const_int 40)]
 		  (const_int 48))
 	     (cond [(lt (abs (minus (match_dup 3) (plus (pc) (const_int 8))))
@@ -8637,9 +8634,9 @@  (define_insn "decrement_and_branch_until
 		    (lt (abs (minus (match_dup 3) (plus (pc) (const_int 8))))
 		      (const_int MAX_17BIT_OFFSET))
 		    (const_int 28)
-		    (ne (symbol_ref "TARGET_PORTABLE_RUNTIME") (const_int 0))
+		    (match_test "TARGET_PORTABLE_RUNTIME")
 		    (const_int 44)
-		    (eq (symbol_ref "flag_pic") (const_int 0))
+		    (not (match_test "flag_pic"))
 		    (const_int 40)]
 		  (const_int 48)))
 
@@ -8652,9 +8649,9 @@  (define_insn "decrement_and_branch_until
 		    (lt (abs (minus (match_dup 3) (plus (pc) (const_int 12))))
 		      (const_int MAX_17BIT_OFFSET))
 		    (const_int 16)
-		    (ne (symbol_ref "TARGET_PORTABLE_RUNTIME") (const_int 0))
+		    (match_test "TARGET_PORTABLE_RUNTIME")
 		    (const_int 32)
-		    (eq (symbol_ref "flag_pic") (const_int 0))
+		    (not (match_test "flag_pic"))
 		    (const_int 28)]
 		  (const_int 36))
 	     (cond [(lt (abs (minus (match_dup 3) (plus (pc) (const_int 8))))
@@ -8663,9 +8660,9 @@  (define_insn "decrement_and_branch_until
 		    (lt (abs (minus (match_dup 3) (plus (pc) (const_int 8))))
 		      (const_int MAX_17BIT_OFFSET))
 		    (const_int 16)
-		    (ne (symbol_ref "TARGET_PORTABLE_RUNTIME") (const_int 0))
+		    (match_test "TARGET_PORTABLE_RUNTIME")
 		    (const_int 32)
-		    (eq (symbol_ref "flag_pic") (const_int 0))
+		    (not (match_test "flag_pic"))
 		    (const_int 28)]
 		  (const_int 36))))))])
 
@@ -8693,9 +8690,9 @@  (define_insn ""
 	   (lt (abs (minus (match_dup 3) (plus (pc) (const_int 8))))
 	       (const_int MAX_17BIT_OFFSET))
 	   (const_int 8)
-	   (ne (symbol_ref "TARGET_PORTABLE_RUNTIME") (const_int 0))
+	   (match_test "TARGET_PORTABLE_RUNTIME")
 	   (const_int 24)
-	   (eq (symbol_ref "flag_pic") (const_int 0))
+	   (not (match_test "flag_pic"))
 	   (const_int 20)]
 	  (const_int 28))
 
@@ -8709,9 +8706,9 @@  (define_insn ""
 		    (lt (abs (minus (match_dup 3) (plus (pc) (const_int 12))))
 		      (const_int MAX_17BIT_OFFSET))
 		    (const_int 16)
-		    (ne (symbol_ref "TARGET_PORTABLE_RUNTIME") (const_int 0))
+		    (match_test "TARGET_PORTABLE_RUNTIME")
 		    (const_int 32)
-		    (eq (symbol_ref "flag_pic") (const_int 0))
+		    (not (match_test "flag_pic"))
 		    (const_int 28)]
 		  (const_int 36))
 	     (cond [(lt (abs (minus (match_dup 3) (plus (pc) (const_int 8))))
@@ -8720,9 +8717,9 @@  (define_insn ""
 		    (lt (abs (minus (match_dup 3) (plus (pc) (const_int 8))))
 		      (const_int MAX_17BIT_OFFSET))
 		    (const_int 16)
-		    (ne (symbol_ref "TARGET_PORTABLE_RUNTIME") (const_int 0))
+		    (match_test "TARGET_PORTABLE_RUNTIME")
 		    (const_int 32)
-		    (eq (symbol_ref "flag_pic") (const_int 0))
+		    (not (match_test "flag_pic"))
 		    (const_int 28)]
 		  (const_int 36)))
 
@@ -8734,9 +8731,9 @@  (define_insn ""
 		(lt (abs (minus (match_dup 3) (plus (pc) (const_int 8))))
 		  (const_int MAX_17BIT_OFFSET))
 		(const_int 12)
-		(ne (symbol_ref "TARGET_PORTABLE_RUNTIME") (const_int 0))
+		(match_test "TARGET_PORTABLE_RUNTIME")
 		(const_int 28)
-		(eq (symbol_ref "flag_pic") (const_int 0))
+		(not (match_test "flag_pic"))
 		(const_int 24)]
 	      (const_int 32)))))])
 
@@ -8765,9 +8762,9 @@  (define_insn ""
 	   (lt (abs (minus (match_dup 3) (plus (pc) (const_int 8))))
 	       (const_int MAX_17BIT_OFFSET))
 	   (const_int 8)
-	   (ne (symbol_ref "TARGET_PORTABLE_RUNTIME") (const_int 0))
+	   (match_test "TARGET_PORTABLE_RUNTIME")
 	   (const_int 24)
-	   (eq (symbol_ref "flag_pic") (const_int 0))
+	   (not (match_test "flag_pic"))
 	   (const_int 20)]
 	  (const_int 28))
 
@@ -8781,9 +8778,9 @@  (define_insn ""
 		    (lt (abs (minus (match_dup 3) (plus (pc) (const_int 12))))
 		      (const_int MAX_17BIT_OFFSET))
 		    (const_int 16)
-		    (ne (symbol_ref "TARGET_PORTABLE_RUNTIME") (const_int 0))
+		    (match_test "TARGET_PORTABLE_RUNTIME")
 		    (const_int 32)
-		    (eq (symbol_ref "flag_pic") (const_int 0))
+		    (not (match_test "flag_pic"))
 		    (const_int 28)]
 		  (const_int 36))
 	     (cond [(lt (abs (minus (match_dup 3) (plus (pc) (const_int 8))))
@@ -8792,9 +8789,9 @@  (define_insn ""
 		    (lt (abs (minus (match_dup 3) (plus (pc) (const_int 8))))
 		      (const_int MAX_17BIT_OFFSET))
 		    (const_int 16)
-		    (ne (symbol_ref "TARGET_PORTABLE_RUNTIME") (const_int 0))
+		    (match_test "TARGET_PORTABLE_RUNTIME")
 		    (const_int 32)
-		    (eq (symbol_ref "flag_pic") (const_int 0))
+		    (not (match_test "flag_pic"))
 		    (const_int 28)]
 		  (const_int 36)))
 
@@ -8806,9 +8803,9 @@  (define_insn ""
 		(lt (abs (minus (match_dup 3) (plus (pc) (const_int 8))))
 		  (const_int MAX_17BIT_OFFSET))
 		(const_int 12)
-		(ne (symbol_ref "TARGET_PORTABLE_RUNTIME") (const_int 0))
+		(match_test "TARGET_PORTABLE_RUNTIME")
 		(const_int 28)
-		(eq (symbol_ref "flag_pic") (const_int 0))
+		(not (match_test "flag_pic"))
 		(const_int 24)]
 	      (const_int 32)))))])
 
@@ -8830,9 +8827,9 @@  (define_insn ""
 	   (lt (abs (minus (match_dup 3) (plus (pc) (const_int 8))))
 	       (const_int MAX_17BIT_OFFSET))
 	   (const_int 8)
-	   (ne (symbol_ref "TARGET_PORTABLE_RUNTIME") (const_int 0))
+	   (match_test "TARGET_PORTABLE_RUNTIME")
 	   (const_int 24)
-	   (eq (symbol_ref "flag_pic") (const_int 0))
+	   (not (match_test "flag_pic"))
 	   (const_int 20)]
 	  (const_int 28)))])
 
@@ -8853,9 +8850,9 @@  (define_insn ""
 	   (lt (abs (minus (match_dup 2) (plus (pc) (const_int 8))))
 	       (const_int MAX_17BIT_OFFSET))
 	   (const_int 8)
-	   (ne (symbol_ref "TARGET_PORTABLE_RUNTIME") (const_int 0))
+	   (match_test "TARGET_PORTABLE_RUNTIME")
 	   (const_int 24)
-	   (eq (symbol_ref "flag_pic") (const_int 0))
+	   (not (match_test "flag_pic"))
 	   (const_int 20)]
 	  (const_int 28)))])
 
@@ -8876,9 +8873,9 @@  (define_insn ""
 	   (lt (abs (minus (match_dup 2) (plus (pc) (const_int 8))))
 	       (const_int MAX_17BIT_OFFSET))
 	   (const_int 8)
-	   (ne (symbol_ref "TARGET_PORTABLE_RUNTIME") (const_int 0))
+	   (match_test "TARGET_PORTABLE_RUNTIME")
 	   (const_int 24)
-	   (eq (symbol_ref "flag_pic") (const_int 0))
+	   (not (match_test "flag_pic"))
 	   (const_int 20)]
 	  (const_int 28)))])
 
@@ -8899,9 +8896,9 @@  (define_insn ""
 	   (lt (abs (minus (match_dup 2) (plus (pc) (const_int 8))))
 	       (const_int MAX_17BIT_OFFSET))
 	   (const_int 8)
-	   (ne (symbol_ref "TARGET_PORTABLE_RUNTIME") (const_int 0))
+	   (match_test "TARGET_PORTABLE_RUNTIME")
 	   (const_int 24)
-	   (eq (symbol_ref "flag_pic") (const_int 0))
+	   (not (match_test "flag_pic"))
 	   (const_int 20)]
 	  (const_int 28)))])
 
@@ -8922,9 +8919,9 @@  (define_insn ""
 	   (lt (abs (minus (match_dup 2) (plus (pc) (const_int 8))))
 	       (const_int MAX_17BIT_OFFSET))
 	   (const_int 8)
-	   (ne (symbol_ref "TARGET_PORTABLE_RUNTIME") (const_int 0))
+	   (match_test "TARGET_PORTABLE_RUNTIME")
 	   (const_int 24)
-	   (eq (symbol_ref "flag_pic") (const_int 0))
+	   (not (match_test "flag_pic"))
 	   (const_int 20)]
 	  (const_int 28)))])