* Re: [committed] PA predicate cleanup
2011-03-28 22:17 ` Richard Henderson
2011-03-29 0:49 ` John David Anglin
@ 2011-04-16 16:11 ` John David Anglin
1 sibling, 0 replies; 5+ messages in thread
From: John David Anglin @ 2011-04-16 16:11 UTC (permalink / raw)
To: Richard Henderson; +Cc: John David Anglin, gcc-patches
On Mon, 28 Mar 2011, Richard Henderson wrote:
> (define_predicate "ior_operand"
> (and (match_code "const_int")
> (match_test "ior_mask_p (INTVAL (op))")))
>
> (define_predicate "reg_or_ior_operand"
> (ior (match_operand 0 "register_operand")
> (match_operand 0 "ior_operand")))
>
>
> You've already got an ior_operand, which has a redundant test for CONST_INT.
> Actually, this is true of quite a few of the PA predicates...
The attached change addresses this issue.
Tested on hppa2.0w-hp-hpux11.11, hppa64-hp-hpux11.11 and hppa-unknown-linux-gnu
with no observed regressions. Committed to trunk.
Dave
--
J. David Anglin dave.anglin@nrc-cnrc.gc.ca
National Research Council of Canada (613) 990-0752 (FAX: 952-6602)
2011-04-16 John David Anglin <dave.anglin@nrc-cnrc.gc.ca>
* config/pa/predicates.md: Reorganize and simplify predicates.
Eliminate duplicate code checks.
(arith_operand): Rename to arith14_operand
(reg_or_ior_operand): Rename to reg_or_cint_ior_operand.
* config/pa/pa.md: Use renamed operands.
* config/pa/pa-protos.h (symbolic_operand): Delete declaration.
(tls_symbolic_operand, function_label_operand, lhs_lshift_cint_operand,
arith11_operand, adddi3_operand, indexed_memory_operand,
symbolic_memory_operand, int11_operand, reg_or_cint_move_operand,
arith5_operand, uint5_operand, pic_label_operand, plus_xor_ior_operator,
borx_reg_operand, shadd_operand, arith_operand, read_only_operand,
move_dest_operand, move_src_operand, prefetch_cc_operand,
prefetch_nocc_operand, and_operand, ior_operand, arith32_operand,
uint32_operand, reg_before_reload_operand, reg_or_0_operand,
reg_or_0_or_nonsymb_mem_operand, pre_cint_operand, post_cint_operand,
div_operand, int5_operand, movb_comparison_operator,
ireg_or_int5_operand, call_operand_address, ior_operand, fp_reg_operand,
arith_double_operand, ireg_operand, lhs_lshift_operand,
pc_or_label_operand, non_hard_reg_operand, eq_neq_comparison_operator,
integer_store_memory_operand): Likewise.
* config/pa/pa.c (adddi3_operand): Move to predicates.md.
(integer_store_memory_operand, read_only_operand,
function_label_operand, borx_reg_operand,
non_hard_reg_operand): Likewise.
(eq_neq_comparison_operator): Delete unused operator.
(legitimize_pic_address): Use VOIDmode for mode argument in calls to
function_label_operand.
(emit_move_sequence): Likewise.
Index: config/pa/predicates.md
===================================================================
--- config/pa/predicates.md (revision 172401)
+++ config/pa/predicates.md (working copy)
@@ -1,5 +1,5 @@
;; Predicate definitions for HP PA-RISC.
-;; Copyright (C) 2005, 2007, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2005, 2007, 2010, 2011 Free Software Foundation, Inc.
;;
;; This file is part of GCC.
;;
@@ -17,13 +17,144 @@
;; along with GCC; see the file COPYING3. If not see
;; <http://www.gnu.org/licenses/>.
-;; Return nonzero only if OP is a register of mode MODE, or
-;; CONST0_RTX.
+;; Return truth value of whether OP is an integer which fits the range
+;; constraining 5-bit signed immediate operands in three-address insns.
-(define_predicate "reg_or_0_operand"
- (match_code "subreg,reg,const_int,const_double")
+(define_predicate "int5_operand"
+ (and (match_code "const_int")
+ (match_test "INT_5_BITS (op)")))
+
+;; Return truth value of whether OP is an integer which fits the range
+;; constraining 5-bit unsigned immediate operands in three-address insns.
+
+(define_predicate "uint5_operand"
+ (and (match_code "const_int")
+ (match_test "INT_U5_BITS (op)")))
+
+;; Return truth value of whether OP is an integer which fits the range
+;; constraining 11-bit signed immediate operands in three-address insns.
+
+(define_predicate "int11_operand"
+ (and (match_code "const_int")
+ (match_test "INT_11_BITS (op)")))
+
+;; Return truth value of whether OP is an integer which fits the range
+;; constraining 14-bit signed immediate operands in three-address insns.
+
+(define_predicate "int14_operand"
+ (and (match_code "const_int")
+ (match_test "INT_14_BITS (op)")))
+
+;; True iff OP is a const_int or const_double that will fit in 32 bits.
+
+(define_predicate "uint32_operand"
+ (if_then_else (match_test "HOST_BITS_PER_WIDE_INT > 32")
+ (and (match_code "const_int")
+ (match_test "INTVAL (op) >= 0
+ && INTVAL (op) < (HOST_WIDE_INT) 1 << 32"))
+ (and (match_code "const_int,const_double")
+ (match_test "CONST_INT_P (op) || CONST_DOUBLE_HIGH (op) == 0"))))
+
+;; True iff depi can be used to compute (reg | OP).
+
+(define_predicate "cint_ior_operand"
+ (and (match_code "const_int")
+ (match_test "ior_mask_p (INTVAL (op))")))
+
+;; True iff OP is CONST_INT that can be moved in one instruction
+;; into a general register.
+
+(define_predicate "cint_move_operand"
+ (and (match_code "const_int")
+ (match_test "cint_ok_for_move (INTVAL (op))")))
+
+;; True iff OP is a CONST0_RTX for MODE.
+
+(define_predicate "const_0_operand"
+ (and (match_code "const_int,const_double")
+ (match_test "op == CONST0_RTX (mode)")))
+
+;; A constant integer suitable for use in a PRE_MODIFY memory reference.
+
+(define_predicate "pre_cint_operand"
+ (and (match_code "const_int")
+ (match_test "INTVAL (op) >= -0x2000 && INTVAL (op) < 0x10")))
+
+;; A constant integer suitable for use in a POST_MODIFY memory reference.
+
+(define_predicate "post_cint_operand"
+ (and (match_code "const_int")
+ (match_test "INTVAL (op) < 0x2000 && INTVAL (op) >= -0x10")))
+
+;; True iff depi or extru can be used to compute (reg & OP).
+
+(define_predicate "and_operand"
+ (ior (match_operand 0 "register_operand")
+ (and (match_code "const_int")
+ (match_test "and_mask_p (INTVAL (op))"))))
+
+;; Return truth value of whether OP can be used as an operand in a
+;; three operand arithmetic insn that accepts registers of mode MODE
+;; or 5-bit signed integers.
+
+(define_predicate "arith5_operand"
+ (ior (match_operand 0 "register_operand")
+ (match_operand 0 "int5_operand")))
+
+;; Return truth value of whether OP can be used as an operand in a
+;; three operand arithmetic insn that accepts registers of mode MODE
+;; or 11-bit signed integers.
+
+(define_predicate "arith11_operand"
+ (ior (match_operand 0 "register_operand")
+ (match_operand 0 "int11_operand")))
+
+;; Return truth value of whether OP can be used as an operand in a
+;; three operand arithmetic insn that accepts registers of mode MODE
+;; or 14-bit signed integers.
+
+(define_predicate "arith14_operand"
+ (ior (match_operand 0 "register_operand")
+ (match_operand 0 "int14_operand")))
+
+;; Return truth value of whether OP can be used as an operand in a
+;; three operand arithmetic insn that accepts registers of mode MODE
+;; or 32-bit signed integers.
+
+(define_predicate "arith32_operand"
+ (ior (match_operand 0 "register_operand")
+ (match_code "const_int")))
+
+;; True iff OP can be used as an operand in an adddi3 insn.
+
+(define_predicate "adddi3_operand"
+ (if_then_else (match_test "TARGET_64BIT")
+ (match_operand 0 "arith14_operand")
+ (match_operand 0 "arith11_operand")))
+
+;; True iff OP is valid as a base or index register in a REG+REG address.
+
+(define_predicate "borx_reg_operand"
+ (match_code "reg")
{
- return (op == CONST0_RTX (mode) || register_operand (op, mode));
+ /* We must reject virtual registers as the only expressions that
+ can be instantiated are REG and REG+CONST. */
+ if (op == virtual_incoming_args_rtx
+ || op == virtual_stack_vars_rtx
+ || op == virtual_stack_dynamic_rtx
+ || op == virtual_outgoing_args_rtx
+ || op == virtual_cfa_rtx)
+ return false;
+
+ /* While it's always safe to index off the frame pointer, it's not
+ profitable to do so when the frame pointer is being eliminated. */
+ if (!reload_completed
+ && flag_omit_frame_pointer
+ && !cfun->calls_alloca
+ && op == frame_pointer_rtx)
+ return false;
+
+ return register_operand (op, mode);
})
;; Return nonzero if OP is suitable for use in a call to a named
@@ -39,144 +170,101 @@
&& CONSTANT_P (op) && ! TARGET_PORTABLE_RUNTIME);
})
-;; Return 1 iff OP is an indexed memory operand.
+;; True iff OP can be used as the divisor in a div millicode call.
+(define_predicate "div_operand"
+ (match_code "reg,const_int")
+{
+ return (mode == SImode
+ && ((REG_P (op) && REGNO (op) == 25)
+ || (CONST_INT_P (op)
+ && INTVAL (op) > 0 && INTVAL (op) < 16
+ && magic_milli[INTVAL (op)])));
+})
+
+;; True iff OP is a reloading floating point register
+
+(define_predicate "fp_reg_operand"
+ (and (match_code "reg")
+ (match_test "reg_renumber && FP_REG_P (op)")))
+
+;; True iff OP is a function label operand.
+
+(define_special_predicate "function_label_operand"
+ (and (match_code "symbol_ref")
+ (match_test "FUNCTION_NAME_P (XSTR (op, 0))")))
+
+;; True iff OP is an indexed memory operand.
+
(define_predicate "indexed_memory_operand"
(match_code "subreg,mem")
{
if (GET_MODE (op) != mode)
- return 0;
+ return false;
/* Before reload, a (SUBREG (MEM...)) forces reloading into a register. */
if (reload_completed && GET_CODE (op) == SUBREG)
op = SUBREG_REG (op);
- if (GET_CODE (op) != MEM || symbolic_memory_operand (op, mode))
- return 0;
+ if (! MEM_P (op))
+ return false;
op = XEXP (op, 0);
-
- return (memory_address_p (mode, op) && IS_INDEX_ADDR_P (op));
+ return IS_INDEX_ADDR_P (op) && memory_address_p (mode, op);
})
-;; Return 1 iff OP is a symbolic operand.
-;; Note: an inline copy of this code is present in pa_secondary_reload.
+;; True iff the operand OP can be used as the destination operand of
+;; an integer store. This also implies the operand could be used as
+;; the source operand of an integer load. Symbolic, lo_sum and indexed
+;; memory operands are not allowed. We accept reloading pseudos and
+;; other memory operands.
-(define_predicate "symbolic_operand"
- (match_code "symbol_ref,label_ref,const")
+(define_predicate "integer_store_memory_operand"
+ (match_code "reg,mem")
{
- switch (GET_CODE (op))
- {
- case SYMBOL_REF:
- return !SYMBOL_REF_TLS_MODEL (op);
- case LABEL_REF:
- return 1;
- case CONST:
- op = XEXP (op, 0);
- return (GET_CODE (op) == PLUS
- && ((GET_CODE (XEXP (op, 0)) == SYMBOL_REF
- && !SYMBOL_REF_TLS_MODEL (XEXP (op, 0)))
- || GET_CODE (XEXP (op, 0)) == LABEL_REF)
- && GET_CODE (XEXP (op, 1)) == CONST_INT);
- default:
- return 0;
- }
+ return ((reload_in_progress
+ && REG_P (op)
+ && REGNO (op) >= FIRST_PSEUDO_REGISTER
+ && reg_renumber [REGNO (op)] < 0)
+ || (MEM_P (op)
+ && (reload_in_progress || memory_address_p (mode, XEXP (op, 0)))
+ && !symbolic_memory_operand (op, VOIDmode)
+ && !IS_LO_SUM_DLT_ADDR_P (XEXP (op, 0))
+ && !IS_INDEX_ADDR_P (XEXP (op, 0))));
})
-;; Return truth value of statement that OP is a symbolic memory
-;; operand of mode MODE.
+;; Return true iff OP is an integer register.
-(define_predicate "symbolic_memory_operand"
- (match_code "subreg,mem")
-{
- if (GET_CODE (op) == SUBREG)
- op = SUBREG_REG (op);
- if (GET_CODE (op) != MEM)
- return 0;
- op = XEXP (op, 0);
- return ((GET_CODE (op) == SYMBOL_REF && !SYMBOL_REF_TLS_MODEL (op))
- || GET_CODE (op) == CONST || GET_CODE (op) == HIGH
- || GET_CODE (op) == LABEL_REF);
-})
+(define_predicate "ireg_operand"
+ (and (match_code "reg")
+ (match_test "REGNO (op) > 0 && REGNO (op) < 32")))
-;; Return true if OP is a symbolic operand for the TLS Global Dynamic model.
-(define_predicate "tgd_symbolic_operand"
- (and (match_code "symbol_ref")
- (match_test "SYMBOL_REF_TLS_MODEL (op) == TLS_MODEL_GLOBAL_DYNAMIC")))
+;; Return truth value of whether OP is an integer which fits the range
+;; constraining immediate operands in three-address insns, or is an
+;; integer register.
-;; Return true if OP is a symbolic operand for the TLS Local Dynamic model.
-(define_predicate "tld_symbolic_operand"
- (and (match_code "symbol_ref")
- (match_test "SYMBOL_REF_TLS_MODEL (op) == TLS_MODEL_LOCAL_DYNAMIC")))
+(define_predicate "ireg_or_int5_operand"
+ (ior (match_operand 0 "ireg_operand")
+ (match_operand 0 "int5_operand")))
-;; Return true if OP is a symbolic operand for the TLS Initial Exec model.
-(define_predicate "tie_symbolic_operand"
- (and (match_code "symbol_ref")
- (match_test "SYMBOL_REF_TLS_MODEL (op) == TLS_MODEL_INITIAL_EXEC")))
+;; True iff OP is a CONST_INT of the forms 0...0xxxx or
+;; 0...01...1xxxx. Such values can be the left hand side x in (x <<
+;; r), using the zvdepi instruction.
-;; Return true if OP is a symbolic operand for the TLS Local Exec model.
-(define_predicate "tle_symbolic_operand"
- (and (match_code "symbol_ref")
- (match_test "SYMBOL_REF_TLS_MODEL (op) == TLS_MODEL_LOCAL_EXEC")))
-
-
-;; Return 1 if the operand is a register operand or a non-symbolic
-;; memory operand after reload. This predicate is used for branch
-;; patterns that internally handle register reloading. We need to
-;; accept non-symbolic memory operands after reload to ensure that the
-;; pattern is still valid if reload didn't find a hard register for
-;; the operand.
-
-(define_predicate "reg_before_reload_operand"
- (match_code "reg,mem")
+(define_predicate "lhs_lshift_cint_operand"
+ (match_code "const_int")
{
- /* Don't accept a SUBREG since it will need a reload. */
- if (GET_CODE (op) == SUBREG)
- return 0;
-
- if (register_operand (op, mode))
- return 1;
-
- if (reload_completed
- && memory_operand (op, mode)
- && !symbolic_memory_operand (op, mode))
- return 1;
-
- return 0;
+ unsigned HOST_WIDE_INT x;
+ x = INTVAL (op) >> 4;
+ return (x & (x + 1)) == 0;
})
-;; Return 1 if the operand is either a register, zero, or a memory
-;; operand that is not symbolic.
+;; True iff OP can be used in a zvdep instruction.
-(define_predicate "reg_or_0_or_nonsymb_mem_operand"
- (match_code "subreg,reg,mem,const_int,const_double")
-{
- if (register_operand (op, mode))
- return 1;
+(define_predicate "lhs_lshift_operand"
+ (ior (match_operand 0 "register_operand")
+ (match_operand 0 "lhs_lshift_cint_operand")))
- if (op == CONST0_RTX (mode))
- return 1;
-
- if (GET_CODE (op) == SUBREG)
- op = SUBREG_REG (op);
-
- if (GET_CODE (op) != MEM)
- return 0;
-
- /* Until problems with management of the REG_POINTER flag are resolved,
- we need to delay creating move insns with unscaled indexed addresses
- until CSE is not expected. */
- if (!TARGET_NO_SPACE_REGS
- && !cse_not_expected
- && GET_CODE (XEXP (op, 0)) == PLUS
- && REG_P (XEXP (XEXP (op, 0), 0))
- && REG_P (XEXP (XEXP (op, 0), 1)))
- return 0;
-
- return (!symbolic_memory_operand (op, mode)
- && memory_address_p (mode, XEXP (op, 0)));
-})
-
;; Accept anything that can be used as a destination operand for a
;; move instruction. We don't accept indexed memory operands since
;; they are supported only for floating point stores.
@@ -185,16 +273,16 @@
(match_code "subreg,reg,mem")
{
if (register_operand (op, mode))
- return 1;
+ return true;
if (GET_MODE (op) != mode)
- return 0;
+ return false;
if (GET_CODE (op) == SUBREG)
op = SUBREG_REG (op);
if (GET_CODE (op) != MEM || symbolic_memory_operand (op, mode))
- return 0;
+ return false;
op = XEXP (op, 0);
@@ -210,22 +298,22 @@
(match_code "subreg,reg,const_int,const_double,mem")
{
if (register_operand (op, mode))
- return 1;
+ return true;
if (op == CONST0_RTX (mode))
- return 1;
+ return true;
- if (GET_CODE (op) == CONST_INT)
+ if (CONST_INT_P (op))
return cint_ok_for_move (INTVAL (op));
if (GET_MODE (op) != mode)
- return 0;
+ return false;
if (GET_CODE (op) == SUBREG)
op = SUBREG_REG (op);
- if (GET_CODE (op) != MEM)
- return 0;
+ if (! MEM_P (op))
+ return false;
/* Until problems with management of the REG_POINTER flag are resolved,
we need to delay creating move insns with unscaled indexed addresses
@@ -235,295 +323,210 @@
&& GET_CODE (XEXP (op, 0)) == PLUS
&& REG_P (XEXP (XEXP (op, 0), 0))
&& REG_P (XEXP (XEXP (op, 0), 1)))
- return 0;
+ return false;
return memory_address_p (mode, XEXP (op, 0));
})
-;; Accept REG and any CONST_INT that can be moved in one instruction
-;; into a general register.
+;; True iff OP is not a symbolic memory operand.
-(define_predicate "reg_or_cint_move_operand"
- (match_code "subreg,reg,const_int")
+(define_predicate "nonsymb_mem_operand"
+ (match_code "subreg,mem")
{
- if (register_operand (op, mode))
- return 1;
+ if (GET_CODE (op) == SUBREG)
+ op = SUBREG_REG (op);
- return (GET_CODE (op) == CONST_INT && cint_ok_for_move (INTVAL (op)));
+ if (! MEM_P (op))
+ return false;
+
+ /* Until problems with management of the REG_POINTER flag are resolved,
+ we need to delay creating move insns with unscaled indexed addresses
+ until CSE is not expected. */
+ if (!TARGET_NO_SPACE_REGS
+ && !cse_not_expected
+ && GET_CODE (XEXP (op, 0)) == PLUS
+ && REG_P (XEXP (XEXP (op, 0), 0))
+ && REG_P (XEXP (XEXP (op, 0), 1)))
+ return false;
+
+ return (!symbolic_memory_operand (op, mode)
+ && memory_address_p (mode, XEXP (op, 0)));
})
-;; TODO: Add a comment here.
+;; True iff OP is anything other than a hard register.
+(define_predicate "non_hard_reg_operand"
+ (match_test "! (REG_P (op) && REGNO (op) < FIRST_PSEUDO_REGISTER)"))
+
+;; True iff OP is a reference to a label whose address can be loaded
+;; while generating PIC code.
+
(define_predicate "pic_label_operand"
(match_code "label_ref,const")
{
if (!flag_pic)
- return 0;
+ return false;
switch (GET_CODE (op))
{
case LABEL_REF:
- return 1;
+ return true;
case CONST:
op = XEXP (op, 0);
return (GET_CODE (XEXP (op, 0)) == LABEL_REF
- && GET_CODE (XEXP (op, 1)) == CONST_INT);
+ && CONST_INT_P (XEXP (op, 1)));
default:
- return 0;
+ gcc_unreachable ();
}
+ return false;
})
-;; TODO: Add a comment here.
+;; True iff the operand OP lives in text space. OP is a symbolic operand.
+;; If so, SYMBOL_REF_FLAG, which is set by pa_encode_section_info, is true.
-(define_predicate "fp_reg_operand"
- (match_code "reg")
+(define_special_predicate "read_only_operand"
+ (match_test "true")
{
- return reg_renumber && FP_REG_P (op);
+ if (GET_CODE (op) == CONST)
+ op = XEXP (XEXP (op, 0), 0);
+ if (GET_CODE (op) == SYMBOL_REF)
+ {
+ if (flag_pic)
+ return SYMBOL_REF_FLAG (op) && !CONSTANT_POOL_ADDRESS_P (op);
+ else
+ return SYMBOL_REF_FLAG (op) || CONSTANT_POOL_ADDRESS_P (op);
+ }
+ return true;
})
-;; Return truth value of whether OP can be used as an operand in a
-;; three operand arithmetic insn that accepts registers of mode MODE
-;; or 14-bit signed integers.
+;; True iff the operand is a register operand, or a non-symbolic
+;; memory operand after reload. A SUBREG is not accepted since it
+;; will need a reload.
+;;
+;; This predicate is used for branch patterns that internally handle
+;; register reloading. We need to accept non-symbolic memory operands
+;; after reload to ensure that the pattern is still valid if reload
+;; didn't find a hard register for the operand.
-(define_predicate "arith_operand"
- (match_code "subreg,reg,const_int")
+(define_predicate "reg_before_reload_operand"
+ (match_code "reg,mem")
{
- return (register_operand (op, mode)
- || (GET_CODE (op) == CONST_INT && INT_14_BITS (op)));
-})
+ if (register_operand (op, mode))
+ return true;
-;; Return truth value of whether OP can be used as an operand in a
-;; three operand arithmetic insn that accepts registers of mode MODE
-;; or 11-bit signed integers.
+ if (reload_completed
+ && memory_operand (op, mode)
+ && !symbolic_memory_operand (op, mode))
+ return true;
-(define_predicate "arith11_operand"
- (match_code "subreg,reg,const_int")
-{
- return (register_operand (op, mode)
- || (GET_CODE (op) == CONST_INT && INT_11_BITS (op)));
+ return false;
})
-;; A constant integer suitable for use in a PRE_MODIFY memory
-;; reference.
+;; True iff OP is a register or const_0 operand for MODE.
-(define_predicate "pre_cint_operand"
- (match_code "const_int")
-{
- return (GET_CODE (op) == CONST_INT
- && INTVAL (op) >= -0x2000 && INTVAL (op) < 0x10);
-})
+(define_predicate "reg_or_0_operand"
+ (ior (match_operand 0 "register_operand")
+ (match_operand 0 "const_0_operand")))
-;; A constant integer suitable for use in a POST_MODIFY memory
-;; reference.
+;; True iff OP is either a register, zero, or a non-symbolic memory operand.
-(define_predicate "post_cint_operand"
- (match_code "const_int")
-{
- return (GET_CODE (op) == CONST_INT
- && INTVAL (op) < 0x2000 && INTVAL (op) >= -0x10);
-})
+(define_predicate "reg_or_0_or_nonsymb_mem_operand"
+ (ior (match_operand 0 "reg_or_0_operand")
+ (match_operand 0 "nonsymb_mem_operand")))
-;; TODO: Add a comment here.
+;; Accept REG and any CONST_INT that can be moved in one instruction
+;; into a general register.
-(define_predicate "arith_double_operand"
- (match_code "subreg,reg,const_double")
-{
- return (register_operand (op, mode)
- || (GET_CODE (op) == CONST_DOUBLE
- && GET_MODE (op) == mode
- && VAL_14_BITS_P (CONST_DOUBLE_LOW (op))
- && ((CONST_DOUBLE_HIGH (op) >= 0)
- == ((CONST_DOUBLE_LOW (op) & 0x1000) == 0))));
-})
+(define_predicate "reg_or_cint_move_operand"
+ (ior (match_operand 0 "register_operand")
+ (match_operand 0 "cint_move_operand")))
-;; Return truth value of whether OP is an integer which fits the range
-;; constraining immediate operands in three-address insns, or is an
-;; integer register.
-
-(define_predicate "ireg_or_int5_operand"
- (match_code "const_int,reg")
-{
- return ((GET_CODE (op) == CONST_INT && INT_5_BITS (op))
- || (GET_CODE (op) == REG && REGNO (op) > 0 && REGNO (op) < 32));
-})
-
-;; Return truth value of whether OP is an integer which fits the range
-;; constraining immediate operands in three-address insns.
-
-(define_predicate "int5_operand"
- (match_code "const_int")
-{
- return (GET_CODE (op) == CONST_INT && INT_5_BITS (op));
-})
-
-;; Return truth value of whether OP is an integer which fits the range
-;; constraining immediate operands in three-address insns.
-
-(define_predicate "uint5_operand"
- (match_code "const_int")
-{
- return (GET_CODE (op) == CONST_INT && INT_U5_BITS (op));
-})
-
-;; Return truth value of whether OP is an integer which fits the range
-;; constraining immediate operands in three-address insns.
-
-(define_predicate "int11_operand"
- (match_code "const_int")
-{
- return (GET_CODE (op) == CONST_INT && INT_11_BITS (op));
-})
-
-;; Return truth value of whether OP is an integer which fits the range
-;; constraining immediate operands in three-address insns.
-
-(define_predicate "uint32_operand"
- (match_code "const_int,const_double")
-{
-#if HOST_BITS_PER_WIDE_INT > 32
- /* All allowed constants will fit a CONST_INT. */
- return (GET_CODE (op) == CONST_INT
- && (INTVAL (op) >= 0 && INTVAL (op) < (HOST_WIDE_INT) 1 << 32));
-#else
- return (GET_CODE (op) == CONST_INT
- || (GET_CODE (op) == CONST_DOUBLE
- && CONST_DOUBLE_HIGH (op) == 0));
-#endif
-})
-
-;; Return truth value of whether OP is an integer which fits the range
-;; constraining immediate operands in three-address insns.
-
-(define_predicate "arith5_operand"
- (match_code "subreg,reg,const_int")
-{
- return register_operand (op, mode) || int5_operand (op, mode);
-})
-
-;; True iff depi or extru can be used to compute (reg & OP).
-
-(define_predicate "and_operand"
- (match_code "subreg,reg,const_int")
-{
- return (register_operand (op, mode)
- || (GET_CODE (op) == CONST_INT && and_mask_p (INTVAL (op))));
-})
-
;; True iff OP can be used to compute (reg | OP).
-(define_predicate "reg_or_ior_operand"
- (match_code "subreg,reg,const_int")
-{
- return (register_operand (op, mode)
- || (GET_CODE (op) == CONST_INT && ior_mask_p (INTVAL (op))));
-})
+(define_predicate "reg_or_cint_ior_operand"
+ (ior (match_operand 0 "register_operand")
+ (match_operand 0 "cint_ior_operand")))
-;; True iff depi can be used to compute (reg | OP).
+;; Return 1 if OP is a CONST_INT with the value 2, 4, or 8. These are
+;; the valid constants for shadd instructions.
-(define_predicate "ior_operand"
- (match_code "const_int")
-{
- return (GET_CODE (op) == CONST_INT && ior_mask_p (INTVAL (op)));
-})
+(define_predicate "shadd_operand"
+ (and (match_code "const_int")
+ (match_test "shadd_constant_p (INTVAL (op))")))
-;; True iff OP is a CONST_INT of the forms 0...0xxxx or
-;; 0...01...1xxxx. Such values can be the left hand side x in (x <<
-;; r), using the zvdepi instruction.
+;; Return truth value of statement that OP is a symbolic memory operand.
-(define_predicate "lhs_lshift_cint_operand"
- (match_code "const_int")
+(define_predicate "symbolic_memory_operand"
+ (match_code "subreg,mem")
{
- unsigned HOST_WIDE_INT x;
- if (GET_CODE (op) != CONST_INT)
- return 0;
- x = INTVAL (op) >> 4;
- return (x & (x + 1)) == 0;
+ if (GET_CODE (op) == SUBREG)
+ op = SUBREG_REG (op);
+ if (!MEM_P (op))
+ return false;
+ return symbolic_expression_p (XEXP (op, 0));
})
-;; TODO: Add a comment here.
+;; True iff OP is a symbolic operand.
+;; Note: an inline copy of this code is present in pa_secondary_reload.
-(define_predicate "lhs_lshift_operand"
- (match_code "subreg,reg,const_int")
+(define_predicate "symbolic_operand"
+ (match_code "symbol_ref,label_ref,const")
{
- return register_operand (op, mode) || lhs_lshift_cint_operand (op, mode);
+ switch (GET_CODE (op))
+ {
+ case SYMBOL_REF:
+ return !SYMBOL_REF_TLS_MODEL (op);
+ case LABEL_REF:
+ return true;
+ case CONST:
+ op = XEXP (op, 0);
+ return (GET_CODE (op) == PLUS
+ && ((GET_CODE (XEXP (op, 0)) == SYMBOL_REF
+ && !SYMBOL_REF_TLS_MODEL (XEXP (op, 0)))
+ || GET_CODE (XEXP (op, 0)) == LABEL_REF)
+ && GET_CODE (XEXP (op, 1)) == CONST_INT);
+ default:
+ gcc_unreachable ();
+ }
+ return true;
})
-;; TODO: Add a comment here.
+;; Return true if OP is a symbolic operand for the TLS Global Dynamic model.
-(define_predicate "arith32_operand"
- (match_code "subreg,reg,const_int")
-{
- return register_operand (op, mode) || GET_CODE (op) == CONST_INT;
-})
+(define_predicate "tgd_symbolic_operand"
+ (and (match_code "symbol_ref")
+ (match_test "SYMBOL_REF_TLS_MODEL (op) == TLS_MODEL_GLOBAL_DYNAMIC")))
-;; TODO: Add a comment here.
+;; Return true if OP is a symbolic operand for the TLS Local Dynamic model.
-(define_predicate "pc_or_label_operand"
- (match_code "pc,label_ref")
-{
- return (GET_CODE (op) == PC || GET_CODE (op) == LABEL_REF);
-})
+(define_predicate "tld_symbolic_operand"
+ (and (match_code "symbol_ref")
+ (match_test "SYMBOL_REF_TLS_MODEL (op) == TLS_MODEL_LOCAL_DYNAMIC")))
-;; TODO: Add a comment here.
+;; Return true if OP is a symbolic operand for the TLS Initial Exec model.
-(define_predicate "plus_xor_ior_operator"
- (match_code "plus,xor,ior")
-{
- return (GET_CODE (op) == PLUS || GET_CODE (op) == XOR
- || GET_CODE (op) == IOR);
-})
+(define_predicate "tie_symbolic_operand"
+ (and (match_code "symbol_ref")
+ (match_test "SYMBOL_REF_TLS_MODEL (op) == TLS_MODEL_INITIAL_EXEC")))
-;; Return 1 if OP is a CONST_INT with the value 2, 4, or 8. These are
-;; the valid constant for shadd instructions.
+;; Return true if OP is a symbolic operand for the TLS Local Exec model.
-(define_predicate "shadd_operand"
- (match_code "const_int")
-{
- return (GET_CODE (op) == CONST_INT && shadd_constant_p (INTVAL (op)));
-})
+(define_predicate "tle_symbolic_operand"
+ (and (match_code "symbol_ref")
+ (match_test "SYMBOL_REF_TLS_MODEL (op) == TLS_MODEL_LOCAL_EXEC")))
-;; TODO: Add a comment here.
-
-(define_predicate "div_operand"
- (match_code "reg,const_int")
-{
- return (mode == SImode
- && ((GET_CODE (op) == REG && REGNO (op) == 25)
- || (GET_CODE (op) == CONST_INT && INTVAL (op) > 0
- && INTVAL (op) < 16 && magic_milli[INTVAL (op)])));
-})
-
-;; Return nonzero if OP is an integer register, else return zero.
-
-(define_predicate "ireg_operand"
- (match_code "reg")
-{
- return (GET_CODE (op) == REG && REGNO (op) > 0 && REGNO (op) < 32);
-})
-
-;; Return 1 if this is a comparison operator. This allows the use of
+;; True iff this is a comparison operator. This allows the use of
;; MATCH_OPERATOR to recognize all the branch insns.
(define_predicate "cmpib_comparison_operator"
- (match_code "eq,ne,lt,le,leu,gt,gtu,ge")
-{
- return ((mode == VOIDmode || GET_MODE (op) == mode)
- && (GET_CODE (op) == EQ
- || GET_CODE (op) == NE
- || GET_CODE (op) == GT
- || GET_CODE (op) == GTU
- || GET_CODE (op) == GE
- || GET_CODE (op) == LT
- || GET_CODE (op) == LE
- || GET_CODE (op) == LEU));
-})
+ (match_code "eq,ne,lt,le,leu,gt,gtu,ge"))
-;; Return 1 if OP is an operator suitable for use in a movb
-;; instruction.
+;; True iff OP is an operator suitable for use in a movb instruction.
(define_predicate "movb_comparison_operator"
- (match_code "eq,ne,lt,ge")
-{
- return (GET_CODE (op) == EQ || GET_CODE (op) == NE
- || GET_CODE (op) == LT || GET_CODE (op) == GE);
-})
+ (match_code "eq,ne,lt,ge"))
+
+;; True iff OP is a PLUS, XOR or IOR operator.
+
+(define_predicate "plus_xor_ior_operator"
+ (match_code "plus,xor,ior"))
Index: config/pa/pa.md
===================================================================
--- config/pa/pa.md (revision 172401)
+++ config/pa/pa.md (working copy)
@@ -106,11 +106,11 @@
(const_int 8) (const_int 4))
(eq_attr "type" "binary,shift,nullshift")
- (if_then_else (match_operand 2 "arith_operand" "")
+ (if_then_else (match_operand 2 "arith14_operand" "")
(const_int 4) (const_int 12))
(eq_attr "type" "move,unary,shift,nullshift")
- (if_then_else (match_operand 1 "arith_operand" "")
+ (if_then_else (match_operand 1 "arith14_operand" "")
(const_int 4) (const_int 8))]
(const_int 4)))
@@ -3063,7 +3063,7 @@
(clobber (match_dup 6))
(clobber (match_dup 7))
(clobber (match_dup 8))
- (use (match_operand:SI 2 "arith_operand" ""))
+ (use (match_operand:SI 2 "arith14_operand" ""))
(use (match_operand:SI 3 "const_int_operand" ""))])]
"!TARGET_64BIT && optimize > 0"
"
@@ -3143,7 +3143,7 @@
(clobber (match_operand:SI 6 "register_operand" "=&r,&r")) ;item tmp2
(clobber (match_operand:SI 7 "register_operand" "=&r,&r")) ;item tmp3
(clobber (match_operand:SI 8 "register_operand" "=&r,&r")) ;item tmp4
- (use (match_operand:SI 4 "arith_operand" "J,2")) ;byte count
+ (use (match_operand:SI 4 "arith14_operand" "J,2")) ;byte count
(use (match_operand:SI 5 "const_int_operand" "n,n"))] ;alignment
"!TARGET_64BIT"
"#"
@@ -3157,7 +3157,7 @@
(clobber (match_operand:SI 6 "register_operand" ""))
(clobber (match_operand:SI 7 "register_operand" ""))
(clobber (match_operand:SI 8 "register_operand" ""))
- (use (match_operand:SI 4 "arith_operand" ""))
+ (use (match_operand:SI 4 "arith14_operand" ""))
(use (match_operand:SI 5 "const_int_operand" ""))])]
"!TARGET_64BIT && reload_completed && !flag_peephole2
&& GET_CODE (operands[0]) == MEM
@@ -3191,7 +3191,7 @@
(clobber (match_operand:SI 6 "register_operand" ""))
(clobber (match_operand:SI 7 "register_operand" ""))
(clobber (match_operand:SI 8 "register_operand" ""))
- (use (match_operand:SI 4 "arith_operand" ""))
+ (use (match_operand:SI 4 "arith14_operand" ""))
(use (match_operand:SI 5 "const_int_operand" ""))])]
"!TARGET_64BIT
&& GET_CODE (operands[0]) == MEM
@@ -3236,7 +3236,7 @@
(clobber (match_operand:SI 6 "register_operand" "=&r,&r")) ;item tmp2
(clobber (match_dup 0))
(clobber (match_dup 1))
- (use (match_operand:SI 4 "arith_operand" "J,2")) ;byte count
+ (use (match_operand:SI 4 "arith14_operand" "J,2")) ;byte count
(use (match_operand:SI 5 "const_int_operand" "n,n")) ;alignment
(const_int 0)]
"!TARGET_64BIT && reload_completed"
@@ -3251,7 +3251,7 @@
(clobber (match_dup 6))
(clobber (match_dup 7))
(clobber (match_dup 8))
- (use (match_operand:DI 2 "arith_operand" ""))
+ (use (match_operand:DI 2 "arith14_operand" ""))
(use (match_operand:DI 3 "const_int_operand" ""))])]
"TARGET_64BIT && optimize > 0"
"
@@ -3331,7 +3331,7 @@
(clobber (match_operand:DI 6 "register_operand" "=&r,&r")) ;item tmp2
(clobber (match_operand:DI 7 "register_operand" "=&r,&r")) ;item tmp3
(clobber (match_operand:DI 8 "register_operand" "=&r,&r")) ;item tmp4
- (use (match_operand:DI 4 "arith_operand" "J,2")) ;byte count
+ (use (match_operand:DI 4 "arith14_operand" "J,2")) ;byte count
(use (match_operand:DI 5 "const_int_operand" "n,n"))] ;alignment
"TARGET_64BIT"
"#"
@@ -3345,7 +3345,7 @@
(clobber (match_operand:DI 6 "register_operand" ""))
(clobber (match_operand:DI 7 "register_operand" ""))
(clobber (match_operand:DI 8 "register_operand" ""))
- (use (match_operand:DI 4 "arith_operand" ""))
+ (use (match_operand:DI 4 "arith14_operand" ""))
(use (match_operand:DI 5 "const_int_operand" ""))])]
"TARGET_64BIT && reload_completed && !flag_peephole2
&& GET_CODE (operands[0]) == MEM
@@ -3379,7 +3379,7 @@
(clobber (match_operand:DI 6 "register_operand" ""))
(clobber (match_operand:DI 7 "register_operand" ""))
(clobber (match_operand:DI 8 "register_operand" ""))
- (use (match_operand:DI 4 "arith_operand" ""))
+ (use (match_operand:DI 4 "arith14_operand" ""))
(use (match_operand:DI 5 "const_int_operand" ""))])]
"TARGET_64BIT
&& GET_CODE (operands[0]) == MEM
@@ -3424,7 +3424,7 @@
(clobber (match_operand:DI 6 "register_operand" "=&r,&r")) ;item tmp2
(clobber (match_dup 0))
(clobber (match_dup 1))
- (use (match_operand:DI 4 "arith_operand" "J,2")) ;byte count
+ (use (match_operand:DI 4 "arith14_operand" "J,2")) ;byte count
(use (match_operand:DI 5 "const_int_operand" "n,n")) ;alignment
(const_int 0)]
"TARGET_64BIT && reload_completed"
@@ -3436,7 +3436,7 @@
(match_operand 2 "const_int_operand" ""))
(clobber (match_dup 4))
(clobber (match_dup 5))
- (use (match_operand:SI 1 "arith_operand" ""))
+ (use (match_operand:SI 1 "arith14_operand" ""))
(use (match_operand:SI 3 "const_int_operand" ""))])]
"!TARGET_64BIT && optimize > 0"
"
@@ -3476,7 +3476,7 @@
(const_int 0))
(clobber (match_operand:SI 1 "register_operand" "=&r,&r")) ;loop cnt/tmp
(clobber (match_operand:SI 4 "register_operand" "=&r,&r")) ;tmp1
- (use (match_operand:SI 2 "arith_operand" "J,1")) ;byte count
+ (use (match_operand:SI 2 "arith14_operand" "J,1")) ;byte count
(use (match_operand:SI 3 "const_int_operand" "n,n"))] ;alignment
"!TARGET_64BIT"
"#"
@@ -3487,7 +3487,7 @@
(const_int 0))
(clobber (match_operand:SI 1 "register_operand" ""))
(clobber (match_operand:SI 4 "register_operand" ""))
- (use (match_operand:SI 2 "arith_operand" ""))
+ (use (match_operand:SI 2 "arith14_operand" ""))
(use (match_operand:SI 3 "const_int_operand" ""))])]
"!TARGET_64BIT && reload_completed && !flag_peephole2
&& GET_CODE (operands[0]) == MEM
@@ -3510,7 +3510,7 @@
(const_int 0))
(clobber (match_operand:SI 1 "register_operand" ""))
(clobber (match_operand:SI 4 "register_operand" ""))
- (use (match_operand:SI 2 "arith_operand" ""))
+ (use (match_operand:SI 2 "arith14_operand" ""))
(use (match_operand:SI 3 "const_int_operand" ""))])]
"!TARGET_64BIT
&& GET_CODE (operands[0]) == MEM
@@ -3538,7 +3538,7 @@
(const_int 0))
(clobber (match_operand:SI 1 "register_operand" "=&r,&r")) ;loop cnt/tmp
(clobber (match_dup 0))
- (use (match_operand:SI 2 "arith_operand" "J,1")) ;byte count
+ (use (match_operand:SI 2 "arith14_operand" "J,1")) ;byte count
(use (match_operand:SI 3 "const_int_operand" "n,n")) ;alignment
(const_int 0)]
"!TARGET_64BIT && reload_completed"
@@ -3550,7 +3550,7 @@
(match_operand 2 "const_int_operand" ""))
(clobber (match_dup 4))
(clobber (match_dup 5))
- (use (match_operand:DI 1 "arith_operand" ""))
+ (use (match_operand:DI 1 "arith14_operand" ""))
(use (match_operand:DI 3 "const_int_operand" ""))])]
"TARGET_64BIT && optimize > 0"
"
@@ -3590,7 +3590,7 @@
(const_int 0))
(clobber (match_operand:DI 1 "register_operand" "=&r,&r")) ;loop cnt/tmp
(clobber (match_operand:DI 4 "register_operand" "=&r,&r")) ;item tmp1
- (use (match_operand:DI 2 "arith_operand" "J,1")) ;byte count
+ (use (match_operand:DI 2 "arith14_operand" "J,1")) ;byte count
(use (match_operand:DI 3 "const_int_operand" "n,n"))] ;alignment
"TARGET_64BIT"
"#"
@@ -3601,7 +3601,7 @@
(const_int 0))
(clobber (match_operand:DI 1 "register_operand" ""))
(clobber (match_operand:DI 4 "register_operand" ""))
- (use (match_operand:DI 2 "arith_operand" ""))
+ (use (match_operand:DI 2 "arith14_operand" ""))
(use (match_operand:DI 3 "const_int_operand" ""))])]
"TARGET_64BIT && reload_completed && !flag_peephole2
&& GET_CODE (operands[0]) == MEM
@@ -3624,7 +3624,7 @@
(const_int 0))
(clobber (match_operand:DI 1 "register_operand" ""))
(clobber (match_operand:DI 4 "register_operand" ""))
- (use (match_operand:DI 2 "arith_operand" ""))
+ (use (match_operand:DI 2 "arith14_operand" ""))
(use (match_operand:DI 3 "const_int_operand" ""))])]
"TARGET_64BIT
&& GET_CODE (operands[0]) == MEM
@@ -3652,7 +3652,7 @@
(const_int 0))
(clobber (match_operand:DI 1 "register_operand" "=&r,&r")) ;loop cnt/tmp
(clobber (match_dup 0))
- (use (match_operand:DI 2 "arith_operand" "J,1")) ;byte count
+ (use (match_operand:DI 2 "arith14_operand" "J,1")) ;byte count
(use (match_operand:DI 3 "const_int_operand" "n,n")) ;alignment
(const_int 0)]
"TARGET_64BIT && reload_completed"
@@ -4941,7 +4941,7 @@
(define_insn ""
[(set (match_operand:DI 0 "register_operand" "=r,r")
(plus:DI (match_operand:DI 1 "register_operand" "%r,r")
- (match_operand:DI 2 "arith_operand" "r,J")))]
+ (match_operand:DI 2 "arith14_operand" "r,J")))]
"TARGET_64BIT"
"@
add,l %1,%2,%0
@@ -5089,7 +5089,7 @@
(define_insn "addsi3"
[(set (match_operand:SI 0 "register_operand" "=r,r")
(plus:SI (match_operand:SI 1 "register_operand" "%r,r")
- (match_operand:SI 2 "arith_operand" "r,J")))]
+ (match_operand:SI 2 "arith14_operand" "r,J")))]
""
"@
{addl|add,l} %1,%2,%0
@@ -5686,7 +5686,7 @@
(define_expand "iordi3"
[(set (match_operand:DI 0 "register_operand" "")
(ior:DI (match_operand:DI 1 "register_operand" "")
- (match_operand:DI 2 "reg_or_ior_operand" "")))]
+ (match_operand:DI 2 "reg_or_cint_ior_operand" "")))]
""
"
{
@@ -5707,7 +5707,7 @@
(define_insn ""
[(set (match_operand:DI 0 "register_operand" "=r,r")
(ior:DI (match_operand:DI 1 "register_operand" "0,0")
- (match_operand:DI 2 "ior_operand" "M,i")))]
+ (match_operand:DI 2 "cint_ior_operand" "M,i")))]
"TARGET_64BIT"
"* return output_64bit_ior (operands); "
[(set_attr "type" "binary,shift")
@@ -5726,14 +5726,14 @@
(define_expand "iorsi3"
[(set (match_operand:SI 0 "register_operand" "")
(ior:SI (match_operand:SI 1 "register_operand" "")
- (match_operand:SI 2 "reg_or_ior_operand" "")))]
+ (match_operand:SI 2 "reg_or_cint_ior_operand" "")))]
""
"")
(define_insn ""
[(set (match_operand:SI 0 "register_operand" "=r,r")
(ior:SI (match_operand:SI 1 "register_operand" "0,0")
- (match_operand:SI 2 "ior_operand" "M,i")))]
+ (match_operand:SI 2 "cint_ior_operand" "M,i")))]
""
"* return output_ior (operands); "
[(set_attr "type" "binary,shift")
Index: config/pa/pa-protos.h
===================================================================
--- config/pa/pa-protos.h (revision 172401)
+++ config/pa/pa-protos.h (working copy)
@@ -21,14 +21,10 @@
#ifdef RTX_CODE
/* Prototype function used in various macros. */
-extern int symbolic_operand (rtx, enum machine_mode);
-extern int tls_symbolic_operand (rtx);
extern rtx pa_eh_return_handler_rtx (void);
/* Used in insn-*.c. */
extern int following_call (rtx);
-extern int function_label_operand (rtx, enum machine_mode);
-extern int lhs_lshift_cint_operand (rtx, enum machine_mode);
/* Define functions in pa.c and used in insn-output.c. */
@@ -58,44 +54,11 @@
extern void print_operand (FILE *, rtx, int);
extern rtx legitimize_pic_address (rtx, enum machine_mode, rtx);
extern void hppa_encode_label (rtx);
-extern int arith11_operand (rtx, enum machine_mode);
-extern int adddi3_operand (rtx, enum machine_mode);
-extern int indexed_memory_operand (rtx, enum machine_mode);
extern int symbolic_expression_p (rtx);
-extern int symbolic_memory_operand (rtx, enum machine_mode);
extern bool pa_tls_referenced_p (rtx);
extern int pa_adjust_insn_length (rtx, int);
-extern int int11_operand (rtx, enum machine_mode);
-extern int reg_or_cint_move_operand (rtx, enum machine_mode);
-extern int arith5_operand (rtx, enum machine_mode);
-extern int uint5_operand (rtx, enum machine_mode);
-extern int pic_label_operand (rtx, enum machine_mode);
-extern int plus_xor_ior_operator (rtx, enum machine_mode);
-extern int borx_reg_operand (rtx, enum machine_mode);
-extern int shadd_operand (rtx, enum machine_mode);
-extern int arith_operand (rtx, enum machine_mode);
-extern int read_only_operand (rtx, enum machine_mode);
-extern int move_dest_operand (rtx, enum machine_mode);
-extern int move_src_operand (rtx, enum machine_mode);
-extern int prefetch_cc_operand (rtx, enum machine_mode);
-extern int prefetch_nocc_operand (rtx, enum machine_mode);
-extern int and_operand (rtx, enum machine_mode);
-extern int ior_operand (rtx, enum machine_mode);
-extern int arith32_operand (rtx, enum machine_mode);
-extern int uint32_operand (rtx, enum machine_mode);
-extern int reg_before_reload_operand (rtx, enum machine_mode);
-extern int reg_or_0_operand (rtx, enum machine_mode);
-extern int reg_or_0_or_nonsymb_mem_operand (rtx, enum machine_mode);
-extern int pre_cint_operand (rtx, enum machine_mode);
-extern int post_cint_operand (rtx, enum machine_mode);
-extern int div_operand (rtx, enum machine_mode);
-extern int int5_operand (rtx, enum machine_mode);
-extern int movb_comparison_operator (rtx, enum machine_mode);
-extern int ireg_or_int5_operand (rtx, enum machine_mode);
extern int fmpyaddoperands (rtx *);
extern int fmpysuboperands (rtx *);
-extern int call_operand_address (rtx, enum machine_mode);
-extern int ior_operand (rtx, enum machine_mode);
extern void emit_bcond_fp (rtx[]);
extern int emit_move_sequence (rtx *, enum machine_mode, rtx);
extern int emit_hpdiv_const (rtx *, int);
@@ -111,24 +74,16 @@
extern struct rtx_def *return_addr_rtx (int, rtx);
-extern int fp_reg_operand (rtx, enum machine_mode);
-extern int arith_double_operand (rtx, enum machine_mode);
-extern int ireg_operand (rtx, enum machine_mode);
-extern int lhs_lshift_operand (rtx, enum machine_mode);
-extern int pc_or_label_operand (rtx, enum machine_mode);
#ifdef ARGS_SIZE_RTX
/* expr.h defines ARGS_SIZE_RTX and `enum direction' */
#ifdef TREE_CODE
extern enum direction function_arg_padding (enum machine_mode, const_tree);
#endif
#endif /* ARGS_SIZE_RTX */
-extern int non_hard_reg_operand (rtx, enum machine_mode);
-extern int eq_neq_comparison_operator (rtx, enum machine_mode);
extern int insn_refs_are_delayed (rtx);
extern rtx get_deferred_plabel (rtx);
#endif /* RTX_CODE */
-extern int integer_store_memory_operand (rtx, enum machine_mode);
extern int ldil_cint_p (HOST_WIDE_INT);
extern int zdepi_cint_p (unsigned HOST_WIDE_INT);
Index: config/pa/pa.c
===================================================================
--- config/pa/pa.c (revision 172401)
+++ config/pa/pa.c (working copy)
@@ -739,35 +739,6 @@
|| zdepi_cint_p (ival));
}
\f
-/* Return truth value of whether OP can be used as an operand in a
- adddi3 insn. */
-int
-adddi3_operand (rtx op, enum machine_mode mode)
-{
- return (register_operand (op, mode)
- || (GET_CODE (op) == CONST_INT
- && (TARGET_64BIT ? INT_14_BITS (op) : INT_11_BITS (op))));
-}
-
-/* True iff the operand OP can be used as the destination operand of
- an integer store. This also implies the operand could be used as
- the source operand of an integer load. Symbolic, lo_sum and indexed
- memory operands are not allowed. We accept reloading pseudos and
- other memory operands. */
-int
-integer_store_memory_operand (rtx op, enum machine_mode mode)
-{
- return ((reload_in_progress
- && REG_P (op)
- && REGNO (op) >= FIRST_PSEUDO_REGISTER
- && reg_renumber [REGNO (op)] < 0)
- || (GET_CODE (op) == MEM
- && (reload_in_progress || memory_address_p (mode, XEXP (op, 0)))
- && !symbolic_memory_operand (op, VOIDmode)
- && !IS_LO_SUM_DLT_ADDR_P (XEXP (op, 0))
- && !IS_INDEX_ADDR_P (XEXP (op, 0))));
-}
-
/* True iff ldil can be used to load this CONST_INT. The least
significant 11 bits of the value must be zero and the value must
not change sign when extended from 32 to 64 bits. */
@@ -875,7 +846,7 @@
tmp_reg = ((reload_in_progress || reload_completed)
? reg : gen_reg_rtx (Pmode));
- if (function_label_operand (orig, mode))
+ if (function_label_operand (orig, VOIDmode))
{
/* Force function label into memory in word mode. */
orig = XEXP (force_const_mem (word_mode, orig), 0);
@@ -1937,7 +1908,7 @@
not consider them legitimate constants. Loop optimizations can
call the emit_move_xxx with one as a source. */
if ((GET_CODE (operand1) != HIGH && immediate_operand (operand1, mode))
- || function_label_operand (operand1, mode)
+ || function_label_operand (operand1, VOIDmode)
|| (GET_CODE (operand1) == HIGH
&& symbolic_operand (XEXP (operand1, 0), mode)))
{
@@ -1957,8 +1928,9 @@
the memory location, then add in the constant part. */
if ((GET_CODE (operand1) == CONST
&& GET_CODE (XEXP (operand1, 0)) == PLUS
- && function_label_operand (XEXP (XEXP (operand1, 0), 0), Pmode))
- || function_label_operand (operand1, mode))
+ && function_label_operand (XEXP (XEXP (operand1, 0), 0),
+ VOIDmode))
+ || function_label_operand (operand1, VOIDmode))
{
rtx temp, const_part;
@@ -2303,28 +2275,6 @@
return reloc;
}
-/* Does operand (which is a symbolic_operand) live in text space?
- If so, SYMBOL_REF_FLAG, which is set by pa_encode_section_info,
- will be true. */
-
-int
-read_only_operand (rtx operand, enum machine_mode mode ATTRIBUTE_UNUSED)
-{
- if (GET_CODE (operand) == CONST)
- operand = XEXP (XEXP (operand, 0), 0);
- if (flag_pic)
- {
- if (GET_CODE (operand) == SYMBOL_REF)
- return SYMBOL_REF_FLAG (operand) && !CONSTANT_POOL_ADDRESS_P (operand);
- }
- else
- {
- if (GET_CODE (operand) == SYMBOL_REF)
- return SYMBOL_REF_FLAG (operand) || CONSTANT_POOL_ADDRESS_P (operand);
- }
- return 1;
-}
-
\f
/* Return the best assembler insn template
for moving operands[1] into operands[0] as a fullword. */
@@ -8190,12 +8140,6 @@
return str;
}
-int
-function_label_operand (rtx op, enum machine_mode mode ATTRIBUTE_UNUSED)
-{
- return GET_CODE (op) == SYMBOL_REF && FUNCTION_NAME_P (XSTR (op, 0));
-}
-
/* Returns 1 if OP is a function label involved in a simple addition
with a constant. Used to keep certain patterns from matching
during instruction combination. */
@@ -8207,7 +8151,7 @@
op = XEXP (op, 0);
return (GET_CODE (op) == PLUS
- && function_label_operand (XEXP (op, 0), Pmode)
+ && function_label_operand (XEXP (op, 0), VOIDmode)
&& GET_CODE (XEXP (op, 1)) == CONST_INT);
}
@@ -8769,43 +8713,6 @@
return 0;
}
-/* Return 1 if OP is valid as a base or index register in a
- REG+REG address. */
-
-int
-borx_reg_operand (rtx op, enum machine_mode mode)
-{
- if (GET_CODE (op) != REG)
- return 0;
-
- /* We must reject virtual registers as the only expressions that
- can be instantiated are REG and REG+CONST. */
- if (op == virtual_incoming_args_rtx
- || op == virtual_stack_vars_rtx
- || op == virtual_stack_dynamic_rtx
- || op == virtual_outgoing_args_rtx
- || op == virtual_cfa_rtx)
- return 0;
-
- /* While it's always safe to index off the frame pointer, it's not
- profitable to do so when the frame pointer is being eliminated. */
- if (!reload_completed
- && flag_omit_frame_pointer
- && !cfun->calls_alloca
- && op == frame_pointer_rtx)
- return 0;
-
- return register_operand (op, mode);
-}
-
-/* Return 1 if this operand is anything other than a hard register. */
-
-int
-non_hard_reg_operand (rtx op, enum machine_mode mode ATTRIBUTE_UNUSED)
-{
- return ! (GET_CODE (op) == REG && REGNO (op) < FIRST_PSEUDO_REGISTER);
-}
-
/* Return TRUE if INSN branches forward. */
static bool
@@ -8830,13 +8737,6 @@
return false;
}
-/* Return 1 if OP is an equality comparison, else return 0. */
-int
-eq_neq_comparison_operator (rtx op, enum machine_mode mode ATTRIBUTE_UNUSED)
-{
- return (GET_CODE (op) == EQ || GET_CODE (op) == NE);
-}
-
/* Return 1 if INSN is in the delay slot of a call instruction. */
int
jump_in_call_delay (rtx insn)
^ permalink raw reply [flat|nested] 5+ messages in thread