From 0e0ce50de6b5ca00490a675800c866c24c44e4bb Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Tue, 26 Aug 2014 17:55:26 +0000 Subject: Remove DEP_PRO/CON scaffolding gcc/ * sched-int.h (struct _dep): Strengthen fields "pro" and "con" from rtx to rtx_insn *. (DEP_PRO): Delete this function and... (SET_DEP_PRO): ...this function in favor of... (DEP_PRO): ...reinstate this macro. (DEP_CON): Delete this function and... (SET_DEP_CON): ...this function in favor of... (DEP_CON): ...reinstate this old macro. (init_dep_1): Strengthen params 2 and 3 from rtx to rtx_insn *. (init_dep): Likewise. (set_priorities): Likewise for both params. (sd_copy_back_deps): Likewise for params 1 and 2. * haifa-sched.c (priority): Likewise for param "insn" and local "next". (set_priorities): Likewise for params "head" and "tail" and local "insn". (process_insn_forw_deps_be_in_spec): Likewise for param "twin" and local "consumer". (add_to_speculative_block): Add a checked cast. (create_check_block_twin): Drop use of SET_DEP_CON. (add_jump_dependencies): Strengthen params "insn" and "jump" from rtx to rtx_insn *. * sched-deps.c (init_dep_1): Likewise for params "pro" and "con". Drop use of SET_DEP_PRO (init_dep): Strengthen params "pro" and "con" from rtx to rtx_insn *. (sd_copy_back_deps): Likewise for params "to" and "from". Drop use of SET_DEP_CON. (DEP_PRO): Delete. (DEP_CON): Delete. (SET_DEP_PRO): Delete. (SET_DEP_CON): Delete. / * rtx-classes-status.txt (TODO): SET_DEP_PRO and SET_DEP_CON are done. From-SVN: r214530 --- gcc/sched-int.h | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'gcc/sched-int.h') diff --git a/gcc/sched-int.h b/gcc/sched-int.h index 7ac0c8e..e7d93ffd 100644 --- a/gcc/sched-int.h +++ b/gcc/sched-int.h @@ -218,10 +218,10 @@ struct dep_replacement struct _dep { /* Producer. */ - rtx pro; + rtx_insn *pro; /* Consumer. */ - rtx con; + rtx_insn *con; /* If nonnull, holds a pointer to information about how to break the dependency by making a replacement in one of the insns. There is @@ -250,10 +250,8 @@ struct _dep typedef struct _dep dep_def; typedef dep_def *dep_t; -extern rtx_insn *DEP_PRO (dep_t dep); -extern rtx_insn *DEP_CON (dep_t dep); -extern rtx& SET_DEP_PRO (dep_t dep); -extern rtx& SET_DEP_CON (dep_t dep); +#define DEP_PRO(D) ((D)->pro) +#define DEP_CON(D) ((D)->con) #define DEP_TYPE(D) ((D)->type) #define DEP_STATUS(D) ((D)->status) #define DEP_COST(D) ((D)->cost) @@ -263,8 +261,8 @@ extern rtx& SET_DEP_CON (dep_t dep); /* Functions to work with dep. */ -extern void init_dep_1 (dep_t, rtx, rtx, enum reg_note, ds_t); -extern void init_dep (dep_t, rtx, rtx, enum reg_note); +extern void init_dep_1 (dep_t, rtx_insn *, rtx_insn *, enum reg_note, ds_t); +extern void init_dep (dep_t, rtx_insn *, rtx_insn *, enum reg_note); extern void sd_debug_dep (dep_t); @@ -1349,7 +1347,7 @@ extern int no_real_insns_p (const_rtx, const_rtx); extern int insn_cost (rtx); extern int dep_cost_1 (dep_t, dw_t); extern int dep_cost (dep_t); -extern int set_priorities (rtx, rtx); +extern int set_priorities (rtx_insn *, rtx_insn *); extern void sched_setup_bb_reg_pressure_info (basic_block, rtx); extern bool schedule_block (basic_block *, state_t); @@ -1615,7 +1613,7 @@ extern void sd_add_dep (dep_t, bool); extern enum DEPS_ADJUST_RESULT sd_add_or_update_dep (dep_t, bool); extern void sd_resolve_dep (sd_iterator_def); extern void sd_unresolve_dep (sd_iterator_def); -extern void sd_copy_back_deps (rtx, rtx, bool); +extern void sd_copy_back_deps (rtx_insn *, rtx_insn *, bool); extern void sd_delete_dep (sd_iterator_def); extern void sd_debug_lists (rtx, sd_list_types_def); -- cgit v1.1