Skip to content

R
riscv-gcc-1
Commit 7974fe63 by Ulrich Weigand Committed by Ulrich Weigand
Options

s390.c (s390_expand_plus_operand): Do not require double-word scratch register. 

	* config/s390/s390.c (s390_expand_plus_operand): Do not require
	double-word scratch register.
	config/s390/s390.md ("reload_indi", "reload_insi"): Adapt.

	("*tmqi_ext", "*tmdi_mem", "*tmsi_mem", "*tmhi_mem", "*tmqi_mem",
	"*cli"): Replace s_operand by memory_operand.
	("cmpstrdi", "cmpstrsi"): Replace s_operand by general_operand.

From-SVN: r56843
parent b139fcfd
Showing with 51 additions and 69 deletions
gcc/ChangeLog
2002-09-05 Ulrich Weigand <uweigand@de.ibm.com>
* config/s390/s390.c (s390_expand_plus_operand): Do not require
double-word scratch register.
config/s390/s390.md ("reload_indi", "reload_insi"): Adapt.
("*tmqi_ext", "*tmdi_mem", "*tmsi_mem", "*tmhi_mem", "*tmqi_mem",
"*cli"): Replace s_operand by memory_operand.
("cmpstrdi", "cmpstrsi"): Replace s_operand by general_operand.
2002-09-05 Kazu Hirata <kazu@cs.umass.edu>
* config/h8300/h8300.c (asm_file_start): Add a missing
......
gcc/config/s390/s390.c
......@@ -1365,23 +1365,14 @@ s390_plus_operand (op, mode)
SCRATCH may be used as scratch register. */
void
s390_expand_plus_operand (target, src, scratch_in)
s390_expand_plus_operand (target, src, scratch)
register rtx target;
register rtx src;
register rtx scratch_in;
register rtx scratch;
{
rtx sum1, sum2, scratch;
rtx sum1, sum2;
struct s390_address ad;
/* ??? reload apparently does not ensure that the scratch register
and the target do not overlap. We absolutely require this to be
the case, however. Therefore the reload_in[sd]i patterns ask for
a double-sized scratch register, and if one part happens to be
equal to the target, we use the other one. */
scratch = gen_rtx_REG (Pmode, REGNO (scratch_in));
if (rtx_equal_p (scratch, target))
scratch = gen_rtx_REG (Pmode, REGNO (scratch_in) + 1);
/* src must be a PLUS; get its two operands. */
if (GET_CODE (src) != PLUS || GET_MODE (src) != Pmode)
abort ();
......@@ -1391,61 +1382,42 @@ s390_expand_plus_operand (target, src, scratch_in)
float registers occur in an address. */
sum1 = find_replacement (&XEXP (src, 0));
sum2 = find_replacement (&XEXP (src, 1));
/* Accept already strictly valid addresses. */
src = gen_rtx_PLUS (Pmode, sum1, sum2);
if (s390_decompose_address (src, &ad)
&& (!ad.base || REG_OK_FOR_BASE_STRICT_P (ad.base))
&& (!ad.indx || REG_OK_FOR_INDEX_STRICT_P (ad.indx)))
{
src = legitimize_la_operand (src);
emit_insn (gen_rtx_SET (VOIDmode, target, src));
return;
}
/* If one of the two operands is equal to the target,
make it the first one. If one is a constant, make
it the second one. */
if (rtx_equal_p (target, sum2)
|| GET_CODE (sum1) == CONST_INT)
/* If the address is already strictly valid, there's nothing to do. */
if (!s390_decompose_address (src, &ad)
|| (ad.base && !REG_OK_FOR_BASE_STRICT_P (ad.base))
|| (ad.indx && !REG_OK_FOR_INDEX_STRICT_P (ad.indx)))
{
rtx tem = sum2;
sum2 = sum1;
sum1 = tem;
}
/* Otherwise, one of the operands cannot be an address register;
we reload its value into the scratch register. */
if (true_regnum (sum1) < 1 || true_regnum (sum1) > 15)
{
emit_move_insn (scratch, sum1);
sum1 = scratch;
}
if (true_regnum (sum2) < 1 || true_regnum (sum2) > 15)
{
emit_move_insn (scratch, sum2);
sum2 = scratch;
}
/* If the first operand is not an address register,
we reload it into the target. */
if (true_regnum (sum1) < 1 || true_regnum (sum1) > 15)
{
emit_move_insn (target, sum1);
sum1 = target;
}
/* According to the way these invalid addresses are generated
in reload.c, it should never happen (at least on s390) that
*neither* of the PLUS components, after find_replacements
was applied, is an address register. */
if (sum1 == scratch && sum2 == scratch)
{
debug_rtx (src);
abort ();
}
/* Likewise for the second operand. However, take
care not to clobber the target if we already used
it for the first operand. Use the scratch instead.
Also, allow an immediate offset if it is in range. */
if ((true_regnum (sum2) < 1 || true_regnum (sum2) > 15)
&& !(GET_CODE (sum2) == CONST_INT
&& INTVAL (sum2) >= 0 && INTVAL (sum2) < 4096))
{
if (!rtx_equal_p (target, sum1))
{
emit_move_insn (target, sum2);
sum2 = target;
}
else
{
emit_move_insn (scratch, sum2);
sum2 = scratch;
}
src = gen_rtx_PLUS (Pmode, sum1, sum2);
}
/* Emit the LOAD ADDRESS pattern. Note that reload of PLUS
is only ever performed on addresses, so we can mark the
sum as legitimate for LA in any case. */
src = gen_rtx_PLUS (Pmode, sum1, sum2);
src = legitimize_la_operand (src);
emit_insn (gen_rtx_SET (VOIDmode, target, src));
}
......
gcc/config/s390/s390.md
......@@ -278,7 +278,7 @@
(define_insn "*tmqi_ext"
[(set (reg 33)
(compare (zero_extract:SI (match_operand:QI 0 "s_operand" "Q")
(compare (zero_extract:SI (match_operand:QI 0 "memory_operand" "Q")
(match_operand:SI 1 "const_int_operand" "n")
(match_operand:SI 2 "const_int_operand" "n"))
(const_int 0)))]
......@@ -345,7 +345,7 @@
(define_insn "*tmdi_mem"
[(set (reg 33)
(compare (and:DI (match_operand:DI 0 "s_operand" "%Q")
(compare (and:DI (match_operand:DI 0 "memory_operand" "%Q")
(match_operand:DI 1 "immediate_operand" "n"))
(match_operand:DI 2 "immediate_operand" "n")))]
"TARGET_64BIT
......@@ -365,7 +365,7 @@
(define_insn "*tmsi_mem"
[(set (reg 33)
(compare (and:SI (match_operand:SI 0 "s_operand" "%Q")
(compare (and:SI (match_operand:SI 0 "memory_operand" "%Q")
(match_operand:SI 1 "immediate_operand" "n"))
(match_operand:SI 2 "immediate_operand" "n")))]
"s390_match_ccmode (insn, s390_tm_ccmode (operands[1], operands[2], 0))
......@@ -384,7 +384,7 @@
(define_insn "*tmhi_mem"
[(set (reg 33)
(compare (and:SI (subreg:SI (match_operand:HI 0 "s_operand" "%Q") 0)
(compare (and:SI (subreg:SI (match_operand:HI 0 "memory_operand" "%Q") 0)
(match_operand:SI 1 "immediate_operand" "n"))
(match_operand:SI 2 "immediate_operand" "n")))]
"s390_match_ccmode (insn, s390_tm_ccmode (operands[1], operands[2], 0))
......@@ -403,7 +403,7 @@
(define_insn "*tmqi_mem"
[(set (reg 33)
(compare (and:SI (subreg:SI (match_operand:QI 0 "s_operand" "%Q") 0)
(compare (and:SI (subreg:SI (match_operand:QI 0 "memory_operand" "%Q") 0)
(match_operand:SI 1 "immediate_operand" "n"))
(match_operand:SI 2 "immediate_operand" "n")))]
"s390_match_ccmode (insn, s390_tm_ccmode (operands[1], operands[2], 0))"
......@@ -645,7 +645,7 @@
(define_insn "*cli"
[(set (reg 33)
(compare (match_operand:QI 0 "s_operand" "Q")
(compare (match_operand:QI 0 "memory_operand" "Q")
(match_operand:QI 1 "immediate_operand" "n")))]
"s390_match_ccmode (insn, CCUmode)"
"cli\\t%0,%b1"
......@@ -1947,8 +1947,8 @@
(define_expand "cmpstrdi"
[(set (match_operand:DI 0 "register_operand" "")
(compare:DI (match_operand:BLK 1 "s_operand" "")
(match_operand:BLK 2 "s_operand" "") ) )
(compare:DI (match_operand:BLK 1 "general_operand" "")
(match_operand:BLK 2 "general_operand" "") ) )
(use (match_operand:DI 3 "general_operand" ""))
(use (match_operand:DI 4 "" ""))]
"TARGET_64BIT"
......@@ -2008,8 +2008,8 @@
(define_expand "cmpstrsi"
[(set (match_operand:SI 0 "register_operand" "")
(compare:SI (match_operand:BLK 1 "s_operand" "")
(match_operand:BLK 2 "s_operand" "") ) )
(compare:SI (match_operand:BLK 1 "general_operand" "")
(match_operand:BLK 2 "general_operand" "") ) )
(use (match_operand:SI 3 "general_operand" ""))
(use (match_operand:SI 4 "" ""))]
""
......@@ -3187,7 +3187,7 @@
(define_expand "reload_indi"
[(parallel [(match_operand:DI 0 "register_operand" "=a")
(match_operand:DI 1 "s390_plus_operand" "")
(match_operand:TI 2 "register_operand" "=&a")])]
(match_operand:DI 2 "register_operand" "=&a")])]
"TARGET_64BIT"
"
{
......@@ -3348,7 +3348,7 @@
(define_expand "reload_insi"
[(parallel [(match_operand:SI 0 "register_operand" "=a")
(match_operand:SI 1 "s390_plus_operand" "")
(match_operand:DI 2 "register_operand" "=&a")])]
(match_operand:SI 2 "register_operand" "=&a")])]
"!TARGET_64BIT"
"
{
......
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