More light fallout from Uros's work. Committed to the trunk.
Jeff
commit ef9cc434a476954b5ef3493955d4e668338990c2 Author: Jeff Law <jeffreya...@gmail.com> Date: Fri Jul 2 10:37:52 2021 -0400 Fix frv target specific fallout from recent int->bool changes gcc/ChangeLog * config/frv/frv-protos.h (integer_register_operand): Adjust return type. (frv_load_operand, gpr_or_fpr_operand, gpr_no_subreg_operand): Likewise. (fpr_or_int6_operand, gpr_or_int_operand); Likewise. (gpr_or_int12_operand, gpr_or_int10_operand); Likewise. (move_source_operand, move_destination_operand): Likewise. (condexec_source_operand, condexec_dest_operand): Likewise. (lr_operand, gpr_or_memory_operand, fpr_or_memory_operand): Likewise. (reg_or_0_operand, fcc_operand, icc_operand, cc_operand): Likewise. (fcr_operand, icr_operand, cr_operand, call_operand): Likewise. (fpr_operand, even_reg_operand, odd_reg_operand): Likewise. (even_gpr_operand, odd_gpr_operand, quad_fpr_operand): Likewise. (even_fpr_operand, odd_fpr_operand): Likewise. (dbl_memory_one_insn_operand, dbl_memory_two_insn_operand): Likewise. (int12_operand, int6_operand, int5_operand, uint5_operand): Likewise. (uint4_operand, uint1_operand, int_2word_operand): Likewise (upper_int16_operand, uint16_operand, symbolic_operand): Likewise. (relational_operator, float_relational_operator): Likewise. (ccr_eqne_operator, minmax_operator): Likewise. (condexec_si_binary_operator, condexec_si_media_operator): Likewise. (condexec_si_divide_operator, condexec_si_unary_operator): Likewise. (condexec_sf_conv_operator, condexec_sf_add_operator): Likewise. (intop_compare_operator, acc_operand, even_acc_operand): Likewise. (quad_acc_operand, accg_operand): Likewise. diff --git a/gcc/config/frv/frv-protos.h b/gcc/config/frv/frv-protos.h index 8d79d73f6e0..29d4425c8bb 100644 --- a/gcc/config/frv/frv-protos.h +++ b/gcc/config/frv/frv-protos.h @@ -89,73 +89,73 @@ extern int frv_adjust_field_align (tree, int); #endif #ifdef RTX_CODE -extern int integer_register_operand (rtx, machine_mode); -extern int frv_load_operand (rtx, machine_mode); -extern int gpr_or_fpr_operand (rtx, machine_mode); -extern int gpr_no_subreg_operand (rtx, machine_mode); +extern bool integer_register_operand (rtx, machine_mode); +extern bool frv_load_operand (rtx, machine_mode); +extern bool gpr_or_fpr_operand (rtx, machine_mode); +extern bool gpr_no_subreg_operand (rtx, machine_mode); extern int gpr_or_int6_operand (rtx, machine_mode); -extern int fpr_or_int6_operand (rtx, machine_mode); -extern int gpr_or_int_operand (rtx, machine_mode); -extern int gpr_or_int12_operand (rtx, machine_mode); -extern int gpr_fpr_or_int12_operand (rtx, machine_mode); -extern int gpr_or_int10_operand (rtx, machine_mode); -extern int move_source_operand (rtx, machine_mode); -extern int move_destination_operand (rtx, machine_mode); -extern int condexec_source_operand (rtx, machine_mode); -extern int condexec_dest_operand (rtx, machine_mode); -extern int lr_operand (rtx, machine_mode); -extern int gpr_or_memory_operand (rtx, machine_mode); -extern int fpr_or_memory_operand (rtx, machine_mode); -extern int reg_or_0_operand (rtx, machine_mode); -extern int fcc_operand (rtx, machine_mode); -extern int icc_operand (rtx, machine_mode); -extern int cc_operand (rtx, machine_mode); -extern int fcr_operand (rtx, machine_mode); -extern int icr_operand (rtx, machine_mode); -extern int cr_operand (rtx, machine_mode); -extern int call_operand (rtx, machine_mode); -extern int fpr_operand (rtx, machine_mode); -extern int even_reg_operand (rtx, machine_mode); -extern int odd_reg_operand (rtx, machine_mode); -extern int even_gpr_operand (rtx, machine_mode); -extern int odd_gpr_operand (rtx, machine_mode); -extern int quad_fpr_operand (rtx, machine_mode); -extern int even_fpr_operand (rtx, machine_mode); -extern int odd_fpr_operand (rtx, machine_mode); -extern int dbl_memory_one_insn_operand (rtx, machine_mode); -extern int dbl_memory_two_insn_operand (rtx, machine_mode); -extern int int12_operand (rtx, machine_mode); -extern int int6_operand (rtx, machine_mode); -extern int int5_operand (rtx, machine_mode); -extern int uint5_operand (rtx, machine_mode); -extern int uint4_operand (rtx, machine_mode); -extern int uint1_operand (rtx, machine_mode); -extern int int_2word_operand (rtx, machine_mode); +extern bool fpr_or_int6_operand (rtx, machine_mode); +extern bool gpr_or_int_operand (rtx, machine_mode); +extern bool gpr_or_int12_operand (rtx, machine_mode); +extern bool gpr_fpr_or_int12_operand (rtx, machine_mode); +extern bool gpr_or_int10_operand (rtx, machine_mode); +extern bool move_source_operand (rtx, machine_mode); +extern bool move_destination_operand (rtx, machine_mode); +extern bool condexec_source_operand (rtx, machine_mode); +extern bool condexec_dest_operand (rtx, machine_mode); +extern bool lr_operand (rtx, machine_mode); +extern bool gpr_or_memory_operand (rtx, machine_mode); +extern bool fpr_or_memory_operand (rtx, machine_mode); +extern bool reg_or_0_operand (rtx, machine_mode); +extern bool fcc_operand (rtx, machine_mode); +extern bool icc_operand (rtx, machine_mode); +extern bool cc_operand (rtx, machine_mode); +extern bool fcr_operand (rtx, machine_mode); +extern bool icr_operand (rtx, machine_mode); +extern bool cr_operand (rtx, machine_mode); +extern bool call_operand (rtx, machine_mode); +extern bool fpr_operand (rtx, machine_mode); +extern bool even_reg_operand (rtx, machine_mode); +extern bool odd_reg_operand (rtx, machine_mode); +extern bool even_gpr_operand (rtx, machine_mode); +extern bool odd_gpr_operand (rtx, machine_mode); +extern bool quad_fpr_operand (rtx, machine_mode); +extern bool even_fpr_operand (rtx, machine_mode); +extern bool odd_fpr_operand (rtx, machine_mode); +extern bool dbl_memory_one_insn_operand (rtx, machine_mode); +extern bool dbl_memory_two_insn_operand (rtx, machine_mode); +extern bool int12_operand (rtx, machine_mode); +extern bool int6_operand (rtx, machine_mode); +extern bool int5_operand (rtx, machine_mode); +extern bool uint5_operand (rtx, machine_mode); +extern bool uint4_operand (rtx, machine_mode); +extern bool uint1_operand (rtx, machine_mode); +extern bool int_2word_operand (rtx, machine_mode); extern int pic_register_operand (rtx, machine_mode); extern int pic_symbolic_operand (rtx, machine_mode); extern int small_data_register_operand (rtx, machine_mode); extern int small_data_symbolic_operand (rtx, machine_mode); -extern int upper_int16_operand (rtx, machine_mode); -extern int uint16_operand (rtx, machine_mode); -extern int symbolic_operand (rtx, machine_mode); -extern int relational_operator (rtx, machine_mode); +extern bool upper_int16_operand (rtx, machine_mode); +extern bool uint16_operand (rtx, machine_mode); +extern bool symbolic_operand (rtx, machine_mode); +extern bool relational_operator (rtx, machine_mode); extern int signed_relational_operator (rtx, machine_mode); extern int unsigned_relational_operator (rtx, machine_mode); -extern int float_relational_operator (rtx, machine_mode); -extern int ccr_eqne_operator (rtx, machine_mode); -extern int minmax_operator (rtx, machine_mode); -extern int condexec_si_binary_operator (rtx, machine_mode); -extern int condexec_si_media_operator (rtx, machine_mode); -extern int condexec_si_divide_operator (rtx, machine_mode); -extern int condexec_si_unary_operator (rtx, machine_mode); -extern int condexec_sf_conv_operator (rtx, machine_mode); -extern int condexec_sf_add_operator (rtx, machine_mode); +extern bool float_relational_operator (rtx, machine_mode); +extern bool ccr_eqne_operator (rtx, machine_mode); +extern bool minmax_operator (rtx, machine_mode); +extern bool condexec_si_binary_operator (rtx, machine_mode); +extern bool condexec_si_media_operator (rtx, machine_mode); +extern bool condexec_si_divide_operator (rtx, machine_mode); +extern bool condexec_si_unary_operator (rtx, machine_mode); +extern bool condexec_sf_conv_operator (rtx, machine_mode); +extern bool condexec_sf_add_operator (rtx, machine_mode); extern int condexec_memory_operand (rtx, machine_mode); -extern int intop_compare_operator (rtx, machine_mode); -extern int acc_operand (rtx, machine_mode); -extern int even_acc_operand (rtx, machine_mode); -extern int quad_acc_operand (rtx, machine_mode); -extern int accg_operand (rtx, machine_mode); +extern bool intop_compare_operator (rtx, machine_mode); +extern bool acc_operand (rtx, machine_mode); +extern bool even_acc_operand (rtx, machine_mode); +extern bool quad_acc_operand (rtx, machine_mode); +extern bool accg_operand (rtx, machine_mode); extern rtx frv_matching_accg_for_acc (rtx); extern void frv_expand_fdpic_call (rtx *, bool, bool); extern rtx frv_gen_GPsym2reg (rtx, rtx);