From 6b7d57c7e7f79fbbe3798f783b799c0f386d7286 Mon Sep 17 00:00:00 2001 From: Richard Kenner Date: Sat, 27 Oct 2001 22:41:00 +0000 Subject: [PATCH] mips-protos.h: Break up long lines. * config/mips/mips-protos.h: Break up long lines. Remove needless #ifdef/#endif blocks. Don't declare functions declared in file made by genpreds or recog.h. * config/mips/mips.c (mips_output_function_prologue): TSIZE is now HOST_WIDE_INT; delete unneeded casts. * config/mips/mips.h: Don't use #elif. From-SVN: r46572 --- gcc/ChangeLog | 7 +++ gcc/config/mips/mips-protos.h | 124 ++++++++++++++++++------------------------ gcc/config/mips/mips.c | 7 +-- gcc/config/mips/mips.h | 24 ++++++-- 4 files changed, 82 insertions(+), 80 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 441cf8a..4373a08 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,12 @@ Sat Oct 27 17:32:04 2001 Richard Kenner + * config/mips/mips-protos.h: Break up long lines. + Remove needless #ifdef/#endif blocks. + Don't declare functions declared in file made by genpreds or recog.h. + * config/mips/mips.c (mips_output_function_prologue): TSIZE + is now HOST_WIDE_INT; delete unneeded casts. + * config/mips/mips.h: Don't use #elif. + * expr.c (stor_constructor_field): Always call adjust_address. Copy TARGET before changing its alias set. (store_field): Likewise, for TO_RTX. diff --git a/gcc/config/mips/mips-protos.h b/gcc/config/mips/mips-protos.h index 57011ae..0dcfca5 100644 --- a/gcc/config/mips/mips-protos.h +++ b/gcc/config/mips/mips-protos.h @@ -1,6 +1,6 @@ /* Prototypes of target machine for GNU compiler. MIPS version. Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, - 1999 Free Software Foundation, Inc. + 1999, 2001 Free Software Foundation, Inc. Contributed by A. Lichnewsky (lich@inria.inria.fr). Changed by Michael Meissner (meissner@osf.org). 64 bit r4000 support by Ian Lance Taylor (ian@cygnus.com) and @@ -35,7 +35,9 @@ extern void iris6_asm_output_align PARAMS ((FILE *, unsigned)); extern const char * current_section_name PARAMS ((void)); extern unsigned int current_section_flags PARAMS ((void)); extern int mips_can_use_return_insn PARAMS ((void)); -extern void mips_declare_object PARAMS ((FILE *, const char *, const char *, const char *, int)); +extern void mips_declare_object PARAMS ((FILE *, const char *, + const char *, + const char *, int)); extern void mips_expand_epilogue PARAMS ((void)); extern void mips_expand_prologue PARAMS ((void)); #ifdef REAL_VALUE_TYPE @@ -44,7 +46,8 @@ extern void mips_output_float PARAMS ((FILE *, REAL_VALUE_TYPE)); #endif /* REAL_VALUE_TYPE */ extern void mips_output_filename PARAMS ((FILE *, const char *)); extern void mips_output_lineno PARAMS ((FILE *, int)); -extern void mips_output_ascii PARAMS ((FILE *, const char *, size_t)); +extern void mips_output_ascii PARAMS ((FILE *, const char *, + size_t)); extern void mips_order_regs_for_local_alloc PARAMS ((void)); extern struct rtx_def * mips16_gp_pseudo_reg PARAMS ((void)); #ifdef ASM_OUTPUT_UNDEF_FUNCTION @@ -52,97 +55,73 @@ extern int mips_output_external_libcall PARAMS ((FILE *, const char *)); #endif /* ASM_OUTPUT_UNDEF_FUNCTION */ -#ifdef TREE_CODE -extern unsigned int mips_hard_regno_nregs PARAMS ((int, enum machine_mode)); -extern struct rtx_def * function_arg PARAMS ((CUMULATIVE_ARGS *, enum machine_mode, tree, int)); -extern void function_arg_advance PARAMS ((CUMULATIVE_ARGS *, enum machine_mode, tree, int)); -extern int function_arg_partial_nregs PARAMS ((CUMULATIVE_ARGS *, enum machine_mode, tree, int)); -extern int function_arg_pass_by_reference PARAMS ((CUMULATIVE_ARGS *, enum machine_mode, tree, int)); +extern unsigned int mips_hard_regno_nregs PARAMS ((int, + enum machine_mode)); +extern struct rtx_def *function_arg PARAMS ((CUMULATIVE_ARGS *, + enum machine_mode, tree, int)); +extern void function_arg_advance PARAMS ((CUMULATIVE_ARGS *, + enum machine_mode, + tree, int)); +extern int function_arg_partial_nregs PARAMS ((CUMULATIVE_ARGS *, + enum machine_mode, + tree, int)); +extern int function_arg_pass_by_reference + PARAMS ((CUMULATIVE_ARGS *, + enum machine_mode, tree, int)); extern int mips16_constant_after_function_p PARAMS ((tree)); -extern int mips_output_external PARAMS ((FILE *, tree, const char *)); +extern int mips_output_external PARAMS ((FILE *, tree, + const char *)); extern tree mips_build_va_list PARAMS ((void)); -#ifdef RTX_CODE extern void mips_va_start PARAMS ((int, tree, rtx)); -#endif /* RTX_CODE */ extern struct rtx_def *mips_va_arg PARAMS ((tree, tree)); extern void mips_select_section PARAMS ((tree, int)); extern void mips_unique_section PARAMS ((tree, int)); -#endif /* TREE_CODE */ -#ifdef RTX_CODE -extern int arith32_operand PARAMS ((rtx, enum machine_mode)); -extern int arith_operand PARAMS ((rtx, enum machine_mode)); -extern int cmp_op PARAMS ((rtx, enum machine_mode)); -extern int trap_cmp_op PARAMS ((rtx, enum machine_mode)); -extern int const_float_1_operand PARAMS ((rtx, enum machine_mode)); -extern void expand_block_move PARAMS ((rtx [])); -extern int equality_op PARAMS ((rtx, enum machine_mode)); -extern void final_prescan_insn PARAMS ((rtx, rtx [], int)); -extern struct rtx_def * gen_int_relational PARAMS ((enum rtx_code, rtx, rtx, rtx,int *)); -#ifdef TREE_CODE -extern void init_cumulative_args PARAMS ((CUMULATIVE_ARGS *c, tree, rtx)); -#endif /* TREE_CODE */ -extern void gen_conditional_branch PARAMS ((rtx[], enum rtx_code)); +extern void expand_block_move PARAMS ((rtx *)); +extern void final_prescan_insn PARAMS ((rtx, rtx *, int)); +extern void init_cumulative_args PARAMS ((CUMULATIVE_ARGS *, + tree, rtx)); extern void gen_conditional_move PARAMS ((rtx *)); extern void mips_gen_conditional_trap PARAMS ((rtx *)); -extern int large_int PARAMS ((rtx, enum machine_mode)); extern void machine_dependent_reorg PARAMS ((rtx)); extern int mips_address_cost PARAMS ((rtx)); -extern int mips_const_double_ok PARAMS ((rtx, enum machine_mode)); extern void mips_count_memory_refs PARAMS ((rtx, int)); extern HOST_WIDE_INT mips_debugger_offset PARAMS ((rtx, HOST_WIDE_INT)); extern int mips_check_split PARAMS ((rtx, enum machine_mode)); -extern const char *mips_fill_delay_slot PARAMS ((const char *, enum delay_type, rtx[], rtx)); -extern const char *mips_move_1word PARAMS ((rtx[], rtx, int)); -extern const char *mips_move_2words PARAMS ((rtx[], rtx)); -extern const char *output_block_move PARAMS ((rtx, rtx[], int, enum block_move_type)); +extern const char *mips_fill_delay_slot PARAMS ((const char *, + enum delay_type, rtx *, + rtx)); +extern const char *mips_move_1word PARAMS ((rtx *, rtx, int)); +extern const char *mips_move_2words PARAMS ((rtx *, rtx)); +extern const char *output_block_move PARAMS ((rtx, rtx *, int, + enum block_move_type)); extern void override_options PARAMS ((void)); -extern int pc_or_label_operand PARAMS ((rtx, enum machine_mode)); extern void print_operand_address PARAMS ((FILE *, rtx)); extern void print_operand PARAMS ((FILE *, rtx, int)); -extern int reg_or_0_operand PARAMS ((rtx, enum machine_mode)); -extern int true_reg_or_0_operand PARAMS ((rtx, enum machine_mode)); -extern int simple_memory_operand PARAMS ((rtx, enum machine_mode)); -extern int double_memory_operand PARAMS ((rtx, enum machine_mode)); -extern int equality_op PARAMS ((rtx, enum machine_mode)); -extern int small_int PARAMS ((rtx, enum machine_mode)); -extern int uns_arith_operand PARAMS ((rtx, enum machine_mode)); +extern int double_memory_operand PARAMS ((rtx,enum machine_mode)); extern struct rtx_def * embedded_pic_offset PARAMS ((rtx)); extern struct rtx_def * mips16_gp_offset PARAMS ((rtx)); extern int mips16_gp_offset_p PARAMS ((rtx)); -extern int mips16_constant PARAMS ((rtx, enum machine_mode, int, int)); +extern int mips16_constant PARAMS ((rtx, enum machine_mode, + int, int)); extern int build_mips16_call_stub PARAMS ((rtx, rtx, rtx, int)); -extern char *mips_output_conditional_branch PARAMS ((rtx, rtx *, int, int, int, int)); +extern char *mips_output_conditional_branch PARAMS ((rtx, rtx *, + int, int, int, + int)); extern int mips_adjust_insn_length PARAMS ((rtx, int)); -extern enum reg_class mips_secondary_reload_class PARAMS ((enum reg_class, enum machine_mode, rtx, int)); -extern void mips_select_rtx_section PARAMS ((enum machine_mode, rtx)); +extern enum reg_class mips_secondary_reload_class PARAMS ((enum reg_class, + enum machine_mode, + rtx, int)); +extern void mips_select_rtx_section PARAMS ((enum machine_mode, + rtx)); -/* Recognition functions that return if a condition is true. */ -extern int address_operand PARAMS ((rtx, enum machine_mode)); -extern int call_insn_operand PARAMS ((rtx, enum machine_mode)); -extern int const_double_operand PARAMS ((rtx, enum machine_mode)); -extern int const_int_operand PARAMS ((rtx, enum machine_mode)); -extern int consttable_operand PARAMS ((rtx, enum machine_mode)); -extern int general_operand PARAMS ((rtx, enum machine_mode)); -extern int immediate_operand PARAMS ((rtx, enum machine_mode)); -extern int memory_operand PARAMS ((rtx, enum machine_mode)); -extern int nonimmediate_operand PARAMS ((rtx, enum machine_mode)); -extern int nonmemory_operand PARAMS ((rtx, enum machine_mode)); extern int pic_address_needs_scratch PARAMS ((rtx)); -extern int register_operand PARAMS ((rtx, enum machine_mode)); -extern int scratch_operand PARAMS ((rtx, enum machine_mode)); -extern int move_operand PARAMS ((rtx, enum machine_mode)); -extern int movdi_operand PARAMS ((rtx, enum machine_mode)); -extern int se_register_operand PARAMS ((rtx, enum machine_mode)); -extern int se_reg_or_0_operand PARAMS ((rtx, enum machine_mode)); -extern int se_uns_arith_operand PARAMS ((rtx, enum machine_mode)); extern int se_arith_operand PARAMS ((rtx, enum machine_mode)); -extern int se_nonmemory_operand PARAMS ((rtx, enum machine_mode)); -extern int se_nonimmediate_operand PARAMS ((rtx, enum machine_mode)); -extern int mips_legitimate_address_p PARAMS ((enum machine_mode, rtx, int)); -extern int mips_reg_mode_ok_for_base_p PARAMS ((rtx, enum machine_mode, int)); -extern int extend_operator PARAMS ((rtx, enum machine_mode)); -extern int highpart_shift_operator PARAMS ((rtx, enum machine_mode)); +extern int mips_legitimate_address_p PARAMS ((enum machine_mode, + rtx, int)); +extern int mips_reg_mode_ok_for_base_p PARAMS ((rtx, + enum machine_mode, + int)); extern int m16_uimm3_b PARAMS ((rtx, enum machine_mode)); extern int m16_simm4_1 PARAMS ((rtx, enum machine_mode)); extern int m16_nsimm4_1 PARAMS ((rtx, enum machine_mode)); @@ -161,6 +140,11 @@ extern int m16_simm8_8 PARAMS ((rtx, enum machine_mode)); extern int m16_nsimm8_8 PARAMS ((rtx, enum machine_mode)); extern int m16_usym8_4 PARAMS ((rtx, enum machine_mode)); extern int m16_usym5_4 PARAMS ((rtx, enum machine_mode)); -#endif /* RTX_CODE */ + +#ifdef RTX_CODE +extern rtx gen_int_relational PARAMS ((enum rtx_code, rtx, rtx, + rtx,int *)); +extern void gen_conditional_branch PARAMS ((rtx *, enum rtx_code)); +#endif #endif /* ! GCC_MIPS_PROTOS_H */ diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c index 9ff5be6..88d7751 100644 --- a/gcc/config/mips/mips.c +++ b/gcc/config/mips/mips.c @@ -6955,7 +6955,7 @@ mips_output_function_prologue (file, size) #ifndef FUNCTION_NAME_ALREADY_DECLARED const char *fnname; #endif - long tsize = current_frame_info.total_size; + HOST_WIDE_INT tsize = current_frame_info.total_size; ASM_OUTPUT_SOURCE_FILENAME (file, DECL_SOURCE_FILE (current_function_decl)); @@ -7078,11 +7078,10 @@ mips_output_function_prologue (file, size) || GET_CODE (offset) != CONST_INT) continue; if (REGNO (base) == (unsigned) STACK_POINTER_REGNUM - && (unsigned HOST_WIDE_INT) INTVAL (offset) - == tsize + (REGNO (src) - 4) * UNITS_PER_WORD) + && INTVAL (offset) == tsize + (REGNO (src) - 4) * UNITS_PER_WORD) ; else if (REGNO (base) == (unsigned) HARD_FRAME_POINTER_REGNUM - && ((unsigned HOST_WIDE_INT) INTVAL (offset) + && (INTVAL (offset) == (tsize + (REGNO (src) - 4) * UNITS_PER_WORD - current_function_outgoing_args_size))) diff --git a/gcc/config/mips/mips.h b/gcc/config/mips/mips.h index 121628a..88a23e1 100644 --- a/gcc/config/mips/mips.h +++ b/gcc/config/mips/mips.h @@ -875,24 +875,30 @@ while (0) %{mabi=*} \ %{!mabi=*:%{mips1|mips2|mips32:-mabi=32} %{!mips1:%{!mips2:%{!mips32:-mabi=64}}}}" -#elif MIPS_ABI_DEFAULT == ABI_32 +#else +#if MIPS_ABI_DEFAULT == ABI_32 #define ABI_GAS_ASM_SPEC "%{mabi=*} %{!mabi=*:-mabi=32}" -#elif MIPS_ABI_DEFAULT == ABI_N32 +#else +#if MIPS_ABI_DEFAULT == ABI_N32 #define ABI_GAS_ASM_SPEC "%{mabi=*} %{!mabi=*:-mabi=n32}" -#elif MIPS_ABI_DEFAULT == ABI_64 +#else +#if MIPS_ABI_DEFAULT == ABI_64 #define ABI_GAS_ASM_SPEC "%{mabi=*} %{!mabi=*:-mabi=64}" -#elif MIPS_ABI_DEFAULT == ABI_EABI +#else +#if MIPS_ABI_DEFAULT == ABI_EABI #define ABI_GAS_ASM_SPEC "%{mabi=*} %{!mabi=*:-mabi=eabi}" -#elif MIPS_ABI_DEFAULT == ABI_O64 +#else +#if MIPS_ABI_DEFAULT == ABI_O64 #define ABI_GAS_ASM_SPEC "\ %{mabi=*} \ %{!mabi=*:%{mips1|mips2|mips32:-mabi=32} %{!mips1:%{!mips2:%{!mips32:-mabi=o64}}}}" -#elif MIPS_ABI_DEFAULT == ABI_MEABI +#else +#if MIPS_ABI_DEFAULT == ABI_MEABI #define ABI_GAS_ASM_SPEC "\ %{mabi=*} \ %{!mabi=*:-mabi=meabi }" @@ -900,6 +906,12 @@ while (0) #else #error "Unhandled MIPS_ABI_DEFAULT" #endif +#endif +#endif +#endif +#endif +#endif +#endif /* TARGET_ASM_SPEC is used to select either MIPS_AS_ASM_SPEC or -- 2.7.4