Commit 638e8b1f by David S. Miller Committed by David S. Miller

rtl.def (CONSTANT_P_RTX): Fix typo in string name.

	* rtl.def (CONSTANT_P_RTX): Fix typo in string name.
	* config/sparc/sparc.md (seqdi_special_trunc, snedi_special_trunc,
	seqsi_special_extend, snesi_special_extend, snesi_zero_extend and
	split, snedi_zero_trunc and split, seqsi_zero_extend and split,
	seqdi_zero_trunc and split, pic_lo_sum_di, pic_sethi_di,
	movdi_cc_sp64_trunc, movdi_cc_reg_sp64_trunc, addx_extend_sp32 and
	split, addx_extend_sp64, subx_extend_sp64, subx_extend and split):
	Fix mismatching modes in SET operands.
	(conditional move patterns): Fix formatting.
	(unnamed subx arch64 pattern): Remove duplicate insn.

From-SVN: r21725
parent 9208e4b2
Fri Aug 14 01:22:31 1998 David S. Miller <davem@pierdol.cobaltmicro.com>
* rtl.def (CONSTANT_P_RTX): Fix typo in string name.
* config/sparc/sparc.md (seqdi_special_trunc, snedi_special_trunc,
seqsi_special_extend, snesi_special_extend, snesi_zero_extend and
split, snedi_zero_trunc and split, seqsi_zero_extend and split,
seqdi_zero_trunc and split, pic_lo_sum_di, pic_sethi_di,
movdi_cc_sp64_trunc, movdi_cc_reg_sp64_trunc, addx_extend_sp32 and
split, addx_extend_sp64, subx_extend_sp64, subx_extend and split):
Fix mismatching modes in SET operands.
(conditional move patterns): Fix formatting.
(unnamed subx arch64 pattern): Remove duplicate insn.
Fri Aug 14 00:34:34 1998 David S. Miller <davem@pierdol.cobaltmicro.com> Fri Aug 14 00:34:34 1998 David S. Miller <davem@pierdol.cobaltmicro.com>
* config/sparc/sparc.c (const64_operand, const64_high_operand): * config/sparc/sparc.c (const64_operand, const64_high_operand):
......
...@@ -709,7 +709,7 @@ ...@@ -709,7 +709,7 @@
(xor:DI (match_operand:DI 1 "register_operand" "") (xor:DI (match_operand:DI 1 "register_operand" "")
(match_operand:DI 2 "register_operand" ""))) (match_operand:DI 2 "register_operand" "")))
(set (match_operand:SI 0 "register_operand" "") (set (match_operand:SI 0 "register_operand" "")
(eq:DI (match_dup 3) (const_int 0)))] (eq:SI (match_dup 3) (const_int 0)))]
"TARGET_ARCH64" "TARGET_ARCH64"
"{ operands[3] = gen_reg_rtx (DImode); }") "{ operands[3] = gen_reg_rtx (DImode); }")
...@@ -718,7 +718,7 @@ ...@@ -718,7 +718,7 @@
(xor:DI (match_operand:DI 1 "register_operand" "") (xor:DI (match_operand:DI 1 "register_operand" "")
(match_operand:DI 2 "register_operand" ""))) (match_operand:DI 2 "register_operand" "")))
(set (match_operand:SI 0 "register_operand" "") (set (match_operand:SI 0 "register_operand" "")
(ne:DI (match_dup 3) (const_int 0)))] (ne:SI (match_dup 3) (const_int 0)))]
"TARGET_ARCH64" "TARGET_ARCH64"
"{ operands[3] = gen_reg_rtx (DImode); }") "{ operands[3] = gen_reg_rtx (DImode); }")
...@@ -727,7 +727,7 @@ ...@@ -727,7 +727,7 @@
(xor:SI (match_operand:SI 1 "register_operand" "") (xor:SI (match_operand:SI 1 "register_operand" "")
(match_operand:SI 2 "register_operand" ""))) (match_operand:SI 2 "register_operand" "")))
(parallel [(set (match_operand:DI 0 "register_operand" "") (parallel [(set (match_operand:DI 0 "register_operand" "")
(eq:SI (match_dup 3) (const_int 0))) (eq:DI (match_dup 3) (const_int 0)))
(clobber (reg:CC 100))])] (clobber (reg:CC 100))])]
"TARGET_ARCH64" "TARGET_ARCH64"
"{ operands[3] = gen_reg_rtx (SImode); }") "{ operands[3] = gen_reg_rtx (SImode); }")
...@@ -737,7 +737,7 @@ ...@@ -737,7 +737,7 @@
(xor:SI (match_operand:SI 1 "register_operand" "") (xor:SI (match_operand:SI 1 "register_operand" "")
(match_operand:SI 2 "register_operand" ""))) (match_operand:SI 2 "register_operand" "")))
(parallel [(set (match_operand:DI 0 "register_operand" "") (parallel [(set (match_operand:DI 0 "register_operand" "")
(ne:SI (match_dup 3) (const_int 0))) (ne:DI (match_dup 3) (const_int 0)))
(clobber (reg:CC 100))])] (clobber (reg:CC 100))])]
"TARGET_ARCH64" "TARGET_ARCH64"
"{ operands[3] = gen_reg_rtx (SImode); }") "{ operands[3] = gen_reg_rtx (SImode); }")
...@@ -1080,7 +1080,7 @@ ...@@ -1080,7 +1080,7 @@
(define_insn "*snesi_zero_extend" (define_insn "*snesi_zero_extend"
[(set (match_operand:DI 0 "register_operand" "=r") [(set (match_operand:DI 0 "register_operand" "=r")
(ne:SI (match_operand:SI 1 "register_operand" "r") (ne:DI (match_operand:SI 1 "register_operand" "r")
(const_int 0))) (const_int 0)))
(clobber (reg:CC 100))] (clobber (reg:CC 100))]
"TARGET_ARCH64" "TARGET_ARCH64"
...@@ -1090,15 +1090,17 @@ ...@@ -1090,15 +1090,17 @@
(define_split (define_split
[(set (match_operand:DI 0 "register_operand" "") [(set (match_operand:DI 0 "register_operand" "")
(ne:SI (match_operand:SI 1 "register_operand" "") (ne:DI (match_operand:SI 1 "register_operand" "")
(const_int 0))) (const_int 0)))
(clobber (reg:CC 100))] (clobber (reg:CC 100))]
"TARGET_ARCH64 "TARGET_ARCH64
&& reload_completed" && reload_completed"
[(set (reg:CC_NOOV 100) (compare:CC_NOOV (minus (const_int 0) (match_dup 1)) [(set (reg:CC_NOOV 100) (compare:CC_NOOV (minus:SI (const_int 0) (match_dup 1))
(const_int 0))) (const_int 0)))
(set (match_dup 0) (minus:SI (minus:SI (const_int 0) (const_int 0)) (set (match_dup 0) (zero_extend:DI (minus:SI (minus:SI (const_int 0)
(ltu:SI (reg:CC_NOOV 100) (const_int 0))))] (const_int 0))
(ltu:SI (reg:CC_NOOV 100)
(const_int 0)))))]
"") "")
(define_insn "*snedi_zero" (define_insn "*snedi_zero"
...@@ -1145,7 +1147,7 @@ ...@@ -1145,7 +1147,7 @@
(define_insn "*snedi_zero_trunc" (define_insn "*snedi_zero_trunc"
[(set (match_operand:SI 0 "register_operand" "=&r") [(set (match_operand:SI 0 "register_operand" "=&r")
(ne:DI (match_operand:DI 1 "register_operand" "r") (ne:SI (match_operand:DI 1 "register_operand" "r")
(const_int 0)))] (const_int 0)))]
"TARGET_ARCH64" "TARGET_ARCH64"
"#" "#"
...@@ -1154,11 +1156,11 @@ ...@@ -1154,11 +1156,11 @@
(define_split (define_split
[(set (match_operand:SI 0 "register_operand" "") [(set (match_operand:SI 0 "register_operand" "")
(ne:DI (match_operand:DI 1 "register_operand" "") (ne:SI (match_operand:DI 1 "register_operand" "")
(const_int 0)))] (const_int 0)))]
"TARGET_ARCH64" "TARGET_ARCH64"
[(set (match_dup 0) (const_int 0)) [(set (match_dup 0) (const_int 0))
(set (match_dup 0) (if_then_else:DI (ne:DI (match_dup 1) (set (match_dup 0) (if_then_else:SI (ne:DI (match_dup 1)
(const_int 0)) (const_int 0))
(const_int 1) (const_int 1)
(match_dup 0)))] (match_dup 0)))]
...@@ -1206,7 +1208,7 @@ ...@@ -1206,7 +1208,7 @@
(define_insn "*seqsi_zero_extend" (define_insn "*seqsi_zero_extend"
[(set (match_operand:DI 0 "register_operand" "=r") [(set (match_operand:DI 0 "register_operand" "=r")
(eq:SI (match_operand:SI 1 "register_operand" "r") (eq:DI (match_operand:SI 1 "register_operand" "r")
(const_int 0))) (const_int 0)))
(clobber (reg:CC 100))] (clobber (reg:CC 100))]
"TARGET_ARCH64" "TARGET_ARCH64"
...@@ -1216,14 +1218,16 @@ ...@@ -1216,14 +1218,16 @@
(define_split (define_split
[(set (match_operand:DI 0 "register_operand" "") [(set (match_operand:DI 0 "register_operand" "")
(eq:SI (match_operand:SI 1 "register_operand" "") (eq:DI (match_operand:SI 1 "register_operand" "")
(const_int 0))) (const_int 0)))
(clobber (reg:CC 100))] (clobber (reg:CC 100))]
"TARGET_ARCH64" "TARGET_ARCH64"
[(set (reg:CC_NOOV 100) (compare:CC_NOOV (minus:SI (const_int 0) (match_dup 1)) [(set (reg:CC_NOOV 100) (compare:CC_NOOV (minus:SI (const_int 0) (match_dup 1))
(const_int 0))) (const_int 0)))
(set (match_dup 0) (minus:SI (minus:SI (const_int 0) (const_int -1)) (set (match_dup 0) (zero_extend:DI (minus:SI (minus:SI (const_int 0)
(ltu:SI (reg:CC_NOOV 100) (const_int 0))))] (const_int -1))
(ltu:SI (reg:CC_NOOV 100)
(const_int 0)))))]
"") "")
(define_insn "*seqdi_zero" (define_insn "*seqdi_zero"
...@@ -1270,7 +1274,7 @@ ...@@ -1270,7 +1274,7 @@
(define_insn "*seqdi_zero_trunc" (define_insn "*seqdi_zero_trunc"
[(set (match_operand:SI 0 "register_operand" "=&r") [(set (match_operand:SI 0 "register_operand" "=&r")
(eq:DI (match_operand:DI 1 "register_operand" "r") (eq:SI (match_operand:DI 1 "register_operand" "r")
(const_int 0)))] (const_int 0)))]
"TARGET_ARCH64" "TARGET_ARCH64"
"#" "#"
...@@ -1279,11 +1283,11 @@ ...@@ -1279,11 +1283,11 @@
(define_split (define_split
[(set (match_operand:SI 0 "register_operand" "") [(set (match_operand:SI 0 "register_operand" "")
(eq:DI (match_operand:DI 1 "register_operand" "") (eq:SI (match_operand:DI 1 "register_operand" "")
(const_int 0)))] (const_int 0)))]
"TARGET_ARCH64" "TARGET_ARCH64"
[(set (match_dup 0) (const_int 0)) [(set (match_dup 0) (const_int 0))
(set (match_dup 0) (if_then_else:DI (eq:DI (match_dup 1) (set (match_dup 0) (if_then_else:SI (eq:DI (match_dup 1)
(const_int 0)) (const_int 0))
(const_int 1) (const_int 1)
(match_dup 0)))] (match_dup 0)))]
...@@ -2402,15 +2406,15 @@ ...@@ -2402,15 +2406,15 @@
(define_insn "*pic_lo_sum_di" (define_insn "*pic_lo_sum_di"
[(set (match_operand:DI 0 "register_operand" "=r") [(set (match_operand:DI 0 "register_operand" "=r")
(lo_sum:SI (match_operand:DI 1 "register_operand" "r") (lo_sum:DI (match_operand:DI 1 "register_operand" "r")
(unspec:SI [(match_operand:DI 2 "immediate_operand" "in")] 0)))] (unspec:DI [(match_operand:DI 2 "immediate_operand" "in")] 0)))]
"TARGET_ARCH64 && flag_pic" "TARGET_ARCH64 && flag_pic"
"or\\t%1, %%lo(%a2), %0" "or\\t%1, %%lo(%a2), %0"
[(set_attr "length" "1")]) [(set_attr "length" "1")])
(define_insn "*pic_sethi_di" (define_insn "*pic_sethi_di"
[(set (match_operand:DI 0 "register_operand" "=r") [(set (match_operand:DI 0 "register_operand" "=r")
(high:SI (unspec:SI [(match_operand 1 "" "")] 0)))] (high:DI (unspec:DI [(match_operand 1 "" "")] 0)))]
"TARGET_ARCH64 && flag_pic && check_pic (1)" "TARGET_ARCH64 && flag_pic && check_pic (1)"
"sethi\\t%%hi(%a1), %0" "sethi\\t%%hi(%a1), %0"
[(set_attr "type" "move") [(set_attr "type" "move")
...@@ -3510,7 +3514,7 @@ ...@@ -3510,7 +3514,7 @@
(define_insn "*movdi_cc_sp64_trunc" (define_insn "*movdi_cc_sp64_trunc"
[(set (match_operand:SI 0 "register_operand" "=r,r") [(set (match_operand:SI 0 "register_operand" "=r,r")
(if_then_else:DI (match_operator 1 "comparison_operator" (if_then_else:SI (match_operator 1 "comparison_operator"
[(match_operand 2 "icc_or_fcc_reg_operand" "X,X") [(match_operand 2 "icc_or_fcc_reg_operand" "X,X")
(const_int 0)]) (const_int 0)])
(match_operand:SI 3 "arith11_double_operand" "rLH,0") (match_operand:SI 3 "arith11_double_operand" "rLH,0")
...@@ -3623,7 +3627,7 @@ ...@@ -3623,7 +3627,7 @@
(define_insn "*movdi_cc_reg_sp64_trunc" (define_insn "*movdi_cc_reg_sp64_trunc"
[(set (match_operand:SI 0 "register_operand" "=r,r") [(set (match_operand:SI 0 "register_operand" "=r,r")
(if_then_else:DI (match_operator 1 "v9_regcmp_op" (if_then_else:SI (match_operator 1 "v9_regcmp_op"
[(match_operand:DI 2 "register_operand" "r,r") [(match_operand:DI 2 "register_operand" "r,r")
(const_int 0)]) (const_int 0)])
(match_operand:SI 3 "arith10_double_operand" "rMH,0") (match_operand:SI 3 "arith10_double_operand" "rMH,0")
...@@ -4454,9 +4458,9 @@ ...@@ -4454,9 +4458,9 @@
(define_insn "*addx_extend_sp32" (define_insn "*addx_extend_sp32"
[(set (match_operand:DI 0 "register_operand" "=r") [(set (match_operand:DI 0 "register_operand" "=r")
(plus:SI (plus:SI (match_operand:SI 1 "reg_or_0_operand" "%rJ") (zero_extend:DI (plus:SI (plus:SI (match_operand:SI 1 "reg_or_0_operand" "%rJ")
(match_operand:SI 2 "arith_operand" "rI")) (match_operand:SI 2 "arith_operand" "rI"))
(ltu:SI (reg:CC_NOOV 100) (const_int 0))))] (ltu:SI (reg:CC_NOOV 100) (const_int 0)))))]
"! TARGET_ARCH64" "! TARGET_ARCH64"
"#" "#"
[(set_attr "type" "unary") [(set_attr "type" "unary")
...@@ -4464,9 +4468,9 @@ ...@@ -4464,9 +4468,9 @@
(define_split (define_split
[(set (match_operand:DI 0 "register_operand" "") [(set (match_operand:DI 0 "register_operand" "")
(plus:SI (plus:SI (match_operand:SI 1 "reg_or_0_operand" "") (zero_extend:DI (plus:SI (plus:SI (match_operand:SI 1 "reg_or_0_operand" "")
(match_operand:SI 2 "arith_operand" "")) (match_operand:SI 2 "arith_operand" ""))
(ltu:SI (reg:CC_NOOV 100) (const_int 0))))] (ltu:SI (reg:CC_NOOV 100) (const_int 0)))))]
"! TARGET_ARCH64 && reload_completed" "! TARGET_ARCH64 && reload_completed"
[(set (match_dup 3) (plus:SI (plus:SI (match_dup 1) (match_dup 2)) [(set (match_dup 3) (plus:SI (plus:SI (match_dup 1) (match_dup 2))
(ltu:SI (reg:CC_NOOV 100) (const_int 0)))) (ltu:SI (reg:CC_NOOV 100) (const_int 0))))
...@@ -4476,9 +4480,9 @@ ...@@ -4476,9 +4480,9 @@
(define_insn "*addx_extend_sp64" (define_insn "*addx_extend_sp64"
[(set (match_operand:DI 0 "register_operand" "=r") [(set (match_operand:DI 0 "register_operand" "=r")
(plus:SI (plus:SI (match_operand:SI 1 "reg_or_0_operand" "%rJ") (zero_extend:DI (plus:SI (plus:SI (match_operand:SI 1 "reg_or_0_operand" "%rJ")
(match_operand:SI 2 "arith_operand" "rI")) (match_operand:SI 2 "arith_operand" "rI"))
(ltu:SI (reg:CC_NOOV 100) (const_int 0))))] (ltu:SI (reg:CC_NOOV 100) (const_int 0)))))]
"TARGET_ARCH64" "TARGET_ARCH64"
"addx\\t%r1, %2, %0" "addx\\t%r1, %2, %0"
[(set_attr "type" "unary") [(set_attr "type" "unary")
...@@ -4496,9 +4500,9 @@ ...@@ -4496,9 +4500,9 @@
(define_insn "*subx_extend_sp64" (define_insn "*subx_extend_sp64"
[(set (match_operand:DI 0 "register_operand" "=r") [(set (match_operand:DI 0 "register_operand" "=r")
(minus:SI (minus:SI (match_operand:SI 1 "reg_or_0_operand" "rJ") (zero_extend:DI (minus:SI (minus:SI (match_operand:SI 1 "reg_or_0_operand" "rJ")
(match_operand:SI 2 "arith_operand" "rI")) (match_operand:SI 2 "arith_operand" "rI"))
(ltu:SI (reg:CC_NOOV 100) (const_int 0))))] (ltu:SI (reg:CC_NOOV 100) (const_int 0)))))]
"TARGET_ARCH64" "TARGET_ARCH64"
"subx\\t%r1, %2, %0" "subx\\t%r1, %2, %0"
[(set_attr "type" "unary") [(set_attr "type" "unary")
...@@ -4506,9 +4510,9 @@ ...@@ -4506,9 +4510,9 @@
(define_insn "*subx_extend" (define_insn "*subx_extend"
[(set (match_operand:DI 0 "register_operand" "=r") [(set (match_operand:DI 0 "register_operand" "=r")
(minus:SI (minus:SI (match_operand:SI 1 "reg_or_0_operand" "rJ") (zero_extend:DI (minus:SI (minus:SI (match_operand:SI 1 "reg_or_0_operand" "rJ")
(match_operand:SI 2 "arith_operand" "rI")) (match_operand:SI 2 "arith_operand" "rI"))
(ltu:SI (reg:CC_NOOV 100) (const_int 0))))] (ltu:SI (reg:CC_NOOV 100) (const_int 0)))))]
"! TARGET_ARCH64" "! TARGET_ARCH64"
"#" "#"
[(set_attr "type" "unary") [(set_attr "type" "unary")
...@@ -4516,9 +4520,9 @@ ...@@ -4516,9 +4520,9 @@
(define_split (define_split
[(set (match_operand:DI 0 "register_operand" "=r") [(set (match_operand:DI 0 "register_operand" "=r")
(minus:SI (minus:SI (match_operand:SI 1 "reg_or_0_operand" "rJ") (zero_extend:DI (minus:SI (minus:SI (match_operand:SI 1 "reg_or_0_operand" "rJ")
(match_operand:SI 2 "arith_operand" "rI")) (match_operand:SI 2 "arith_operand" "rI"))
(ltu:SI (reg:CC_NOOV 100) (const_int 0))))] (ltu:SI (reg:CC_NOOV 100) (const_int 0)))))]
"! TARGET_ARCH64 && reload_completed" "! TARGET_ARCH64 && reload_completed"
[(set (match_dup 3) (minus:SI (minus:SI (match_dup 1) (match_dup 2)) [(set (match_dup 3) (minus:SI (minus:SI (match_dup 1) (match_dup 2))
(ltu:SI (reg:CC_NOOV 100) (const_int 0)))) (ltu:SI (reg:CC_NOOV 100) (const_int 0))))
...@@ -4526,17 +4530,6 @@ ...@@ -4526,17 +4530,6 @@
"operands[3] = gen_lowpart (SImode, operands[0]); "operands[3] = gen_lowpart (SImode, operands[0]);
operands[4] = gen_highpart (SImode, operands[0]);") operands[4] = gen_highpart (SImode, operands[0]);")
;; This is only for splits at the moment.
(define_insn ""
[(set (match_operand:DI 0 "register_operand" "=r")
(minus:SI (minus:SI (match_operand:SI 1 "reg_or_0_operand" "rJ")
(match_operand:SI 2 "arith_operand" "rI"))
(ltu:SI (reg:CC_NOOV 100) (const_int 0))))]
"TARGET_ARCH64"
"subx\\t%r1, %2, %0"
[(set_attr "type" "unary")
(set_attr "length" "1")])
(define_insn "" (define_insn ""
[(set (match_operand:DI 0 "register_operand" "=r") [(set (match_operand:DI 0 "register_operand" "=r")
(plus:DI (zero_extend:DI (match_operand:SI 1 "register_operand" "r")) (plus:DI (zero_extend:DI (match_operand:SI 1 "register_operand" "r"))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment