Skip to content

R
riscv-gcc-1
Commit 991c42ac by Jan-Benedict Glaw Committed by Hans-Peter Nilsson
Options

* config/cris/cris.c (cris_movem_load_rest_p, cris_store_multiple_op_p) 

	(cris_print_index, cris_print_operand, cris_print_operand_address)
	(cris_reload_address_legitimized, cris_rtx_costs, cris_address_cost)
	(cris_side_effect_mode_ok, cris_valid_pic_const, cris_split_movdx)
	(cris_expand_pic_call_address): Use xxx_P predicate macros instead of
	GET_CODE () == xxx.
	* config/cris/cris.h (SECONDARY_RELOAD_CLASS, EXTRA_CONSTRAINT_Q,
	EXTRA_CONSTRAINT_T, BDAP_INDEX_P, BIAP_INDEX_P, SIMPLE_ADDRESS_P,
	GO_IF_LEGITIMATE_ADDRESS): Ditto.
	* config/cris/cris.md (define_insns: *btst, movdi, *mov_side<mode>)
	(*mov_sidesisf, *mov_side<mode>_mem, *mov_sidesisf_mem)
	(*clear_side<mode>, movsi, *movsi_internal, *ext_sideqihi)
	(*ext_side<mode>si, *op_side<mode>, *op_swap_side<mode>, addsi3)
	(*extopqihi_side, *extop<mode>si_side, *extopqihi_swap_side)
	(*extop<mode>si_swap_side, addi_mul, *addi,andsi3, andhi3, ashl<mode>3)
	(uminsi3, call, call_value): Ditto.
	(define_split: indir_to_reg_split, unnamed): Ditto.

From-SVN: r122128
parent 602fea7c
Showing with 119 additions and 108 deletions
gcc/ChangeLog
2007-02-19 Jan-Benedict Glaw <jbglaw@lug-owl.de>
* config/cris/cris.c (cris_movem_load_rest_p, cris_store_multiple_op_p)
(cris_print_index, cris_print_operand, cris_print_operand_address)
(cris_reload_address_legitimized, cris_rtx_costs, cris_address_cost)
(cris_side_effect_mode_ok, cris_valid_pic_const, cris_split_movdx)
(cris_expand_pic_call_address): Use xxx_P predicate macros instead of
GET_CODE () == xxx.
* config/cris/cris.h (SECONDARY_RELOAD_CLASS, EXTRA_CONSTRAINT_Q,
EXTRA_CONSTRAINT_T, BDAP_INDEX_P, BIAP_INDEX_P, SIMPLE_ADDRESS_P,
GO_IF_LEGITIMATE_ADDRESS): Ditto.
* config/cris/cris.md (define_insns: *btst, movdi, *mov_side<mode>)
(*mov_sidesisf, *mov_side<mode>_mem, *mov_sidesisf_mem)
(*clear_side<mode>, movsi, *movsi_internal, *ext_sideqihi)
(*ext_side<mode>si, *op_side<mode>, *op_swap_side<mode>, addsi3)
(*extopqihi_side, *extop<mode>si_side, *extopqihi_swap_side)
(*extop<mode>si_swap_side, addi_mul, *addi,andsi3, andhi3, ashl<mode>3)
(uminsi3, call, call_value): Ditto.
(define_split: indir_to_reg_split, unnamed): Ditto.
2007-02-19 Dorit Nuzman <dorit@il.ibm.com> 2007-02-19 Dorit Nuzman <dorit@il.ibm.com>
PR tree-optimization/30975 PR tree-optimization/30975
......
gcc/config/cris/cris.c
...@@ -205,8 +205,8 @@ cris_movem_load_rest_p (rtx op, int offs) ...@@ -205,8 +205,8 @@ cris_movem_load_rest_p (rtx op, int offs)
other than (MEM reg). */ other than (MEM reg). */
if (reg_count <= 1 if (reg_count <= 1
|| GET_CODE (XVECEXP (op, 0, offs)) != SET || GET_CODE (XVECEXP (op, 0, offs)) != SET
|| GET_CODE (SET_DEST (XVECEXP (op, 0, offs))) != REG || !REG_P (SET_DEST (XVECEXP (op, 0, offs)))
|| GET_CODE (SET_SRC (XVECEXP (op, 0, offs))) != MEM) || !MEM_P (SET_SRC (XVECEXP (op, 0, offs))))
return false; return false;
/* Check a possible post-inc indicator. */ /* Check a possible post-inc indicator. */
...@@ -221,7 +221,7 @@ cris_movem_load_rest_p (rtx op, int offs) ...@@ -221,7 +221,7 @@ cris_movem_load_rest_p (rtx op, int offs)
|| !REG_P (reg) || !REG_P (reg)
|| !REG_P (SET_DEST (XVECEXP (op, 0, offs + 1))) || !REG_P (SET_DEST (XVECEXP (op, 0, offs + 1)))
|| REGNO (reg) != REGNO (SET_DEST (XVECEXP (op, 0, offs + 1))) || REGNO (reg) != REGNO (SET_DEST (XVECEXP (op, 0, offs + 1)))
|| GET_CODE (inc) != CONST_INT || !CONST_INT_P (inc)
|| INTVAL (inc) != (HOST_WIDE_INT) reg_count * 4) || INTVAL (inc) != (HOST_WIDE_INT) reg_count * 4)
return false; return false;
i = offs + 2; i = offs + 2;
...@@ -237,10 +237,10 @@ cris_movem_load_rest_p (rtx op, int offs) ...@@ -237,10 +237,10 @@ cris_movem_load_rest_p (rtx op, int offs)
src_addr = XEXP (SET_SRC (elt), 0); src_addr = XEXP (SET_SRC (elt), 0);
if (GET_CODE (elt) != SET if (GET_CODE (elt) != SET
|| GET_CODE (SET_DEST (elt)) != REG || !REG_P (SET_DEST (elt))
|| GET_MODE (SET_DEST (elt)) != SImode || GET_MODE (SET_DEST (elt)) != SImode
|| REGNO (SET_DEST (elt)) != regno || REGNO (SET_DEST (elt)) != regno
|| GET_CODE (SET_SRC (elt)) != MEM || !MEM_P (SET_SRC (elt))
|| GET_MODE (SET_SRC (elt)) != SImode || GET_MODE (SET_SRC (elt)) != SImode
|| !memory_address_p (SImode, src_addr)) || !memory_address_p (SImode, src_addr))
return false; return false;
...@@ -251,14 +251,14 @@ cris_movem_load_rest_p (rtx op, int offs) ...@@ -251,14 +251,14 @@ cris_movem_load_rest_p (rtx op, int offs)
regno += regno_dir; regno += regno_dir;
if (GET_CODE (elt) != SET if (GET_CODE (elt) != SET
|| GET_CODE (SET_DEST (elt)) != REG || !REG_P (SET_DEST (elt))
|| GET_MODE (SET_DEST (elt)) != SImode || GET_MODE (SET_DEST (elt)) != SImode
|| REGNO (SET_DEST (elt)) != regno || REGNO (SET_DEST (elt)) != regno
|| GET_CODE (SET_SRC (elt)) != MEM || !MEM_P (SET_SRC (elt))
|| GET_MODE (SET_SRC (elt)) != SImode || GET_MODE (SET_SRC (elt)) != SImode
|| GET_CODE (XEXP (SET_SRC (elt), 0)) != PLUS || GET_CODE (XEXP (SET_SRC (elt), 0)) != PLUS
|| ! rtx_equal_p (XEXP (XEXP (SET_SRC (elt), 0), 0), src_addr) || ! rtx_equal_p (XEXP (XEXP (SET_SRC (elt), 0), 0), src_addr)
|| GET_CODE (XEXP (XEXP (SET_SRC (elt), 0), 1)) != CONST_INT || !CONST_INT_P (XEXP (XEXP (SET_SRC (elt), 0), 1))
|| INTVAL (XEXP (XEXP (SET_SRC (elt), 0), 1)) != setno * 4) || INTVAL (XEXP (XEXP (SET_SRC (elt), 0), 1)) != setno * 4)
return false; return false;
} }
...@@ -295,8 +295,7 @@ cris_store_multiple_op_p (rtx op) ...@@ -295,8 +295,7 @@ cris_store_multiple_op_p (rtx op)
dest = SET_DEST (elt); dest = SET_DEST (elt);
if (GET_CODE (SET_SRC (elt)) != REG if (!REG_P (SET_SRC (elt)) || !MEM_P (dest))
|| GET_CODE (dest) != MEM)
return false; return false;
dest_addr = XEXP (dest, 0); dest_addr = XEXP (dest, 0);
...@@ -313,7 +312,7 @@ cris_store_multiple_op_p (rtx op) ...@@ -313,7 +312,7 @@ cris_store_multiple_op_p (rtx op)
|| !REG_P (reg) || !REG_P (reg)
|| !REG_P (SET_DEST (XVECEXP (op, 0, 1))) || !REG_P (SET_DEST (XVECEXP (op, 0, 1)))
|| REGNO (reg) != REGNO (SET_DEST (XVECEXP (op, 0, 1))) || REGNO (reg) != REGNO (SET_DEST (XVECEXP (op, 0, 1)))
|| GET_CODE (inc) != CONST_INT || !CONST_INT_P (inc)
/* Support increment by number of registers, and by the offset /* Support increment by number of registers, and by the offset
of the destination, if it has the form (MEM (PLUS reg of the destination, if it has the form (MEM (PLUS reg
offset)). */ offset)). */
...@@ -323,7 +322,7 @@ cris_store_multiple_op_p (rtx op) ...@@ -323,7 +322,7 @@ cris_store_multiple_op_p (rtx op)
|| (GET_CODE (dest_addr) == PLUS || (GET_CODE (dest_addr) == PLUS
&& REG_P (XEXP (dest_addr, 0)) && REG_P (XEXP (dest_addr, 0))
&& REGNO (XEXP (dest_addr, 0)) == REGNO (reg) && REGNO (XEXP (dest_addr, 0)) == REGNO (reg)
&& GET_CODE (XEXP (dest_addr, 1)) == CONST_INT && CONST_INT_P (XEXP (dest_addr, 1))
&& INTVAL (XEXP (dest_addr, 1)) == INTVAL (inc)))) && INTVAL (XEXP (dest_addr, 1)) == INTVAL (inc))))
return false; return false;
...@@ -337,10 +336,10 @@ cris_store_multiple_op_p (rtx op) ...@@ -337,10 +336,10 @@ cris_store_multiple_op_p (rtx op)
regno = reg_count - 1; regno = reg_count - 1;
if (GET_CODE (elt) != SET if (GET_CODE (elt) != SET
|| GET_CODE (SET_SRC (elt)) != REG || !REG_P (SET_SRC (elt))
|| GET_MODE (SET_SRC (elt)) != SImode || GET_MODE (SET_SRC (elt)) != SImode
|| REGNO (SET_SRC (elt)) != (unsigned int) regno || REGNO (SET_SRC (elt)) != (unsigned int) regno
|| GET_CODE (SET_DEST (elt)) != MEM || !MEM_P (SET_DEST (elt))
|| GET_MODE (SET_DEST (elt)) != SImode) || GET_MODE (SET_DEST (elt)) != SImode)
return false; return false;
...@@ -351,7 +350,7 @@ cris_store_multiple_op_p (rtx op) ...@@ -351,7 +350,7 @@ cris_store_multiple_op_p (rtx op)
} }
else if (GET_CODE (dest_addr) == PLUS else if (GET_CODE (dest_addr) == PLUS
&& REG_P (XEXP (dest_addr, 0)) && REG_P (XEXP (dest_addr, 0))
&& GET_CODE (XEXP (dest_addr, 1)) == CONST_INT) && CONST_INT_P (XEXP (dest_addr, 1)))
{ {
dest_base = XEXP (dest_addr, 0); dest_base = XEXP (dest_addr, 0);
offset = INTVAL (XEXP (dest_addr, 1)); offset = INTVAL (XEXP (dest_addr, 1));
...@@ -365,14 +364,14 @@ cris_store_multiple_op_p (rtx op) ...@@ -365,14 +364,14 @@ cris_store_multiple_op_p (rtx op)
regno += regno_dir; regno += regno_dir;
if (GET_CODE (elt) != SET if (GET_CODE (elt) != SET
|| GET_CODE (SET_SRC (elt)) != REG || !REG_P (SET_SRC (elt))
|| GET_MODE (SET_SRC (elt)) != SImode || GET_MODE (SET_SRC (elt)) != SImode
|| REGNO (SET_SRC (elt)) != (unsigned int) regno || REGNO (SET_SRC (elt)) != (unsigned int) regno
|| GET_CODE (SET_DEST (elt)) != MEM || !MEM_P (SET_DEST (elt))
|| GET_MODE (SET_DEST (elt)) != SImode || GET_MODE (SET_DEST (elt)) != SImode
|| GET_CODE (XEXP (SET_DEST (elt), 0)) != PLUS || GET_CODE (XEXP (SET_DEST (elt), 0)) != PLUS
|| ! rtx_equal_p (XEXP (XEXP (SET_DEST (elt), 0), 0), dest_base) || ! rtx_equal_p (XEXP (XEXP (SET_DEST (elt), 0), 0), dest_base)
|| GET_CODE (XEXP (XEXP (SET_DEST (elt), 0), 1)) != CONST_INT || !CONST_INT_P (XEXP (XEXP (SET_DEST (elt), 0), 1))
|| INTVAL (XEXP (XEXP (SET_DEST (elt), 0), 1)) != setno * 4 + offset) || INTVAL (XEXP (XEXP (SET_DEST (elt), 0), 1)) != setno * 4 + offset)
return false; return false;
} }
...@@ -501,7 +500,7 @@ cris_print_index (rtx index, FILE *file) ...@@ -501,7 +500,7 @@ cris_print_index (rtx index, FILE *file)
/* Make the index "additive" unless we'll output a negative number, in /* Make the index "additive" unless we'll output a negative number, in
which case the sign character is free (as in free beer). */ which case the sign character is free (as in free beer). */
if (GET_CODE (index) != CONST_INT || INTVAL (index) >= 0) if (!CONST_INT_P (index) || INTVAL (index) >= 0)
putc ('+', file); putc ('+', file);
if (REG_P (index)) if (REG_P (index))
...@@ -515,8 +514,7 @@ cris_print_index (rtx index, FILE *file) ...@@ -515,8 +514,7 @@ cris_print_index (rtx index, FILE *file)
putc (INTVAL (XEXP (index, 1)) == 2 ? 'w' : 'd', file); putc (INTVAL (XEXP (index, 1)) == 2 ? 'w' : 'd', file);
} }
else if (GET_CODE (index) == SIGN_EXTEND && else if (GET_CODE (index) == SIGN_EXTEND && MEM_P (inner))
GET_CODE (inner) == MEM)
{ {
rtx inner_inner = XEXP (inner, 0); rtx inner_inner = XEXP (inner, 0);
...@@ -533,7 +531,7 @@ cris_print_index (rtx index, FILE *file) ...@@ -533,7 +531,7 @@ cris_print_index (rtx index, FILE *file)
putc (GET_MODE (inner) == HImode ? 'w' : 'b', file); putc (GET_MODE (inner) == HImode ? 'w' : 'b', file);
} }
} }
else if (GET_CODE (index) == MEM) else if (MEM_P (index))
{ {
if (GET_CODE (inner) == POST_INC) if (GET_CODE (inner) == POST_INC)
fprintf (file, "[$%s+].d", reg_names[REGNO (XEXP (inner, 0))]); fprintf (file, "[$%s+].d", reg_names[REGNO (XEXP (inner, 0))]);
...@@ -669,7 +667,7 @@ cris_print_operand (FILE *file, rtx x, int code) ...@@ -669,7 +667,7 @@ cris_print_operand (FILE *file, rtx x, int code)
case 'b': case 'b':
/* Print the unsigned supplied integer as if it were signed /* Print the unsigned supplied integer as if it were signed
and < 0, i.e print 255 or 65535 as -1, 254, 65534 as -2, etc. */ and < 0, i.e print 255 or 65535 as -1, 254, 65534 as -2, etc. */
if (GET_CODE (x) != CONST_INT if (!CONST_INT_P (x)
|| ! CONST_OK_FOR_LETTER_P (INTVAL (x), 'O')) || ! CONST_OK_FOR_LETTER_P (INTVAL (x), 'O'))
LOSE_AND_RETURN ("invalid operand for 'b' modifier", x); LOSE_AND_RETURN ("invalid operand for 'b' modifier", x);
fprintf (file, HOST_WIDE_INT_PRINT_DEC, fprintf (file, HOST_WIDE_INT_PRINT_DEC,
...@@ -711,7 +709,7 @@ cris_print_operand (FILE *file, rtx x, int code) ...@@ -711,7 +709,7 @@ cris_print_operand (FILE *file, rtx x, int code)
/* The lowest mem operand is in the first item, but perhaps it /* The lowest mem operand is in the first item, but perhaps it
needs to be output as postincremented. */ needs to be output as postincremented. */
addr = GET_CODE (SET_SRC (XVECEXP (x, 0, 0))) == MEM addr = MEM_P (SET_SRC (XVECEXP (x, 0, 0)))
? XEXP (SET_SRC (XVECEXP (x, 0, 0)), 0) ? XEXP (SET_SRC (XVECEXP (x, 0, 0)), 0)
: XEXP (SET_DEST (XVECEXP (x, 0, 0)), 0); : XEXP (SET_DEST (XVECEXP (x, 0, 0)), 0);
...@@ -739,7 +737,7 @@ cris_print_operand (FILE *file, rtx x, int code) ...@@ -739,7 +737,7 @@ cris_print_operand (FILE *file, rtx x, int code)
case 'p': case 'p':
/* Adjust a power of two to its log2. */ /* Adjust a power of two to its log2. */
if (GET_CODE (x) != CONST_INT || exact_log2 (INTVAL (x)) < 0 ) if (!CONST_INT_P (x) || exact_log2 (INTVAL (x)) < 0 )
LOSE_AND_RETURN ("invalid operand for 'p' modifier", x); LOSE_AND_RETURN ("invalid operand for 'p' modifier", x);
fprintf (file, "%d", exact_log2 (INTVAL (x))); fprintf (file, "%d", exact_log2 (INTVAL (x)));
return; return;
...@@ -749,7 +747,7 @@ cris_print_operand (FILE *file, rtx x, int code) ...@@ -749,7 +747,7 @@ cris_print_operand (FILE *file, rtx x, int code)
respectively. This modifier also terminates the inhibiting respectively. This modifier also terminates the inhibiting
effects of the 'x' modifier. */ effects of the 'x' modifier. */
cris_output_insn_is_bound = 0; cris_output_insn_is_bound = 0;
if (GET_MODE (x) == VOIDmode && GET_CODE (x) == CONST_INT) if (GET_MODE (x) == VOIDmode && CONST_INT_P (x))
{ {
if (INTVAL (x) >= 0) if (INTVAL (x) >= 0)
{ {
...@@ -777,7 +775,7 @@ cris_print_operand (FILE *file, rtx x, int code) ...@@ -777,7 +775,7 @@ cris_print_operand (FILE *file, rtx x, int code)
case 'z': case 'z':
/* Const_int: print b for -127 <= x <= 255, /* Const_int: print b for -127 <= x <= 255,
w for -32768 <= x <= 65535, else die. */ w for -32768 <= x <= 65535, else die. */
if (GET_CODE (x) != CONST_INT if (!CONST_INT_P (x)
|| INTVAL (x) < -32768 || INTVAL (x) > 65535) || INTVAL (x) < -32768 || INTVAL (x) > 65535)
LOSE_AND_RETURN ("invalid operand for 'z' modifier", x); LOSE_AND_RETURN ("invalid operand for 'z' modifier", x);
putc (INTVAL (x) >= -128 && INTVAL (x) <= 255 ? 'b' : 'w', file); putc (INTVAL (x) >= -128 && INTVAL (x) <= 255 ? 'b' : 'w', file);
...@@ -883,7 +881,7 @@ cris_print_operand (FILE *file, rtx x, int code) ...@@ -883,7 +881,7 @@ cris_print_operand (FILE *file, rtx x, int code)
cris_output_insn_is_bound is nonzero. */ cris_output_insn_is_bound is nonzero. */
if (GET_CODE (operand) != SIGN_EXTEND if (GET_CODE (operand) != SIGN_EXTEND
&& GET_CODE (operand) != ZERO_EXTEND && GET_CODE (operand) != ZERO_EXTEND
&& GET_CODE (operand) != CONST_INT) && !CONST_INT_P (operand))
LOSE_AND_RETURN ("invalid operand for 'e' modifier", x); LOSE_AND_RETURN ("invalid operand for 'e' modifier", x);
if (cris_output_insn_is_bound) if (cris_output_insn_is_bound)
...@@ -893,7 +891,7 @@ cris_print_operand (FILE *file, rtx x, int code) ...@@ -893,7 +891,7 @@ cris_print_operand (FILE *file, rtx x, int code)
} }
putc (GET_CODE (operand) == SIGN_EXTEND putc (GET_CODE (operand) == SIGN_EXTEND
|| (GET_CODE (operand) == CONST_INT && INTVAL (operand) < 0) || (CONST_INT_P (operand) && INTVAL (operand) < 0)
? 's' : 'u', file); ? 's' : 'u', file);
return; return;
...@@ -912,7 +910,7 @@ cris_print_operand (FILE *file, rtx x, int code) ...@@ -912,7 +910,7 @@ cris_print_operand (FILE *file, rtx x, int code)
fprintf (file, HOST_WIDE_INT_PRINT_HEX, CONST_DOUBLE_LOW (x)); fprintf (file, HOST_WIDE_INT_PRINT_HEX, CONST_DOUBLE_LOW (x));
return; return;
} }
else if (HOST_BITS_PER_WIDE_INT > 32 && GET_CODE (operand) == CONST_INT) else if (HOST_BITS_PER_WIDE_INT > 32 && CONST_INT_P (operand))
{ {
fprintf (file, HOST_WIDE_INT_PRINT_HEX, fprintf (file, HOST_WIDE_INT_PRINT_HEX,
INTVAL (x) & ((unsigned int) 0x7fffffff * 2 + 1)); INTVAL (x) & ((unsigned int) 0x7fffffff * 2 + 1));
...@@ -925,7 +923,7 @@ cris_print_operand (FILE *file, rtx x, int code) ...@@ -925,7 +923,7 @@ cris_print_operand (FILE *file, rtx x, int code)
case 'A': case 'A':
/* When emitting an add for the high part of a DImode constant, we /* When emitting an add for the high part of a DImode constant, we
want to use addq for 0 and adds.w for -1. */ want to use addq for 0 and adds.w for -1. */
if (GET_CODE (operand) != CONST_INT) if (!CONST_INT_P (operand))
LOSE_AND_RETURN ("invalid operand for 'A' modifier", x); LOSE_AND_RETURN ("invalid operand for 'A' modifier", x);
fprintf (file, INTVAL (operand) < 0 ? "adds.w" : "addq"); fprintf (file, INTVAL (operand) < 0 ? "adds.w" : "addq");
return; return;
...@@ -948,7 +946,7 @@ cris_print_operand (FILE *file, rtx x, int code) ...@@ -948,7 +946,7 @@ cris_print_operand (FILE *file, rtx x, int code)
case 'D': case 'D':
/* When emitting an sub for the high part of a DImode constant, we /* When emitting an sub for the high part of a DImode constant, we
want to use subq for 0 and subs.w for -1. */ want to use subq for 0 and subs.w for -1. */
if (GET_CODE (operand) != CONST_INT) if (!CONST_INT_P (operand))
LOSE_AND_RETURN ("invalid operand for 'D' modifier", x); LOSE_AND_RETURN ("invalid operand for 'D' modifier", x);
fprintf (file, INTVAL (operand) < 0 ? "subs.w" : "subq"); fprintf (file, INTVAL (operand) < 0 ? "subs.w" : "subq");
return; return;
...@@ -962,7 +960,7 @@ cris_print_operand (FILE *file, rtx x, int code) ...@@ -962,7 +960,7 @@ cris_print_operand (FILE *file, rtx x, int code)
case 'T': case 'T':
/* Print the size letter for an operand to a MULT, which must be a /* Print the size letter for an operand to a MULT, which must be a
const_int with a suitable value. */ const_int with a suitable value. */
if (GET_CODE (operand) != CONST_INT || INTVAL (operand) > 4) if (!CONST_INT_P (operand) || INTVAL (operand) > 4)
LOSE_AND_RETURN ("invalid operand for 'T' modifier", x); LOSE_AND_RETURN ("invalid operand for 'T' modifier", x);
fprintf (file, "%s", mults[INTVAL (operand)]); fprintf (file, "%s", mults[INTVAL (operand)]);
return; return;
...@@ -1021,14 +1019,14 @@ cris_print_operand (FILE *file, rtx x, int code) ...@@ -1021,14 +1019,14 @@ cris_print_operand (FILE *file, rtx x, int code)
case ASHIFT: case ASHIFT:
{ {
/* For a (MULT (reg X) const_int) we output "rX.S". */ /* For a (MULT (reg X) const_int) we output "rX.S". */
int i = GET_CODE (XEXP (operand, 1)) == CONST_INT int i = CONST_INT_P (XEXP (operand, 1))
? INTVAL (XEXP (operand, 1)) : INTVAL (XEXP (operand, 0)); ? INTVAL (XEXP (operand, 1)) : INTVAL (XEXP (operand, 0));
rtx reg = GET_CODE (XEXP (operand, 1)) == CONST_INT rtx reg = CONST_INT_P (XEXP (operand, 1))
? XEXP (operand, 0) : XEXP (operand, 1); ? XEXP (operand, 0) : XEXP (operand, 1);
if (GET_CODE (reg) != REG if (!REG_P (reg)
|| (GET_CODE (XEXP (operand, 0)) != CONST_INT || (!CONST_INT_P (XEXP (operand, 0))
&& GET_CODE (XEXP (operand, 1)) != CONST_INT)) && !CONST_INT_P (XEXP (operand, 1))))
LOSE_AND_RETURN ("unexpected multiplicative operand", x); LOSE_AND_RETURN ("unexpected multiplicative operand", x);
cris_print_base (reg, file); cris_print_base (reg, file);
...@@ -1084,7 +1082,7 @@ cris_print_operand_address (FILE *file, rtx x) ...@@ -1084,7 +1082,7 @@ cris_print_operand_address (FILE *file, rtx x)
else else
LOSE_AND_RETURN ("unrecognized address", x); LOSE_AND_RETURN ("unrecognized address", x);
} }
else if (GET_CODE (x) == MEM) else if (MEM_P (x))
{ {
/* A DIP. Output more indirection characters. */ /* A DIP. Output more indirection characters. */
putc ('[', file); putc ('[', file);
...@@ -1238,8 +1236,7 @@ cris_reload_address_legitimized (rtx x, ...@@ -1238,8 +1236,7 @@ cris_reload_address_legitimized (rtx x,
if (!REG_P (op1)) if (!REG_P (op1))
return false; return false;
if (GET_CODE (op0) == SIGN_EXTEND if (GET_CODE (op0) == SIGN_EXTEND && MEM_P (XEXP (op0, 0)))
&& GET_CODE (XEXP (op0, 0)) == MEM)
{ {
rtx op00 = XEXP (op0, 0); rtx op00 = XEXP (op0, 0);
rtx op000 = XEXP (op00, 0); rtx op000 = XEXP (op00, 0);
...@@ -1390,7 +1387,7 @@ cris_notice_update_cc (rtx exp, rtx insn) ...@@ -1390,7 +1387,7 @@ cris_notice_update_cc (rtx exp, rtx insn)
if (GET_CODE (SET_SRC (exp)) == ZERO_EXTRACT if (GET_CODE (SET_SRC (exp)) == ZERO_EXTRACT
&& XEXP (SET_SRC (exp), 1) == const1_rtx) && XEXP (SET_SRC (exp), 1) == const1_rtx)
{ {
if (GET_CODE (XEXP (SET_SRC (exp), 0)) == CONST_INT) if (CONST_INT_P (XEXP (SET_SRC (exp), 0)))
/* Using cmpq. */ /* Using cmpq. */
cc_status.flags = CC_INVERTED; cc_status.flags = CC_INVERTED;
else else
...@@ -1487,9 +1484,9 @@ cris_notice_update_cc (rtx exp, rtx insn) ...@@ -1487,9 +1484,9 @@ cris_notice_update_cc (rtx exp, rtx insn)
return; return;
} }
} }
else if (GET_CODE (SET_DEST (exp)) == MEM else if (MEM_P (SET_DEST (exp))
|| (GET_CODE (SET_DEST (exp)) == STRICT_LOW_PART || (GET_CODE (SET_DEST (exp)) == STRICT_LOW_PART
&& GET_CODE (XEXP (SET_DEST (exp), 0)) == MEM)) && MEM_P (XEXP (SET_DEST (exp), 0))))
{ {
/* When SET to MEM, then CC is not changed (except for /* When SET to MEM, then CC is not changed (except for
overlap). */ overlap). */
...@@ -1511,7 +1508,7 @@ cris_notice_update_cc (rtx exp, rtx insn) ...@@ -1511,7 +1508,7 @@ cris_notice_update_cc (rtx exp, rtx insn)
&& REG_P (XEXP (XVECEXP (exp, 0, 1), 0))) && REG_P (XEXP (XVECEXP (exp, 0, 1), 0)))
{ {
if (REG_P (XEXP (XVECEXP (exp, 0, 0), 0)) if (REG_P (XEXP (XVECEXP (exp, 0, 0), 0))
&& GET_CODE (XEXP (XVECEXP (exp, 0, 0), 1)) == MEM) && MEM_P (XEXP (XVECEXP (exp, 0, 0), 1)))
{ {
/* For "move.S [rx=ry+o],rz", say CC reflects /* For "move.S [rx=ry+o],rz", say CC reflects
value1=rz and value2=[rx] */ value1=rz and value2=[rx] */
...@@ -1530,7 +1527,7 @@ cris_notice_update_cc (rtx exp, rtx insn) ...@@ -1530,7 +1527,7 @@ cris_notice_update_cc (rtx exp, rtx insn)
} }
else if ((REG_P (XEXP (XVECEXP (exp, 0, 0), 1)) else if ((REG_P (XEXP (XVECEXP (exp, 0, 0), 1))
|| XEXP (XVECEXP (exp, 0, 0), 1) == const0_rtx) || XEXP (XVECEXP (exp, 0, 0), 1) == const0_rtx)
&& GET_CODE (XEXP (XVECEXP (exp, 0, 0), 0)) == MEM) && MEM_P (XEXP (XVECEXP (exp, 0, 0), 0)))
{ {
/* For "move.S rz,[rx=ry+o]" and "clear.S [rx=ry+o]", /* For "move.S rz,[rx=ry+o]" and "clear.S [rx=ry+o]",
say flags are not changed, except for overlap. */ say flags are not changed, except for overlap. */
...@@ -1662,7 +1659,7 @@ cris_rtx_costs (rtx x, int code, int outer_code, int *total) ...@@ -1662,7 +1659,7 @@ cris_rtx_costs (rtx x, int code, int outer_code, int *total)
case MULT: case MULT:
/* Identify values that are no powers of two. Powers of 2 are /* Identify values that are no powers of two. Powers of 2 are
taken care of already and those values should not be changed. */ taken care of already and those values should not be changed. */
if (GET_CODE (XEXP (x, 1)) != CONST_INT if (!CONST_INT_P (XEXP (x, 1))
|| exact_log2 (INTVAL (XEXP (x, 1)) < 0)) || exact_log2 (INTVAL (XEXP (x, 1)) < 0))
{ {
/* If we have a multiply insn, then the cost is between /* If we have a multiply insn, then the cost is between
...@@ -1683,7 +1680,7 @@ cris_rtx_costs (rtx x, int code, int outer_code, int *total) ...@@ -1683,7 +1680,7 @@ cris_rtx_costs (rtx x, int code, int outer_code, int *total)
case MOD: case MOD:
case UMOD: case UMOD:
case DIV: case DIV:
if (GET_CODE (XEXP (x, 1)) != CONST_INT if (!CONST_INT_P (XEXP (x, 1))
|| exact_log2 (INTVAL (XEXP (x, 1)) < 0)) || exact_log2 (INTVAL (XEXP (x, 1)) < 0))
{ {
/* Estimate this as 4 + 8 * #of bits. */ /* Estimate this as 4 + 8 * #of bits. */
...@@ -1693,9 +1690,9 @@ cris_rtx_costs (rtx x, int code, int outer_code, int *total) ...@@ -1693,9 +1690,9 @@ cris_rtx_costs (rtx x, int code, int outer_code, int *total)
return false; return false;
case AND: case AND:
if (GET_CODE (XEXP (x, 1)) == CONST_INT if (CONST_INT_P (XEXP (x, 1))
/* Two constants may actually happen before optimization. */ /* Two constants may actually happen before optimization. */
&& GET_CODE (XEXP (x, 0)) != CONST_INT && !CONST_INT_P (XEXP (x, 0))
&& !CONST_OK_FOR_LETTER_P (INTVAL (XEXP (x, 1)), 'I')) && !CONST_OK_FOR_LETTER_P (INTVAL (XEXP (x, 1)), 'I'))
{ {
*total = (rtx_cost (XEXP (x, 0), outer_code) + 2 *total = (rtx_cost (XEXP (x, 0), outer_code) + 2
...@@ -1729,7 +1726,7 @@ cris_address_cost (rtx x) ...@@ -1729,7 +1726,7 @@ cris_address_cost (rtx x)
/* An indirect mem must be a DIP. This means two bytes extra for code, /* An indirect mem must be a DIP. This means two bytes extra for code,
and 4 bytes extra for memory read, i.e. (2 + 4) / 2. */ and 4 bytes extra for memory read, i.e. (2 + 4) / 2. */
if (GET_CODE (x) == MEM) if (MEM_P (x))
return (2 + 4) / 2; return (2 + 4) / 2;
/* Assume (2 + 4) / 2 for a single constant; a dword, since it needs /* Assume (2 + 4) / 2 for a single constant; a dword, since it needs
...@@ -1752,14 +1749,12 @@ cris_address_cost (rtx x) ...@@ -1752,14 +1749,12 @@ cris_address_cost (rtx x)
/* A BDAP (quick) is 2 extra bytes. Any constant operand to the /* A BDAP (quick) is 2 extra bytes. Any constant operand to the
PLUS is always found in tem2. */ PLUS is always found in tem2. */
if (GET_CODE (tem2) == CONST_INT if (CONST_INT_P (tem2) && INTVAL (tem2) < 128 && INTVAL (tem2) >= -128)
&& INTVAL (tem2) < 128 && INTVAL (tem2) >= -128)
return 2 / 2; return 2 / 2;
/* A BDAP -32768 .. 32767 is like BDAP quick, but with 2 extra /* A BDAP -32768 .. 32767 is like BDAP quick, but with 2 extra
bytes. */ bytes. */
if (GET_CODE (tem2) == CONST_INT if (CONST_INT_P (tem2) && CONST_OK_FOR_LETTER_P (INTVAL (tem2), 'L'))
&& CONST_OK_FOR_LETTER_P (INTVAL (tem2), 'L'))
return (2 + 2) / 2; return (2 + 2) / 2;
/* A BDAP with some other constant is 2 bytes extra. */ /* A BDAP with some other constant is 2 bytes extra. */
...@@ -1858,7 +1853,7 @@ cris_side_effect_mode_ok (enum rtx_code code, rtx *ops, ...@@ -1858,7 +1853,7 @@ cris_side_effect_mode_ok (enum rtx_code code, rtx *ops,
/* Do not allow rx = rx + n if a normal add or sub with same size /* Do not allow rx = rx + n if a normal add or sub with same size
would do. */ would do. */
if (rtx_equal_p (ops[lreg], reg_rtx) if (rtx_equal_p (ops[lreg], reg_rtx)
&& GET_CODE (val_rtx) == CONST_INT && CONST_INT_P (val_rtx)
&& (INTVAL (val_rtx) <= 63 && INTVAL (val_rtx) >= -63)) && (INTVAL (val_rtx) <= 63 && INTVAL (val_rtx) >= -63))
return 0; return 0;
...@@ -1866,12 +1861,11 @@ cris_side_effect_mode_ok (enum rtx_code code, rtx *ops, ...@@ -1866,12 +1861,11 @@ cris_side_effect_mode_ok (enum rtx_code code, rtx *ops,
if (CONSTANT_P (val_rtx)) if (CONSTANT_P (val_rtx))
return 1; return 1;
if (GET_CODE (val_rtx) == MEM if (MEM_P (val_rtx) && BASE_OR_AUTOINCR_P (XEXP (val_rtx, 0)))
&& BASE_OR_AUTOINCR_P (XEXP (val_rtx, 0)))
return 1; return 1;
if (GET_CODE (val_rtx) == SIGN_EXTEND if (GET_CODE (val_rtx) == SIGN_EXTEND
&& GET_CODE (XEXP (val_rtx, 0)) == MEM && MEM_P (XEXP (val_rtx, 0))
&& BASE_OR_AUTOINCR_P (XEXP (XEXP (val_rtx, 0), 0))) && BASE_OR_AUTOINCR_P (XEXP (XEXP (val_rtx, 0), 0)))
return 1; return 1;
...@@ -1958,7 +1952,7 @@ cris_valid_pic_const (rtx x) ...@@ -1958,7 +1952,7 @@ cris_valid_pic_const (rtx x)
if (GET_CODE (x) == PLUS if (GET_CODE (x) == PLUS
&& GET_CODE (XEXP (x, 0)) == UNSPEC && GET_CODE (XEXP (x, 0)) == UNSPEC
&& XINT (XEXP (x, 0), 1) == CRIS_UNSPEC_GOTREL && XINT (XEXP (x, 0), 1) == CRIS_UNSPEC_GOTREL
&& GET_CODE (XEXP (x, 1)) == CONST_INT) && CONST_INT_P (XEXP (x, 1)))
x = XEXP (x, 0); x = XEXP (x, 0);
if (GET_CODE (x) == UNSPEC) if (GET_CODE (x) == UNSPEC)
...@@ -2306,12 +2300,12 @@ cris_split_movdx (rtx *operands) ...@@ -2306,12 +2300,12 @@ cris_split_movdx (rtx *operands)
CRIS_ASSERT (GET_CODE (dest) != SUBREG && GET_CODE (src) != SUBREG); CRIS_ASSERT (GET_CODE (dest) != SUBREG && GET_CODE (src) != SUBREG);
start_sequence (); start_sequence ();
if (GET_CODE (dest) == REG) if (REG_P (dest))
{ {
int dregno = REGNO (dest); int dregno = REGNO (dest);
/* Reg-to-reg copy. */ /* Reg-to-reg copy. */
if (GET_CODE (src) == REG) if (REG_P (src))
{ {
int sregno = REGNO (src); int sregno = REGNO (src);
...@@ -2329,7 +2323,7 @@ cris_split_movdx (rtx *operands) ...@@ -2329,7 +2323,7 @@ cris_split_movdx (rtx *operands)
operand_subword (src, !reverse, TRUE, mode))); operand_subword (src, !reverse, TRUE, mode)));
} }
/* Constant-to-reg copy. */ /* Constant-to-reg copy. */
else if (GET_CODE (src) == CONST_INT || GET_CODE (src) == CONST_DOUBLE) else if (CONST_INT_P (src) || GET_CODE (src) == CONST_DOUBLE)
{ {
rtx words[2]; rtx words[2];
split_double (src, &words[0], &words[1]); split_double (src, &words[0], &words[1]);
...@@ -2342,7 +2336,7 @@ cris_split_movdx (rtx *operands) ...@@ -2342,7 +2336,7 @@ cris_split_movdx (rtx *operands)
words[1])); words[1]));
} }
/* Mem-to-reg copy. */ /* Mem-to-reg copy. */
else if (GET_CODE (src) == MEM) else if (MEM_P (src))
{ {
/* If the high-address word is used in the address, we must load it /* If the high-address word is used in the address, we must load it
last. Otherwise, load it first. */ last. Otherwise, load it first. */
...@@ -2416,8 +2410,8 @@ cris_split_movdx (rtx *operands) ...@@ -2416,8 +2410,8 @@ cris_split_movdx (rtx *operands)
internal_error ("Unknown src"); internal_error ("Unknown src");
} }
/* Reg-to-mem copy or clear mem. */ /* Reg-to-mem copy or clear mem. */
else if (GET_CODE (dest) == MEM else if (MEM_P (dest)
&& (GET_CODE (src) == REG && (REG_P (src)
|| src == const0_rtx || src == const0_rtx
|| src == CONST0_RTX (DFmode))) || src == CONST0_RTX (DFmode)))
{ {
...@@ -3183,7 +3177,7 @@ cris_expand_pic_call_address (rtx *opp) ...@@ -3183,7 +3177,7 @@ cris_expand_pic_call_address (rtx *opp)
/* It might be that code can be generated that jumps to 0 (or to a /* It might be that code can be generated that jumps to 0 (or to a
specific address). Don't die on that. (There is a specific address). Don't die on that. (There is a
testcase.) */ testcase.) */
if (CONSTANT_ADDRESS_P (op) && GET_CODE (op) != CONST_INT) if (CONSTANT_ADDRESS_P (op) && CONST_INT_P (op))
{ {
enum cris_pic_symbol_type t = cris_pic_symbol_type_of (op); enum cris_pic_symbol_type t = cris_pic_symbol_type_of (op);
......
gcc/config/cris/cris.h
...@@ -577,7 +577,7 @@ enum reg_class ...@@ -577,7 +577,7 @@ enum reg_class
#define SECONDARY_RELOAD_CLASS(CLASS, MODE, X) \ #define SECONDARY_RELOAD_CLASS(CLASS, MODE, X) \
(((CLASS) != SPECIAL_REGS && (CLASS) != MOF_REGS) \ (((CLASS) != SPECIAL_REGS && (CLASS) != MOF_REGS) \
|| GET_MODE_SIZE (MODE) == 4 \ || GET_MODE_SIZE (MODE) == 4 \
|| GET_CODE (X) != MEM \ || !MEM_P (X) \
? NO_REGS : GENERAL_REGS) ? NO_REGS : GENERAL_REGS)
/* For CRIS, this is always the size of MODE in words, /* For CRIS, this is always the size of MODE in words,
...@@ -643,7 +643,7 @@ enum reg_class ...@@ -643,7 +643,7 @@ enum reg_class
/* Just an indirect register (happens to also be \ /* Just an indirect register (happens to also be \
"all" slottable memory addressing modes not \ "all" slottable memory addressing modes not \
covered by other constraints, i.e. '>'). */ \ covered by other constraints, i.e. '>'). */ \
GET_CODE (X) == MEM && BASE_P (XEXP (X, 0)) \ MEM_P (X) && BASE_P (XEXP (X, 0)) \
) )
#define EXTRA_CONSTRAINT_R(X) \ #define EXTRA_CONSTRAINT_R(X) \
...@@ -659,8 +659,8 @@ enum reg_class ...@@ -659,8 +659,8 @@ enum reg_class
#define EXTRA_CONSTRAINT_T(X) \ #define EXTRA_CONSTRAINT_T(X) \
( \ ( \
/* Memory three-address operand. All are indirect-memory: */ \ /* Memory three-address operand. All are indirect-memory: */ \
GET_CODE (X) == MEM \ MEM_P (X) \
&& ((GET_CODE (XEXP (X, 0)) == MEM \ && ((MEM_P (XEXP (X, 0)) \
/* Double indirect: [[reg]] or [[reg+]]? */ \ /* Double indirect: [[reg]] or [[reg+]]? */ \
&& (BASE_OR_AUTOINCR_P (XEXP (XEXP (X, 0), 0)))) \ && (BASE_OR_AUTOINCR_P (XEXP (XEXP (X, 0), 0)))) \
/* Just an explicit indirect reference: [const]? */ \ /* Just an explicit indirect reference: [const]? */ \
...@@ -959,10 +959,10 @@ struct cum_args {int regs;}; ...@@ -959,10 +959,10 @@ struct cum_args {int regs;};
/* True if X is a valid (register) index for BDAP, i.e. [Rs].S or [Rs+].S. */ /* True if X is a valid (register) index for BDAP, i.e. [Rs].S or [Rs+].S. */
#define BDAP_INDEX_P(X) \ #define BDAP_INDEX_P(X) \
((GET_CODE (X) == MEM && GET_MODE (X) == SImode \ ((MEM_P (X) && GET_MODE (X) == SImode \
&& BASE_OR_AUTOINCR_P (XEXP (X, 0))) \ && BASE_OR_AUTOINCR_P (XEXP (X, 0))) \
|| (GET_CODE (X) == SIGN_EXTEND \ || (GET_CODE (X) == SIGN_EXTEND \
&& GET_CODE (XEXP (X, 0)) == MEM \ && MEM_P (XEXP (X, 0)) \
&& (GET_MODE (XEXP (X, 0)) == HImode \ && (GET_MODE (XEXP (X, 0)) == HImode \
|| GET_MODE (XEXP (X, 0)) == QImode) \ || GET_MODE (XEXP (X, 0)) == QImode) \
&& BASE_OR_AUTOINCR_P (XEXP (XEXP (X, 0), 0)))) && BASE_OR_AUTOINCR_P (XEXP (XEXP (X, 0), 0))))
...@@ -973,7 +973,7 @@ struct cum_args {int regs;}; ...@@ -973,7 +973,7 @@ struct cum_args {int regs;};
|| (GET_CODE (X) == MULT \ || (GET_CODE (X) == MULT \
&& BASE_P (XEXP (X, 0)) \ && BASE_P (XEXP (X, 0)) \
&& REG_OK_FOR_INDEX_P (XEXP (X, 0)) \ && REG_OK_FOR_INDEX_P (XEXP (X, 0)) \
&& GET_CODE (XEXP (X, 1)) == CONST_INT \ && CONST_INT_P (XEXP (X, 1)) \
&& (INTVAL (XEXP (X, 1)) == 2 \ && (INTVAL (XEXP (X, 1)) == 2 \
|| INTVAL (XEXP (X, 1)) == 4))) || INTVAL (XEXP (X, 1)) == 4)))
...@@ -1013,7 +1013,7 @@ struct cum_args {int regs;}; ...@@ -1013,7 +1013,7 @@ struct cum_args {int regs;};
|| (BASE_P (x2) && BIAP_INDEX_P (x1))))) \ || (BASE_P (x2) && BIAP_INDEX_P (x1))))) \
goto ADDR; \ goto ADDR; \
} \ } \
else if (GET_CODE (X) == MEM) \ else if (MEM_P (X)) \
{ \ { \
/* DIP (Rs). Reject [[reg+]] and [[reg]] for \ /* DIP (Rs). Reject [[reg+]] and [[reg]] for \
DImode (long long). */ \ DImode (long long). */ \
......
gcc/config/cris/cris.md
...@@ -337,12 +337,12 @@ ...@@ -337,12 +337,12 @@
(match_operand:SI 1 "const_int_operand" "K,n,K,n,K,n,n") (match_operand:SI 1 "const_int_operand" "K,n,K,n,K,n,n")
(match_operand:SI 2 "nonmemory_operand" "M,M,K,n,r,r,r")))] (match_operand:SI 2 "nonmemory_operand" "M,M,K,n,r,r,r")))]
;; Either it is a single bit, or consecutive ones starting at 0. ;; Either it is a single bit, or consecutive ones starting at 0.
"GET_CODE (operands[1]) == CONST_INT "CONST_INT_P (operands[1])
&& (operands[1] == const1_rtx || operands[2] == const0_rtx) && (operands[1] == const1_rtx || operands[2] == const0_rtx)
&& (REG_S_P (operands[0]) && (REG_S_P (operands[0])
|| (operands[1] == const1_rtx || (operands[1] == const1_rtx
&& REG_S_P (operands[2]) && REG_S_P (operands[2])
&& GET_CODE (operands[0]) == CONST_INT && CONST_INT_P (operands[0])
&& exact_log2 (INTVAL (operands[0])) >= 0))" && exact_log2 (INTVAL (operands[0])) >= 0))"
;; The last "&&" condition above should be caught by some kind of ;; The last "&&" condition above should be caught by some kind of
...@@ -409,7 +409,7 @@ ...@@ -409,7 +409,7 @@
(match_operand:DI 1 "general_operand" ""))] (match_operand:DI 1 "general_operand" ""))]
"" ""
{ {
if (GET_CODE (operands[0]) == MEM && operands[1] != const0_rtx) if (MEM_P (operands[0]) && operands[1] != const0_rtx)
operands[1] = copy_to_mode_reg (DImode, operands[1]); operands[1] = copy_to_mode_reg (DImode, operands[1]);
/* Some other ports (as of 2001-09-10 for example mcore and romp) also /* Some other ports (as of 2001-09-10 for example mcore and romp) also
...@@ -420,8 +420,7 @@ ...@@ -420,8 +420,7 @@
emitted) is the final value. This construct from romp seems more emitted) is the final value. This construct from romp seems more
robust, especially considering the head comments from robust, especially considering the head comments from
emit_no_conflict_block. */ emit_no_conflict_block. */
if ((GET_CODE (operands[1]) == CONST_INT if ((CONST_INT_P (operands[1]) || GET_CODE (operands[1]) == CONST_DOUBLE)
|| GET_CODE (operands[1]) == CONST_DOUBLE)
&& ! reload_completed && ! reload_completed
&& ! reload_in_progress) && ! reload_in_progress)
{ {
...@@ -513,7 +512,7 @@ ...@@ -513,7 +512,7 @@
"cris_side_effect_mode_ok (PLUS, operands, 3, 1, 2, -1, 0)" "cris_side_effect_mode_ok (PLUS, operands, 3, 1, 2, -1, 0)"
{ {
if ((which_alternative == 0 || which_alternative == 3) if ((which_alternative == 0 || which_alternative == 3)
&& (GET_CODE (operands[2]) != CONST_INT && (!CONST_INT_P (operands[2])
|| INTVAL (operands[2]) > 127 || INTVAL (operands[2]) > 127
|| INTVAL (operands[2]) < -128 || INTVAL (operands[2]) < -128
|| CONST_OK_FOR_LETTER_P (INTVAL (operands[2]), 'N') || CONST_OK_FOR_LETTER_P (INTVAL (operands[2]), 'N')
...@@ -540,7 +539,7 @@ ...@@ -540,7 +539,7 @@
|| which_alternative == 3 || which_alternative == 3
|| which_alternative == 6 || which_alternative == 6
|| which_alternative == 8) || which_alternative == 8)
&& (GET_CODE (operands[2]) != CONST_INT && (!CONST_INT_P (operands[2])
|| INTVAL (operands[2]) > 127 || INTVAL (operands[2]) > 127
|| INTVAL (operands[2]) < -128 || INTVAL (operands[2]) < -128
|| CONST_OK_FOR_LETTER_P (INTVAL (operands[2]), 'N') || CONST_OK_FOR_LETTER_P (INTVAL (operands[2]), 'N')
...@@ -659,7 +658,7 @@ ...@@ -659,7 +658,7 @@
"cris_side_effect_mode_ok (PLUS, operands, 3, 0, 1, -1, 2)" "cris_side_effect_mode_ok (PLUS, operands, 3, 0, 1, -1, 2)"
{ {
if ((which_alternative == 0 || which_alternative == 4) if ((which_alternative == 0 || which_alternative == 4)
&& (GET_CODE (operands[1]) != CONST_INT && (!CONST_INT_P (operands[1])
|| INTVAL (operands[1]) > 127 || INTVAL (operands[1]) > 127
|| INTVAL (operands[1]) < -128 || INTVAL (operands[1]) < -128
|| CONST_OK_FOR_LETTER_P (INTVAL (operands[1]), 'N') || CONST_OK_FOR_LETTER_P (INTVAL (operands[1]), 'N')
...@@ -693,7 +692,7 @@ ...@@ -693,7 +692,7 @@
&& cris_side_effect_mode_ok (PLUS, operands, 3, 0, 1, -1, 2)" && cris_side_effect_mode_ok (PLUS, operands, 3, 0, 1, -1, 2)"
{ {
if ((which_alternative == 0 || which_alternative == 4) if ((which_alternative == 0 || which_alternative == 4)
&& (GET_CODE (operands[1]) != CONST_INT && (!CONST_INT_P (operands[1])
|| INTVAL (operands[1]) > 127 || INTVAL (operands[1]) > 127
|| INTVAL (operands[1]) < -128 || INTVAL (operands[1]) < -128
|| CONST_OK_FOR_LETTER_P (INTVAL (operands[1]), 'N') || CONST_OK_FOR_LETTER_P (INTVAL (operands[1]), 'N')
...@@ -766,7 +765,7 @@ ...@@ -766,7 +765,7 @@
"cris_side_effect_mode_ok (PLUS, operands, 2, 0, 1, -1, -1)" "cris_side_effect_mode_ok (PLUS, operands, 2, 0, 1, -1, -1)"
{ {
if ((which_alternative == 0 || which_alternative == 3) if ((which_alternative == 0 || which_alternative == 3)
&& (GET_CODE (operands[1]) != CONST_INT && (!CONST_INT_P (operands[1])
|| INTVAL (operands[1]) > 127 || INTVAL (operands[1]) > 127
|| INTVAL (operands[1]) < -128 || INTVAL (operands[1]) < -128
|| CONST_OK_FOR_LETTER_P (INTVAL (operands[1]), 'N') || CONST_OK_FOR_LETTER_P (INTVAL (operands[1]), 'N')
...@@ -787,7 +786,7 @@ ...@@ -787,7 +786,7 @@
{ {
/* If the output goes to a MEM, make sure we have zero or a register as /* If the output goes to a MEM, make sure we have zero or a register as
input. */ input. */
if (GET_CODE (operands[0]) == MEM if (MEM_P (operands[0])
&& ! REG_S_P (operands[1]) && ! REG_S_P (operands[1])
&& operands[1] != const0_rtx && operands[1] != const0_rtx
&& ! no_new_pseudos) && ! no_new_pseudos)
...@@ -960,7 +959,7 @@ ...@@ -960,7 +959,7 @@
if (GET_CODE (tem) == PLUS if (GET_CODE (tem) == PLUS
&& GET_CODE (XEXP (tem, 0)) == UNSPEC && GET_CODE (XEXP (tem, 0)) == UNSPEC
&& XINT (XEXP (tem, 0), 1) == CRIS_UNSPEC_GOTREL && XINT (XEXP (tem, 0), 1) == CRIS_UNSPEC_GOTREL
&& GET_CODE (XEXP (tem, 1)) == CONST_INT) && CONST_INT_P (XEXP (tem, 1)))
tem = XEXP (tem, 0); tem = XEXP (tem, 0);
gcc_assert (GET_CODE (tem) == UNSPEC); gcc_assert (GET_CODE (tem) == UNSPEC);
switch (XINT (tem, 1)) switch (XINT (tem, 1))
...@@ -1047,7 +1046,7 @@ ...@@ -1047,7 +1046,7 @@
"cris_side_effect_mode_ok (PLUS, operands, 3, 1, 2, -1, 0)" "cris_side_effect_mode_ok (PLUS, operands, 3, 1, 2, -1, 0)"
{ {
if ((which_alternative == 0 || which_alternative == 3) if ((which_alternative == 0 || which_alternative == 3)
&& (GET_CODE (operands[2]) != CONST_INT && (!CONST_INT_P (operands[2])
|| INTVAL (operands[2]) > 127 || INTVAL (operands[2]) > 127
|| INTVAL (operands[2]) < -128 || INTVAL (operands[2]) < -128
|| CONST_OK_FOR_LETTER_P (INTVAL (operands[2]), 'N') || CONST_OK_FOR_LETTER_P (INTVAL (operands[2]), 'N')
...@@ -1071,7 +1070,7 @@ ...@@ -1071,7 +1070,7 @@
"cris_side_effect_mode_ok (PLUS, operands, 3, 1, 2, -1, 0)" "cris_side_effect_mode_ok (PLUS, operands, 3, 1, 2, -1, 0)"
{ {
if ((which_alternative == 0 || which_alternative == 3) if ((which_alternative == 0 || which_alternative == 3)
&& (GET_CODE (operands[2]) != CONST_INT && (!CONST_INT_P (operands[2])
|| INTVAL (operands[2]) > 127 || INTVAL (operands[2]) > 127
|| INTVAL (operands[2]) < -128 || INTVAL (operands[2]) < -128
|| CONST_OK_FOR_LETTER_P (INTVAL (operands[2]), 'N') || CONST_OK_FOR_LETTER_P (INTVAL (operands[2]), 'N')
...@@ -1348,7 +1347,7 @@ ...@@ -1348,7 +1347,7 @@
"cris_side_effect_mode_ok (PLUS, operands, 4, 2, 3, -1, 0)" "cris_side_effect_mode_ok (PLUS, operands, 4, 2, 3, -1, 0)"
{ {
if ((which_alternative == 0 || which_alternative == 3) if ((which_alternative == 0 || which_alternative == 3)
&& (GET_CODE (operands[3]) != CONST_INT && (!CONST_INT_P (operands[3])
|| INTVAL (operands[3]) > 127 || INTVAL (operands[3]) > 127
|| INTVAL (operands[3]) < -128 || INTVAL (operands[3]) < -128
|| CONST_OK_FOR_LETTER_P (INTVAL (operands[3]), 'N') || CONST_OK_FOR_LETTER_P (INTVAL (operands[3]), 'N')
...@@ -1406,7 +1405,7 @@ ...@@ -1406,7 +1405,7 @@
"cris_side_effect_mode_ok (PLUS, operands, 4, 2, 3, -1, 0)" "cris_side_effect_mode_ok (PLUS, operands, 4, 2, 3, -1, 0)"
{ {
if ((which_alternative == 0 || which_alternative == 3) if ((which_alternative == 0 || which_alternative == 3)
&& (GET_CODE (operands[3]) != CONST_INT && (!CONST_INT_P (operands[3])
|| INTVAL (operands[3]) > 127 || INTVAL (operands[3]) > 127
|| INTVAL (operands[3]) < -128 || INTVAL (operands[3]) < -128
|| CONST_OK_FOR_LETTER_P (INTVAL (operands[3]), 'N') || CONST_OK_FOR_LETTER_P (INTVAL (operands[3]), 'N')
...@@ -1482,7 +1481,7 @@ ...@@ -1482,7 +1481,7 @@
if (GET_CODE (tem) == PLUS if (GET_CODE (tem) == PLUS
&& GET_CODE (XEXP (tem, 0)) == UNSPEC && GET_CODE (XEXP (tem, 0)) == UNSPEC
&& XINT (XEXP (tem, 0), 1) == CRIS_UNSPEC_GOTREL && XINT (XEXP (tem, 0), 1) == CRIS_UNSPEC_GOTREL
&& GET_CODE (XEXP (tem, 1)) == CONST_INT) && CONST_INT_P (XEXP (tem, 1)))
tem = XEXP (tem, 0); tem = XEXP (tem, 0);
gcc_assert (GET_CODE (tem) == UNSPEC); gcc_assert (GET_CODE (tem) == UNSPEC);
switch (XINT (tem, 1)) switch (XINT (tem, 1))
...@@ -1679,7 +1678,7 @@ ...@@ -1679,7 +1678,7 @@
"cris_side_effect_mode_ok (PLUS, operands, 4, 2, 3, -1, 0)" "cris_side_effect_mode_ok (PLUS, operands, 4, 2, 3, -1, 0)"
{ {
if ((which_alternative == 0 || which_alternative == 3) if ((which_alternative == 0 || which_alternative == 3)
&& (GET_CODE (operands[3]) != CONST_INT && (!CONST_INT_P (operands[3])
|| INTVAL (operands[3]) > 127 || INTVAL (operands[3]) > 127
|| INTVAL (operands[3]) < -128 || INTVAL (operands[3]) < -128
|| CONST_OK_FOR_LETTER_P (INTVAL (operands[3]), 'N') || CONST_OK_FOR_LETTER_P (INTVAL (operands[3]), 'N')
...@@ -1708,7 +1707,7 @@ ...@@ -1708,7 +1707,7 @@
&& cris_side_effect_mode_ok (PLUS, operands, 4, 2, 3, -1, 0)" && cris_side_effect_mode_ok (PLUS, operands, 4, 2, 3, -1, 0)"
{ {
if ((which_alternative == 0 || which_alternative == 3) if ((which_alternative == 0 || which_alternative == 3)
&& (GET_CODE (operands[3]) != CONST_INT && (!CONST_INT_P (operands[3])
|| INTVAL (operands[3]) > 127 || INTVAL (operands[3]) > 127
|| INTVAL (operands[3]) < -128 || INTVAL (operands[3]) < -128
|| CONST_OK_FOR_LETTER_P (INTVAL (operands[3]), 'N') || CONST_OK_FOR_LETTER_P (INTVAL (operands[3]), 'N')
...@@ -1788,7 +1787,7 @@ ...@@ -1788,7 +1787,7 @@
"cris_side_effect_mode_ok (PLUS, operands, 4, 2, 3, -1, 0)" "cris_side_effect_mode_ok (PLUS, operands, 4, 2, 3, -1, 0)"
{ {
if ((which_alternative == 0 || which_alternative == 3) if ((which_alternative == 0 || which_alternative == 3)
&& (GET_CODE (operands[3]) != CONST_INT && (!CONST_INT_P (operands[3])
|| INTVAL (operands[3]) > 127 || INTVAL (operands[3]) > 127
|| INTVAL (operands[3]) < -128 || INTVAL (operands[3]) < -128
|| CONST_OK_FOR_LETTER_P (INTVAL (operands[3]), 'N') || CONST_OK_FOR_LETTER_P (INTVAL (operands[3]), 'N')
...@@ -1816,7 +1815,7 @@ ...@@ -1816,7 +1815,7 @@
&& cris_side_effect_mode_ok (PLUS, operands, 4, 2, 3, -1, 0)" && cris_side_effect_mode_ok (PLUS, operands, 4, 2, 3, -1, 0)"
{ {
if ((which_alternative == 0 || which_alternative == 3) if ((which_alternative == 0 || which_alternative == 3)
&& (GET_CODE (operands[3]) != CONST_INT && (!CONST_INT_P (operands[3])
|| INTVAL (operands[3]) > 127 || INTVAL (operands[3]) > 127
|| INTVAL (operands[3]) < -128 || INTVAL (operands[3]) < -128
|| CONST_OK_FOR_LETTER_P (INTVAL (operands[3]), 'N') || CONST_OK_FOR_LETTER_P (INTVAL (operands[3]), 'N')
...@@ -1963,7 +1962,7 @@ ...@@ -1963,7 +1962,7 @@
(match_operand:SI 2 "const_int_operand" "n")))] (match_operand:SI 2 "const_int_operand" "n")))]
"operands[0] != frame_pointer_rtx "operands[0] != frame_pointer_rtx
&& operands[1] != frame_pointer_rtx && operands[1] != frame_pointer_rtx
&& GET_CODE (operands[2]) == CONST_INT && CONST_INT_P (operands[2])
&& (INTVAL (operands[2]) == 2 && (INTVAL (operands[2]) == 2
|| INTVAL (operands[2]) == 4 || INTVAL (operands[2]) == 3 || INTVAL (operands[2]) == 4 || INTVAL (operands[2]) == 3
|| INTVAL (operands[2]) == 5)" || INTVAL (operands[2]) == 5)"
...@@ -1993,7 +1992,7 @@ ...@@ -1993,7 +1992,7 @@
(match_operand:SI 1 "register_operand" "0")))] (match_operand:SI 1 "register_operand" "0")))]
"operands[0] != frame_pointer_rtx "operands[0] != frame_pointer_rtx
&& operands[1] != frame_pointer_rtx && operands[1] != frame_pointer_rtx
&& GET_CODE (operands[3]) == CONST_INT && CONST_INT_P (operands[3])
&& (INTVAL (operands[3]) == 1 && (INTVAL (operands[3]) == 1
|| INTVAL (operands[3]) == 2 || INTVAL (operands[3]) == 4)" || INTVAL (operands[3]) == 2 || INTVAL (operands[3]) == 4)"
"addi %2%T3,%0" "addi %2%T3,%0"
...@@ -2185,7 +2184,7 @@ ...@@ -2185,7 +2184,7 @@
(match_operand:SI 2 "general_operand" "")))] (match_operand:SI 2 "general_operand" "")))]
"" ""
{ {
if (! (GET_CODE (operands[2]) == CONST_INT if (! (CONST_INT_P (operands[2])
&& (((INTVAL (operands[2]) == -256 && (((INTVAL (operands[2]) == -256
|| INTVAL (operands[2]) == -65536) || INTVAL (operands[2]) == -65536)
&& rtx_equal_p (operands[1], operands[0])) && rtx_equal_p (operands[1], operands[0]))
...@@ -2283,7 +2282,7 @@ ...@@ -2283,7 +2282,7 @@
(match_operand:HI 2 "general_operand" "")))] (match_operand:HI 2 "general_operand" "")))]
"" ""
{ {
if (! (GET_CODE (operands[2]) == CONST_INT if (! (CONST_INT_P (operands[2])
&& (((INTVAL (operands[2]) == -256 && (((INTVAL (operands[2]) == -256
|| INTVAL (operands[2]) == 65280) || INTVAL (operands[2]) == 65280)
&& rtx_equal_p (operands[1], operands[0])) && rtx_equal_p (operands[1], operands[0]))
...@@ -2619,8 +2618,7 @@ ...@@ -2619,8 +2618,7 @@
"" ""
{ {
return return
(GET_CODE (operands[2]) == CONST_INT (CONST_INT_P (operands[2]) && INTVAL (operands[2]) > <nbitsm1>)
&& INTVAL (operands[2]) > <nbitsm1>)
? "moveq 0,%0" ? "moveq 0,%0"
: (CONSTANT_P (operands[2]) : (CONSTANT_P (operands[2])
? "lslq %2,%0" : "lsl<m> %2,%0"); ? "lslq %2,%0" : "lsl<m> %2,%0");
...@@ -2677,7 +2675,7 @@ ...@@ -2677,7 +2675,7 @@
(match_operand:SI 2 "general_operand" "r,Q>,g,!To")))] (match_operand:SI 2 "general_operand" "r,Q>,g,!To")))]
"" ""
{ {
if (GET_CODE (operands[2]) == CONST_INT) if (CONST_INT_P (operands[2]))
{ {
/* Constant operands are zero-extended, so only 32-bit operands /* Constant operands are zero-extended, so only 32-bit operands
may be negative. */ may be negative. */
...@@ -2890,7 +2888,7 @@ ...@@ -2890,7 +2888,7 @@
(clobber (reg:SI CRIS_SRP_REGNUM))])] (clobber (reg:SI CRIS_SRP_REGNUM))])]
"" ""
{ {
gcc_assert (GET_CODE (operands[0]) == MEM); gcc_assert (MEM_P (operands[0]));
if (flag_pic) if (flag_pic)
cris_expand_pic_call_address (&operands[0]); cris_expand_pic_call_address (&operands[0]);
}) })
...@@ -2931,7 +2929,7 @@ ...@@ -2931,7 +2929,7 @@
(clobber (reg:SI CRIS_SRP_REGNUM))])] (clobber (reg:SI CRIS_SRP_REGNUM))])]
"" ""
{ {
gcc_assert (GET_CODE (operands[1]) == MEM); gcc_assert (MEM_P (operands[1]));
if (flag_pic) if (flag_pic)
cris_expand_pic_call_address (&operands[1]); cris_expand_pic_call_address (&operands[1]);
}) })
...@@ -3640,8 +3638,7 @@ ...@@ -3640,8 +3638,7 @@
"reload_completed "reload_completed
&& REG_P (operands[0]) && REG_P (operands[0])
&& GET_MODE_SIZE (GET_MODE (operands[0])) <= UNITS_PER_WORD && GET_MODE_SIZE (GET_MODE (operands[0])) <= UNITS_PER_WORD
&& (GET_CODE (XEXP (operands[1], 0)) == MEM && (MEM_P (XEXP (operands[1], 0)) || CONSTANT_P (XEXP (operands[1], 0)))
|| CONSTANT_P (XEXP (operands[1], 0)))
&& REGNO (operands[0]) < CRIS_LAST_GENERAL_REGISTER" && REGNO (operands[0]) < CRIS_LAST_GENERAL_REGISTER"
[(set (match_dup 2) (match_dup 4)) [(set (match_dup 2) (match_dup 4))
(set (match_dup 0) (match_dup 3))] (set (match_dup 0) (match_dup 3))]
...@@ -3659,7 +3656,7 @@ ...@@ -3659,7 +3656,7 @@
"reload_completed "reload_completed
&& REG_P (operands[0]) && REG_P (operands[0])
&& GET_MODE_SIZE (GET_MODE (operands[0])) <= UNITS_PER_WORD && GET_MODE_SIZE (GET_MODE (operands[0])) <= UNITS_PER_WORD
&& (GET_CODE (XEXP (operands[1], 0)) == MEM && (MEM_P (XEXP (operands[1], 0))
|| CONSTANT_P (XEXP (operands[1], 0)))" || CONSTANT_P (XEXP (operands[1], 0)))"
[(set (match_dup 2) (match_dup 5)) [(set (match_dup 2) (match_dup 5))
(set (match_dup 0) (match_op_dup 4 [(match_dup 3)]))] (set (match_dup 0) (match_op_dup 4 [(match_dup 3)]))]
......
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