Skip to content

R
riscv-gcc-1
Commit 11301057 by Richard Henderson Committed by Richard Henderson
Options

sparc.c (input_operand): Recognize (const (constant_p_rtx)). 

        * sparc.c (input_operand): Recognize (const (constant_p_rtx)).
        (arith_operand): Remove constant_p_rtx handling.
        (const64_operand, const64_high_operand): Likewise.
        (arith11_operand, arith10_operand, arith_double_operand): Likewise.
        (arith11_double_operand, arith10_double_operand, small_int): Likewise.
        (small_int_or_double, uns_small_int, zero_operand): Likewise.
        * sparc.h (PREDICATE_CODES): Likewise.

From-SVN: r24440
parent 185ebd6c
Showing with 42 additions and 44 deletions
gcc/ChangeLog
Tue Dec 29 11:58:53 1998 Richard Henderson <rth@cygnus.com>
* sparc.c (input_operand): Recognize (const (constant_p_rtx)).
(arith_operand): Remove constant_p_rtx handling.
(const64_operand, const64_high_operand): Likewise.
(arith11_operand, arith10_operand, arith_double_operand): Likewise.
(arith11_double_operand, arith10_double_operand, small_int): Likewise.
(small_int_or_double, uns_small_int, zero_operand): Likewise.
* sparc.h (PREDICATE_CODES): Likewise.
Tue Dec 29 11:32:54 1998 Richard Kenner <kenner@vlsi1.ultra.nyu.edu>: Tue Dec 29 11:32:54 1998 Richard Kenner <kenner@vlsi1.ultra.nyu.edu>:
* rtl.def (CONSTANT_P_RTX): Clarify commentary. * rtl.def (CONSTANT_P_RTX): Clarify commentary.
......
gcc/config/sparc/sparc.c
...@@ -792,8 +792,7 @@ arith_operand (op, mode) ...@@ -792,8 +792,7 @@ arith_operand (op, mode)
enum machine_mode mode; enum machine_mode mode;
{ {
int val; int val;
if (register_operand (op, mode) if (register_operand (op, mode))
|| GET_CODE (op) == CONSTANT_P_RTX)
return 1; return 1;
if (GET_CODE (op) != CONST_INT) if (GET_CODE (op) != CONST_INT)
return 0; return 0;
...@@ -842,7 +841,7 @@ const64_operand (op, mode) ...@@ -842,7 +841,7 @@ const64_operand (op, mode)
((CONST_DOUBLE_LOW (op) & 0x80000000) != 0 ? ((CONST_DOUBLE_LOW (op) & 0x80000000) != 0 ?
(HOST_WIDE_INT)0xffffffff : 0))) (HOST_WIDE_INT)0xffffffff : 0)))
#endif #endif
|| GET_CODE (op) == CONSTANT_P_RTX); );
} }
/* The same, but only for sethi instructions. */ /* The same, but only for sethi instructions. */
...@@ -864,8 +863,7 @@ const64_high_operand (op, mode) ...@@ -864,8 +863,7 @@ const64_high_operand (op, mode)
|| (GET_CODE (op) == CONST_DOUBLE || (GET_CODE (op) == CONST_DOUBLE
&& CONST_DOUBLE_HIGH (op) == 0 && CONST_DOUBLE_HIGH (op) == 0
&& (CONST_DOUBLE_LOW (op) & 0xfffffc00) != 0 && (CONST_DOUBLE_LOW (op) & 0xfffffc00) != 0
&& SPARC_SETHI_P (CONST_DOUBLE_LOW (op))) && SPARC_SETHI_P (CONST_DOUBLE_LOW (op))));
|| GET_CODE (op) == CONSTANT_P_RTX);
} }
/* Return true if OP is a register, or is a CONST_INT that can fit in a /* Return true if OP is a register, or is a CONST_INT that can fit in a
...@@ -878,7 +876,6 @@ arith11_operand (op, mode) ...@@ -878,7 +876,6 @@ arith11_operand (op, mode)
enum machine_mode mode; enum machine_mode mode;
{ {
return (register_operand (op, mode) return (register_operand (op, mode)
|| GET_CODE (op) == CONSTANT_P_RTX
|| (GET_CODE (op) == CONST_INT && SPARC_SIMM11_P (INTVAL (op)))); || (GET_CODE (op) == CONST_INT && SPARC_SIMM11_P (INTVAL (op))));
} }
...@@ -892,7 +889,6 @@ arith10_operand (op, mode) ...@@ -892,7 +889,6 @@ arith10_operand (op, mode)
enum machine_mode mode; enum machine_mode mode;
{ {
return (register_operand (op, mode) return (register_operand (op, mode)
|| GET_CODE (op) == CONSTANT_P_RTX
|| (GET_CODE (op) == CONST_INT && SPARC_SIMM10_P (INTVAL (op)))); || (GET_CODE (op) == CONST_INT && SPARC_SIMM10_P (INTVAL (op))));
} }
...@@ -909,7 +905,6 @@ arith_double_operand (op, mode) ...@@ -909,7 +905,6 @@ arith_double_operand (op, mode)
enum machine_mode mode; enum machine_mode mode;
{ {
return (register_operand (op, mode) return (register_operand (op, mode)
|| GET_CODE (op) == CONSTANT_P_RTX
|| (GET_CODE (op) == CONST_INT && SMALL_INT (op)) || (GET_CODE (op) == CONST_INT && SMALL_INT (op))
|| (! TARGET_ARCH64 || (! TARGET_ARCH64
&& GET_CODE (op) == CONST_DOUBLE && GET_CODE (op) == CONST_DOUBLE
...@@ -959,7 +954,6 @@ arith11_double_operand (op, mode) ...@@ -959,7 +954,6 @@ arith11_double_operand (op, mode)
enum machine_mode mode; enum machine_mode mode;
{ {
return (register_operand (op, mode) return (register_operand (op, mode)
|| GET_CODE (op) == CONSTANT_P_RTX
|| (GET_CODE (op) == CONST_DOUBLE || (GET_CODE (op) == CONST_DOUBLE
&& (GET_MODE (op) == mode || GET_MODE (op) == VOIDmode) && (GET_MODE (op) == mode || GET_MODE (op) == VOIDmode)
&& (unsigned HOST_WIDE_INT) (CONST_DOUBLE_LOW (op) + 0x400) < 0x800 && (unsigned HOST_WIDE_INT) (CONST_DOUBLE_LOW (op) + 0x400) < 0x800
...@@ -983,7 +977,6 @@ arith10_double_operand (op, mode) ...@@ -983,7 +977,6 @@ arith10_double_operand (op, mode)
enum machine_mode mode; enum machine_mode mode;
{ {
return (register_operand (op, mode) return (register_operand (op, mode)
|| GET_CODE (op) == CONSTANT_P_RTX
|| (GET_CODE (op) == CONST_DOUBLE || (GET_CODE (op) == CONST_DOUBLE
&& (GET_MODE (op) == mode || GET_MODE (op) == VOIDmode) && (GET_MODE (op) == mode || GET_MODE (op) == VOIDmode)
&& (unsigned) (CONST_DOUBLE_LOW (op) + 0x200) < 0x400 && (unsigned) (CONST_DOUBLE_LOW (op) + 0x200) < 0x400
...@@ -1005,8 +998,7 @@ small_int (op, mode) ...@@ -1005,8 +998,7 @@ small_int (op, mode)
rtx op; rtx op;
enum machine_mode mode ATTRIBUTE_UNUSED; enum machine_mode mode ATTRIBUTE_UNUSED;
{ {
return ((GET_CODE (op) == CONST_INT && SMALL_INT (op)) return (GET_CODE (op) == CONST_INT && SMALL_INT (op));
|| GET_CODE (op) == CONSTANT_P_RTX);
} }
int int
...@@ -1017,8 +1009,7 @@ small_int_or_double (op, mode) ...@@ -1017,8 +1009,7 @@ small_int_or_double (op, mode)
return ((GET_CODE (op) == CONST_INT && SMALL_INT (op)) return ((GET_CODE (op) == CONST_INT && SMALL_INT (op))
|| (GET_CODE (op) == CONST_DOUBLE || (GET_CODE (op) == CONST_DOUBLE
&& CONST_DOUBLE_HIGH (op) == 0 && CONST_DOUBLE_HIGH (op) == 0
&& SPARC_SIMM13_P (CONST_DOUBLE_LOW (op))) && SPARC_SIMM13_P (CONST_DOUBLE_LOW (op))));
|| GET_CODE (op) == CONSTANT_P_RTX);
} }
/* Recognize operand values for the umul instruction. That instruction sign /* Recognize operand values for the umul instruction. That instruction sign
...@@ -1032,17 +1023,15 @@ uns_small_int (op, mode) ...@@ -1032,17 +1023,15 @@ uns_small_int (op, mode)
{ {
#if HOST_BITS_PER_WIDE_INT > 32 #if HOST_BITS_PER_WIDE_INT > 32
/* All allowed constants will fit a CONST_INT. */ /* All allowed constants will fit a CONST_INT. */
return ((GET_CODE (op) == CONST_INT return (GET_CODE (op) == CONST_INT
&& ((INTVAL (op) >= 0 && INTVAL (op) < 0x1000) && ((INTVAL (op) >= 0 && INTVAL (op) < 0x1000)
|| (INTVAL (op) >= 0xFFFFF000 || (INTVAL (op) >= 0xFFFFF000
&& INTVAL (op) < 0x100000000))) && INTVAL (op) < 0x100000000)));
|| GET_CODE (op) == CONSTANT_P_RTX);
#else #else
return (((GET_CODE (op) == CONST_INT && (unsigned) INTVAL (op) < 0x1000) return ((GET_CODE (op) == CONST_INT && (unsigned) INTVAL (op) < 0x1000)
|| (GET_CODE (op) == CONST_DOUBLE || (GET_CODE (op) == CONST_DOUBLE
&& CONST_DOUBLE_HIGH (op) == 0 && CONST_DOUBLE_HIGH (op) == 0
&& (unsigned) CONST_DOUBLE_LOW (op) - 0xFFFFF000 < 0x1000)) && (unsigned) CONST_DOUBLE_LOW (op) - 0xFFFFF000 < 0x1000));
|| GET_CODE (op) == CONSTANT_P_RTX);
#endif #endif
} }
...@@ -1070,7 +1059,7 @@ zero_operand (op, mode) ...@@ -1070,7 +1059,7 @@ zero_operand (op, mode)
rtx op; rtx op;
enum machine_mode mode ATTRIBUTE_UNUSED; enum machine_mode mode ATTRIBUTE_UNUSED;
{ {
return (op == const0_rtx || GET_CODE (op) == CONSTANT_P_RTX); return op == const0_rtx;
} }
/* Return 1 if OP is a valid operand for the source of a move insn. */ /* Return 1 if OP is a valid operand for the source of a move insn. */
...@@ -1084,6 +1073,10 @@ input_operand (op, mode) ...@@ -1084,6 +1073,10 @@ input_operand (op, mode)
if (mode != VOIDmode && GET_MODE (op) != VOIDmode && mode != GET_MODE (op)) if (mode != VOIDmode && GET_MODE (op) != VOIDmode && mode != GET_MODE (op))
return 0; return 0;
/* Only a tiny bit of handling for CONSTANT_P_RTX is necessary. */
if (GET_CODE (op) == CONST && GET_CODE (XEXP (op, 0)) == CONSTANT_P_RTX)
return 1;
/* Allow any one instruction integer constant, and all CONST_INT /* Allow any one instruction integer constant, and all CONST_INT
variants when we are working in DImode and !arch64. */ variants when we are working in DImode and !arch64. */
if (GET_MODE_CLASS (mode) == MODE_INT if (GET_MODE_CLASS (mode) == MODE_INT
...@@ -1112,10 +1105,6 @@ input_operand (op, mode) ...@@ -1112,10 +1105,6 @@ input_operand (op, mode)
)))) ))))
return 1; return 1;
/* Always match this. */
if (GET_CODE (op) == CONSTANT_P_RTX)
return 1;
/* If !arch64 and this is a DImode const, allow it so that /* If !arch64 and this is a DImode const, allow it so that
the splits can be generated. */ the splits can be generated. */
if (! TARGET_ARCH64 if (! TARGET_ARCH64
......
gcc/config/sparc/sparc.h
...@@ -3284,8 +3284,8 @@ do { \ ...@@ -3284,8 +3284,8 @@ do { \
{"icc_or_fcc_reg_operand", {REG}}, \ {"icc_or_fcc_reg_operand", {REG}}, \
{"restore_operand", {REG}}, \ {"restore_operand", {REG}}, \
{"call_operand", {MEM}}, \ {"call_operand", {MEM}}, \
{"call_operand_address", {SYMBOL_REF, LABEL_REF, CONST, CONST_DOUBLE, ADDRESSOF, \ {"call_operand_address", {SYMBOL_REF, LABEL_REF, CONST, CONST_DOUBLE, \
SUBREG, REG, PLUS, LO_SUM, CONST_INT}}, \ ADDRESSOF, SUBREG, REG, PLUS, LO_SUM, CONST_INT}}, \
{"symbolic_operand", {SYMBOL_REF, LABEL_REF, CONST, CONST_DOUBLE}}, \ {"symbolic_operand", {SYMBOL_REF, LABEL_REF, CONST, CONST_DOUBLE}}, \
{"symbolic_memory_operand", {SUBREG, MEM}}, \ {"symbolic_memory_operand", {SUBREG, MEM}}, \
{"label_ref_operand", {LABEL_REF}}, \ {"label_ref_operand", {LABEL_REF}}, \
...@@ -3302,24 +3302,23 @@ do { \ ...@@ -3302,24 +3302,23 @@ do { \
{"extend_op", {SIGN_EXTEND, ZERO_EXTEND}}, \ {"extend_op", {SIGN_EXTEND, ZERO_EXTEND}}, \
{"cc_arithop", {AND, IOR, XOR}}, \ {"cc_arithop", {AND, IOR, XOR}}, \
{"cc_arithopn", {AND, IOR}}, \ {"cc_arithopn", {AND, IOR}}, \
{"arith_operand", {SUBREG, REG, CONSTANT_P_RTX, CONST_INT}}, \ {"arith_operand", {SUBREG, REG, CONST_INT}}, \
{"arith_add_operand", {SUBREG, REG, CONSTANT_P_RTX, CONST_INT}}, \ {"arith_add_operand", {SUBREG, REG, CONST_INT}}, \
{"arith11_operand", {SUBREG, REG, CONSTANT_P_RTX, CONST_INT}}, \ {"arith11_operand", {SUBREG, REG, CONST_INT}}, \
{"arith10_operand", {SUBREG, REG, CONSTANT_P_RTX, CONST_INT}}, \ {"arith10_operand", {SUBREG, REG, CONST_INT}}, \
{"arith_double_operand", {SUBREG, REG, CONSTANT_P_RTX, CONST_INT, CONST_DOUBLE}}, \ {"arith_double_operand", {SUBREG, REG, CONST_INT, CONST_DOUBLE}}, \
{"arith_double_add_operand", {SUBREG, REG, CONSTANT_P_RTX, CONST_INT, CONST_DOUBLE}},\ {"arith_double_add_operand", {SUBREG, REG, CONST_INT, CONST_DOUBLE}}, \
{"arith11_double_operand", {SUBREG, REG, CONSTANT_P_RTX, CONST_INT, CONST_DOUBLE}}, \ {"arith11_double_operand", {SUBREG, REG, CONST_INT, CONST_DOUBLE}}, \
{"arith10_double_operand", {SUBREG, REG, CONSTANT_P_RTX, CONST_INT, CONST_DOUBLE}}, \ {"arith10_double_operand", {SUBREG, REG, CONST_INT, CONST_DOUBLE}}, \
{"small_int", {CONST_INT, CONSTANT_P_RTX}}, \ {"small_int", {CONST_INT}}, \
{"small_int_or_double", {CONST_INT, CONST_DOUBLE, CONSTANT_P_RTX}}, \ {"small_int_or_double", {CONST_INT, CONST_DOUBLE}}, \
{"uns_small_int", {CONST_INT, CONSTANT_P_RTX}}, \ {"uns_small_int", {CONST_INT}}, \
{"uns_arith_operand", {SUBREG, REG, CONST_INT, CONSTANT_P_RTX}}, \ {"uns_arith_operand", {SUBREG, REG, CONST_INT}}, \
{"clobbered_register", {REG}}, \ {"clobbered_register", {REG}}, \
{"input_operand", {SUBREG, REG, CONSTANT_P_RTX, CONST_INT, MEM}}, \ {"input_operand", {SUBREG, REG, CONST_INT, MEM, CONST}}, \
{"zero_operand", {CONST_INT, CONSTANT_P_RTX}}, \ {"zero_operand", {CONST_INT}}, \
{"const64_operand", {CONST_INT, CONST_DOUBLE, CONSTANT_P_RTX}}, \ {"const64_operand", {CONST_INT, CONST_DOUBLE}}, \
{"const64_high_operand", {CONST_INT, CONST_DOUBLE, CONSTANT_P_RTX}}, {"const64_high_operand", {CONST_INT, CONST_DOUBLE}},
/* The number of Pmode words for the setjmp buffer. */ /* The number of Pmode words for the setjmp buffer. */
#define JMP_BUF_SIZE 12 #define JMP_BUF_SIZE 12
......
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