diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 810ee5292f2..b3d3c91a8e1 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,15 @@ +2001-04-13 Kaveh R. Ghazi + + * Makefile.in (toplev.o, jump.o, regmove.o): Depend on reload.h + + * jump.c, regmove.c, toplev.c: Include reload.h. + + * reload.h (reload_cse_regs): Declare. + + * rtl.h (find_equiv_reg, operands_match_p, safe_from_earlyclobber, + reload_cse_regs, init_reload, mark_home_live, reload, + init_caller_save): Delete redundant prototypes. + 2001-04-13 Kaveh R. Ghazi * Makefile.in (ssa.o, regclass.o): Depend on $(EXPR_H). diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 463499500ac..b824f3965f0 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -1379,7 +1379,7 @@ toplev.o : toplev.c $(CONFIG_H) $(SYSTEM_H) $(TREE_H) $(RTL_H) function.h \ insn-config.h intl.h $(RECOG_H) Makefile toplev.h dwarfout.h \ dwarf2out.h sdbout.h dbxout.h $(EXPR_H) hard-reg-set.h $(BASIC_BLOCK_H) \ graph.h $(LOOP_H) except.h $(REGS_H) $(TIMEVAR_H) $(lang_options_files) \ - ssa.h params.h $(TM_P_H) + ssa.h params.h $(TM_P_H) reload.h $(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $(MAYBE_USE_COLLECT2) \ -DTARGET_NAME=\"$(target_alias)\" \ -c $(srcdir)/toplev.c @@ -1455,7 +1455,7 @@ integrate.o : integrate.c $(CONFIG_H) $(SYSTEM_H) $(RTL_H) $(TREE_H) flags.h \ params.h $(TM_P_H) jump.o : jump.c $(CONFIG_H) $(SYSTEM_H) $(RTL_H) flags.h hard-reg-set.h $(REGS_H) \ insn-config.h $(RECOG_H) $(EXPR_H) real.h except.h function.h \ - toplev.h $(INSN_ATTR_H) $(TM_P_H) + toplev.h $(INSN_ATTR_H) $(TM_P_H) reload.h simplify-rtx.o : simplify-rtx.c $(CONFIG_H) $(SYSTEM_H) $(RTL_H) $(REGS_H) \ hard-reg-set.h flags.h real.h insn-config.h $(RECOG_H) $(EXPR_H) toplev.h \ @@ -1533,7 +1533,7 @@ alias.o : alias.c $(CONFIG_H) $(SYSTEM_H) $(RTL_H) flags.h hard-reg-set.h \ $(GGC_H) function.h cselib.h $(TREE_H) $(TM_P_H) regmove.o : regmove.c $(CONFIG_H) $(SYSTEM_H) $(RTL_H) insn-config.h \ $(RECOG_H) output.h $(REGS_H) hard-reg-set.h flags.h function.h \ - $(EXPR_H) $(BASIC_BLOCK_H) toplev.h $(TM_P_H) except.h + $(EXPR_H) $(BASIC_BLOCK_H) toplev.h $(TM_P_H) except.h reload.h haifa-sched.o : haifa-sched.c $(CONFIG_H) $(SYSTEM_H) $(RTL_H) sched-int.h \ $(BASIC_BLOCK_H) $(REGS_H) hard-reg-set.h flags.h insn-config.h function.h \ $(INSN_ATTR_H) toplev.h $(RECOG_H) except.h $(TM_P_H) diff --git a/gcc/jump.c b/gcc/jump.c index e4a7cf82228..779972252ac 100644 --- a/gcc/jump.c +++ b/gcc/jump.c @@ -66,6 +66,7 @@ Boston, MA 02111-1307, USA. */ #include "real.h" #include "except.h" #include "toplev.h" +#include "reload.h" /* ??? Eventually must record somehow the labels used by jumps from nested functions. */ diff --git a/gcc/regmove.c b/gcc/regmove.c index 84adaedd084..2e0fa9ed5fe 100644 --- a/gcc/regmove.c +++ b/gcc/regmove.c @@ -40,6 +40,7 @@ Boston, MA 02111-1307, USA. */ #include "basic-block.h" #include "except.h" #include "toplev.h" +#include "reload.h" static int perhaps_ends_bb_p PARAMS ((rtx)); static int optimize_reg_copy_1 PARAMS ((rtx, rtx, rtx)); diff --git a/gcc/reload.h b/gcc/reload.h index b604184a529..40af087e48e 100644 --- a/gcc/reload.h +++ b/gcc/reload.h @@ -343,6 +343,7 @@ int earlyclobber_operand_p PARAMS ((rtx)); /* Functions in reload1.c: */ +extern void reload_cse_regs PARAMS ((rtx)); extern int reloads_conflict PARAMS ((int, int)); /* Initialize the reload pass once per compilation. */ diff --git a/gcc/rtl.h b/gcc/rtl.h index d7943221885..a417a955ce3 100644 --- a/gcc/rtl.h +++ b/gcc/rtl.h @@ -1274,9 +1274,6 @@ extern enum rtx_code unsigned_condition PARAMS ((enum rtx_code)); extern enum rtx_code signed_condition PARAMS ((enum rtx_code)); extern void mark_jump_label PARAMS ((rtx, rtx, int, int)); -/* In reload.c */ -extern rtx find_equiv_reg PARAMS ((rtx, rtx, enum reg_class, int, short *, int, enum machine_mode)); - /* In jump.c */ extern rtx squeeze_notes PARAMS ((rtx, rtx)); extern rtx delete_insn PARAMS ((rtx)); @@ -1803,10 +1800,6 @@ extern void update_temp_slot_address PARAMS ((rtx, rtx)); extern void purge_addressof PARAMS ((rtx)); extern void purge_hard_subreg_sets PARAMS ((rtx)); -/* In reload.c */ -extern int operands_match_p PARAMS ((rtx, rtx)); -extern int safe_from_earlyclobber PARAMS ((rtx, rtx)); - /* In stmt.c */ extern void set_file_and_line_for_stmt PARAMS ((const char *, int)); extern void expand_null_return PARAMS ((void)); @@ -1882,15 +1875,6 @@ extern void dump_local_alloc PARAMS ((FILE *)); extern int local_alloc PARAMS ((void)); extern int function_invariant_p PARAMS ((rtx)); -/* In reload1.c */ -extern void reload_cse_regs PARAMS ((rtx)); -extern void init_reload PARAMS ((void)); -extern void mark_home_live PARAMS ((int)); -extern int reload PARAMS ((rtx, int)); - -/* In caller-save.c */ -extern void init_caller_save PARAMS ((void)); - /* In profile.c */ extern void init_branch_prob PARAMS ((const char *)); extern void branch_prob PARAMS ((void)); diff --git a/gcc/toplev.c b/gcc/toplev.c index ae4de0e46ed..413fa2f1442 100644 --- a/gcc/toplev.c +++ b/gcc/toplev.c @@ -63,6 +63,7 @@ Boston, MA 02111-1307, USA. */ #include "diagnostic.h" #include "ssa.h" #include "params.h" +#include "reload.h" #ifdef DWARF_DEBUGGING_INFO #include "dwarfout.h"