X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=blobdiff_plain;f=gcc%2Fbasic-block.h;h=53e8a8b5685d92b77f1ae641743d5214f0e8d124;hp=19a2de7a00f03aebdcd6495b2e88194de07e9337;hb=d37446aa31ac9074242fa8b45d2cd48082a1714c;hpb=75ab26dccf84bd770d1eaf542a7273eb95252a7d diff --git a/gcc/basic-block.h b/gcc/basic-block.h index 19a2de7a00f..53e8a8b5685 100644 --- a/gcc/basic-block.h +++ b/gcc/basic-block.h @@ -1,12 +1,12 @@ /* Define control and data flow tables, and regsets. - Copyright (C) 1987, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 - Free Software Foundation, Inc. + Copyright (C) 1987, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This file is part of GCC. GCC is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free -Software Foundation; either version 2, or (at your option) any later +Software Foundation; either version 3, or (at your option) any later version. GCC is distributed in the hope that it will be useful, but WITHOUT ANY @@ -15,9 +15,8 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with GCC; see the file COPYING. If not, write to the Free -Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA -02110-1301, USA. */ +along with GCC; see the file COPYING3. If not see +. */ #ifndef GCC_BASIC_BLOCK_H #define GCC_BASIC_BLOCK_H @@ -81,7 +80,7 @@ typedef bitmap regset; #define REGNO_REG_SET_P(TO, REG) bitmap_bit_p (TO, REG) /* Copy the hard registers in a register set to the hard register set. */ -extern void reg_set_to_hard_reg_set (HARD_REG_SET *, bitmap); +extern void reg_set_to_hard_reg_set (HARD_REG_SET *, const_bitmap); #define REG_SET_TO_HARD_REG_SET(TO, FROM) \ do { \ CLEAR_HARD_REG_SET (TO); \ @@ -123,29 +122,31 @@ struct edge_def GTY(()) /* Instructions queued on the edge. */ union edge_def_insns { - rtx GTY ((tag ("0"))) r; - tree GTY ((tag ("1"))) t; - } GTY ((desc ("ir_type ()"))) insns; + tree GTY ((tag ("true"))) t; + rtx GTY ((tag ("false"))) r; + } GTY ((desc ("current_ir_type () == IR_GIMPLE"))) insns; /* Auxiliary info specific to a pass. */ PTR GTY ((skip (""))) aux; /* Location of any goto implicit in the edge, during tree-ssa. */ - source_locus goto_locus; + location_t goto_locus; + + /* The index number corresponding to this edge in the edge vector + dest->preds. */ + unsigned int dest_idx; int flags; /* see EDGE_* below */ int probability; /* biased by REG_BR_PROB_BASE */ gcov_type count; /* Expected number of executions calculated in profile.c */ - - /* The index number corresponding to this edge in the edge vector - dest->preds. */ - unsigned int dest_idx; }; typedef struct edge_def *edge; +typedef const struct edge_def *const_edge; DEF_VEC_P(edge); DEF_VEC_ALLOC_P(edge,gc); +DEF_VEC_ALLOC_P(edge,heap); #define EDGE_FALLTHRU 1 /* 'Straight line' flow */ #define EDGE_ABNORMAL 2 /* Strange flow, like computed @@ -179,7 +180,6 @@ extern const struct gcov_ctr_summary *profile_info; /* Declared in cfgloop.h. */ struct loop; -struct loops; /* Declared in tree-flow.h. */ struct edge_prediction; @@ -213,9 +213,6 @@ struct rtl_bb_info; /* Basic block information indexed by block number. */ struct basic_block_def GTY((chain_next ("%h.next_bb"), chain_prev ("%h.prev_bb"))) { - /* Pointers to the first and last trees of the block. */ - tree stmt_list; - /* The edges into and out of the block. */ VEC(edge,gc) *preds; VEC(edge,gc) *succs; @@ -224,7 +221,7 @@ struct basic_block_def GTY((chain_next ("%h.next_bb"), chain_prev ("%h.prev_bb") PTR GTY ((skip (""))) aux; /* Innermost loop containing the block. */ - struct loop * GTY ((skip (""))) loop_father; + struct loop *loop_father; /* The dominance and postdominance information node. */ struct et_node * GTY ((skip (""))) dom[2]; @@ -234,15 +231,10 @@ struct basic_block_def GTY((chain_next ("%h.next_bb"), chain_prev ("%h.prev_bb") struct basic_block_def *next_bb; union basic_block_il_dependent { + struct tree_bb_info * GTY ((tag ("0"))) tree; struct rtl_bb_info * GTY ((tag ("1"))) rtl; } GTY ((desc ("((%1.flags & BB_RTL) != 0)"))) il; - /* Chain of PHI nodes for this block. */ - tree phi_nodes; - - /* A list of predictions. */ - struct edge_prediction *predictions; - /* Expected number of executions: calculated in profile.c. */ gcov_type count; @@ -265,12 +257,6 @@ struct rtl_bb_info GTY(()) rtx head_; rtx end_; - /* The registers that are live on entry to this block. */ - bitmap GTY ((skip (""))) global_live_at_start; - - /* The registers that are live on exit from this block. */ - bitmap GTY ((skip (""))) global_live_at_end; - /* In CFGlayout mode points to insn notes/jumptables to be placed just before and after the block. */ rtx header; @@ -280,7 +266,17 @@ struct rtl_bb_info GTY(()) int visited; }; +struct tree_bb_info GTY(()) +{ + /* Pointers to the first and last trees of the block. */ + tree stmt_list; + + /* Chain of PHI nodes for this block. */ + tree phi_nodes; +}; + typedef struct basic_block_def *basic_block; +typedef const struct basic_block_def *const_basic_block; DEF_VEC_P(basic_block); DEF_VEC_ALLOC_P(basic_block,gc); @@ -298,46 +294,45 @@ DEF_VEC_ALLOC_P(basic_block,heap); enum bb_flags { - - /* Set if insns in BB have are modified. Used for updating liveness info. */ - BB_DIRTY = 1, - /* Only set on blocks that have just been created by create_bb. */ - BB_NEW = 2, + BB_NEW = 1 << 0, /* Set by find_unreachable_blocks. Do not rely on this being set in any pass. */ - BB_REACHABLE = 4, + BB_REACHABLE = 1 << 1, /* Set for blocks in an irreducible loop by loop analysis. */ - BB_IRREDUCIBLE_LOOP = 8, + BB_IRREDUCIBLE_LOOP = 1 << 2, /* Set on blocks that may actually not be single-entry single-exit block. */ - BB_SUPERBLOCK = 16, + BB_SUPERBLOCK = 1 << 3, /* Set on basic blocks that the scheduler should not touch. This is used by SMS to prevent other schedulers from messing with the loop schedule. */ - BB_DISABLE_SCHEDULE = 32, + BB_DISABLE_SCHEDULE = 1 << 4, /* Set on blocks that should be put in a hot section. */ - BB_HOT_PARTITION = 64, + BB_HOT_PARTITION = 1 << 5, /* Set on blocks that should be put in a cold section. */ - BB_COLD_PARTITION = 128, + BB_COLD_PARTITION = 1 << 6, /* Set on block that was duplicated. */ - BB_DUPLICATED = 256, + BB_DUPLICATED = 1 << 7, + + /* Set if the label at the top of this block is the target of a non-local goto. */ + BB_NON_LOCAL_GOTO_TARGET = 1 << 8, /* Set on blocks that are in RTL format. */ - BB_RTL = 1024, + BB_RTL = 1 << 9 , /* Set on blocks that are forwarder blocks. Only used in cfgcleanup.c. */ - BB_FORWARDER_BLOCK = 2048, + BB_FORWARDER_BLOCK = 1 << 10, /* Set on blocks that cannot be threaded through. Only used in cfgcleanup.c. */ - BB_NONTHREADABLE_BLOCK = 4096 + BB_NONTHREADABLE_BLOCK = 1 << 11 }; /* Dummy flag for convenience in the hot/cold partitioning code. */ @@ -355,6 +350,15 @@ enum bb_flags #define BB_COPY_PARTITION(dstbb, srcbb) \ BB_SET_PARTITION (dstbb, BB_PARTITION (srcbb)) +/* State of dominance information. */ + +enum dom_state +{ + DOM_NONE, /* Not computed at all. */ + DOM_NO_FAST_QUERY, /* The data is OK, but the fast query data are not usable. */ + DOM_OK /* Everything is ok. */ +}; + /* A structure to group all the per-function control flow graph data. The x_* prefixing is necessary because otherwise references to the fields of this struct are interpreted as the defines for backward @@ -387,6 +391,19 @@ struct control_flow_graph GTY(()) PROFILE_GUESSED, PROFILE_READ } x_profile_status; + + /* Whether the dominators and the postdominators are available. */ + enum dom_state x_dom_computed[2]; + + /* Number of basic blocks in the dominance tree. */ + unsigned x_n_bbs_in_dom_tree[2]; + + /* Maximal number of entities in the single jumptable. Used to estimate + final flowgraph size. */ + int max_jumptable_ents; + + /* UIDs for LABEL_DECLs. */ + int last_label_uid; }; /* Defines for accessing the fields of the CFG structure for function FN. */ @@ -397,9 +414,12 @@ struct control_flow_graph GTY(()) #define n_edges_for_function(FN) ((FN)->cfg->x_n_edges) #define last_basic_block_for_function(FN) ((FN)->cfg->x_last_basic_block) #define label_to_block_map_for_function(FN) ((FN)->cfg->x_label_to_block_map) +#define profile_status_for_function(FN) ((FN)->cfg->x_profile_status) #define BASIC_BLOCK_FOR_FUNCTION(FN,N) \ (VEC_index (basic_block, basic_block_info_for_function(FN), (N))) +#define SET_BASIC_BLOCK_FOR_FUNCTION(FN,N,BB) \ + (VEC_replace (basic_block, basic_block_info_for_function(FN), (N), (BB))) /* Defines for textual backward source compatibility. */ #define ENTRY_BLOCK_PTR (cfun->cfg->x_entry_block_ptr) @@ -414,10 +434,6 @@ struct control_flow_graph GTY(()) #define BASIC_BLOCK(N) (VEC_index (basic_block, basic_block_info, (N))) #define SET_BASIC_BLOCK(N,BB) (VEC_replace (basic_block, basic_block_info, (N), (BB))) -/* TRUE if we should re-run loop discovery after threading jumps, FALSE - otherwise. */ -extern bool rediscover_loops_after_threading; - /* For iterating over basic blocks. */ #define FOR_BB_BETWEEN(BB, FROM, TO, DIR) \ for (BB = FROM; BB != TO; BB = BB->DIR) @@ -438,11 +454,23 @@ extern bool rediscover_loops_after_threading; (INSN) && (INSN) != NEXT_INSN (BB_END (BB)); \ (INSN) = NEXT_INSN (INSN)) +/* For iterating over insns in basic block when we might remove the + current insn. */ +#define FOR_BB_INSNS_SAFE(BB, INSN, CURR) \ + for ((INSN) = BB_HEAD (BB), (CURR) = (INSN) ? NEXT_INSN ((INSN)): NULL; \ + (INSN) && (INSN) != NEXT_INSN (BB_END (BB)); \ + (INSN) = (CURR), (CURR) = (INSN) ? NEXT_INSN ((INSN)) : NULL) + #define FOR_BB_INSNS_REVERSE(BB, INSN) \ for ((INSN) = BB_END (BB); \ (INSN) && (INSN) != PREV_INSN (BB_HEAD (BB)); \ (INSN) = PREV_INSN (INSN)) +#define FOR_BB_INSNS_REVERSE_SAFE(BB, INSN, CURR) \ + for ((INSN) = BB_END (BB),(CURR) = (INSN) ? PREV_INSN ((INSN)) : NULL; \ + (INSN) && (INSN) != PREV_INSN (BB_HEAD (BB)); \ + (INSN) = (CURR), (CURR) = (INSN) ? PREV_INSN ((INSN)) : NULL) + /* Cycles through _all_ basic blocks, even the fake ones (entry and exit block). */ @@ -454,17 +482,6 @@ extern bool rediscover_loops_after_threading; extern bitmap_obstack reg_obstack; -/* Indexed by n, gives number of basic block that (REG n) is used in. - If the value is REG_BLOCK_GLOBAL (-2), - it means (REG n) is used in more than one basic block. - REG_BLOCK_UNKNOWN (-1) means it hasn't been seen yet so we don't know. - This information remains valid for the rest of the compilation - of the current function; it is used to control register allocation. */ - -#define REG_BLOCK_UNKNOWN -1 -#define REG_BLOCK_GLOBAL -2 - -#define REG_BASIC_BLOCK(N) (VARRAY_REG (reg_n_info, N)->basic_block) /* Stuff for recording basic block info. */ @@ -483,16 +500,13 @@ extern bitmap_obstack reg_obstack; #define set_block_for_insn(INSN, BB) (BLOCK_FOR_INSN (INSN) = BB) extern void compute_bb_for_insn (void); -extern void free_bb_for_insn (void); +extern unsigned int free_bb_for_insn (void); extern void update_bb_for_insn (basic_block); -extern void free_basic_block_vars (void); - extern void insert_insn_on_edge (rtx, edge); -bool safe_insert_insn_on_edge (rtx, edge); +basic_block split_edge_and_insert (edge, rtx); extern void commit_edge_insertions (void); -extern void commit_edge_insertions_watch_calls (void); extern void remove_fake_edges (void); extern void remove_fake_exit_edges (void); @@ -502,25 +516,25 @@ extern edge unchecked_make_edge (basic_block, basic_block, int); extern edge cached_make_edge (sbitmap, basic_block, basic_block, int); extern edge make_edge (basic_block, basic_block, int); extern edge make_single_succ_edge (basic_block, basic_block, int); -extern void remove_edge (edge); +extern void remove_edge_raw (edge); extern void redirect_edge_succ (edge, basic_block); extern edge redirect_edge_succ_nodup (edge, basic_block); extern void redirect_edge_pred (edge, basic_block); extern basic_block create_basic_block_structure (rtx, rtx, rtx, basic_block); extern void clear_bb_flags (void); -extern int post_order_compute (int *, bool); +extern int post_order_compute (int *, bool, bool); +extern int inverted_post_order_compute (int *); extern int pre_and_rev_post_order_compute (int *, int *, bool); extern int dfs_enumerate_from (basic_block, int, - bool (*)(basic_block, void *), - basic_block *, int, void *); + bool (*)(const_basic_block, const void *), + basic_block *, int, const void *); extern void compute_dominance_frontiers (bitmap *); extern void dump_bb_info (basic_block, bool, bool, int, const char *, FILE *); extern void dump_edge_info (FILE *, edge, int); extern void brief_dump_cfg (FILE *); extern void clear_edges (void); -extern rtx first_insn_after_basic_block_note (basic_block); extern void scale_bbs_frequencies_int (basic_block *, int, int, int); -extern void scale_bbs_frequencies_gcov_type (basic_block *, int, gcov_type, +extern void scale_bbs_frequencies_gcov_type (basic_block *, int, gcov_type, gcov_type); /* Structure to group all of the information to process IF-THEN and @@ -605,7 +619,7 @@ struct edge_list /* Returns true if BB has precisely one successor. */ static inline bool -single_succ_p (basic_block bb) +single_succ_p (const_basic_block bb) { return EDGE_COUNT (bb->succs) == 1; } @@ -613,7 +627,7 @@ single_succ_p (basic_block bb) /* Returns true if BB has precisely one predecessor. */ static inline bool -single_pred_p (basic_block bb) +single_pred_p (const_basic_block bb) { return EDGE_COUNT (bb->preds) == 1; } @@ -622,7 +636,7 @@ single_pred_p (basic_block bb) BB does not have exactly one successor. */ static inline edge -single_succ_edge (basic_block bb) +single_succ_edge (const_basic_block bb) { gcc_assert (single_succ_p (bb)); return EDGE_SUCC (bb, 0); @@ -632,7 +646,7 @@ single_succ_edge (basic_block bb) if BB does not have exactly one predecessor. */ static inline edge -single_pred_edge (basic_block bb) +single_pred_edge (const_basic_block bb) { gcc_assert (single_pred_p (bb)); return EDGE_PRED (bb, 0); @@ -642,7 +656,7 @@ single_pred_edge (basic_block bb) if BB does not have exactly one successor. */ static inline basic_block -single_succ (basic_block bb) +single_succ (const_basic_block bb) { return single_succ_edge (bb)->dest; } @@ -651,7 +665,7 @@ single_succ (basic_block bb) if BB does not have exactly one predecessor.*/ static inline basic_block -single_pred (basic_block bb) +single_pred (const_basic_block bb) { return single_pred_edge (bb)->src; } @@ -769,7 +783,7 @@ ei_cond (edge_iterator ei, edge *p) an element might be removed during the traversal, otherwise elements will be missed. Instead, use a for-loop like that shown in the following pseudo-code: - + FOR (ei = ei_start (bb->succs); (e = ei_safe_edge (ei)); ) { IF (e != taken_edge) @@ -791,128 +805,53 @@ void verify_edge_list (FILE *, struct edge_list *); int find_edge_index (struct edge_list *, basic_block, basic_block); edge find_edge (basic_block, basic_block); - -enum update_life_extent -{ - UPDATE_LIFE_LOCAL = 0, - UPDATE_LIFE_GLOBAL = 1, - UPDATE_LIFE_GLOBAL_RM_NOTES = 2 -}; - -/* Flags for life_analysis and update_life_info. */ - -#define PROP_DEATH_NOTES 1 /* Create DEAD and UNUSED notes. */ -#define PROP_LOG_LINKS 2 /* Create LOG_LINKS. */ -#define PROP_REG_INFO 4 /* Update regs_ever_live et al. */ -#define PROP_KILL_DEAD_CODE 8 /* Remove dead code. */ -#define PROP_SCAN_DEAD_CODE 16 /* Scan for dead code. */ -#define PROP_ALLOW_CFG_CHANGES 32 /* Allow the CFG to be changed - by dead code removal. */ -#define PROP_AUTOINC 64 /* Create autoinc mem references. */ -#define PROP_SCAN_DEAD_STORES 128 /* Scan for dead code. */ -#define PROP_ASM_SCAN 256 /* Internal flag used within flow.c - to flag analysis of asms. */ -#define PROP_DEAD_INSN 1024 /* Internal flag used within flow.c - to flag analysis of dead insn. */ -#define PROP_POST_REGSTACK 2048 /* We run after reg-stack and need - to preserve REG_DEAD notes for - stack regs. */ -#define PROP_FINAL (PROP_DEATH_NOTES | PROP_LOG_LINKS \ - | PROP_REG_INFO | PROP_KILL_DEAD_CODE \ - | PROP_SCAN_DEAD_CODE | PROP_AUTOINC \ - | PROP_ALLOW_CFG_CHANGES \ - | PROP_SCAN_DEAD_STORES) -#define PROP_POSTRELOAD (PROP_DEATH_NOTES \ - | PROP_KILL_DEAD_CODE \ - | PROP_SCAN_DEAD_CODE \ - | PROP_SCAN_DEAD_STORES) - #define CLEANUP_EXPENSIVE 1 /* Do relatively expensive optimizations except for edge forwarding */ #define CLEANUP_CROSSJUMP 2 /* Do crossjumping. */ #define CLEANUP_POST_REGSTACK 4 /* We run after reg-stack and need to care REG_DEAD notes. */ -#define CLEANUP_PRE_LOOP 8 /* Take care to preserve syntactic loop - notes. */ -#define CLEANUP_UPDATE_LIFE 16 /* Keep life information up to date. */ -#define CLEANUP_THREADING 32 /* Do jump threading. */ -#define CLEANUP_NO_INSN_DEL 64 /* Do not try to delete trivially dead +#define CLEANUP_THREADING 8 /* Do jump threading. */ +#define CLEANUP_NO_INSN_DEL 16 /* Do not try to delete trivially dead insns. */ -#define CLEANUP_CFGLAYOUT 128 /* Do cleanup in cfglayout mode. */ -#define CLEANUP_LOG_LINKS 256 /* Update log links. */ - -/* The following are ORed in on top of the CLEANUP* flags in calls to - struct_equiv_block_eq. */ -#define STRUCT_EQUIV_START 512 /* Initializes the search range. */ -#define STRUCT_EQUIV_RERUN 1024 /* Rerun to find register use in - found equivalence. */ -#define STRUCT_EQUIV_FINAL 2048 /* Make any changes necessary to get - actual equivalence. */ -#define STRUCT_EQUIV_NEED_FULL_BLOCK 4096 /* struct_equiv_block_eq is required - to match only full blocks */ -#define STRUCT_EQUIV_MATCH_JUMPS 8192 /* Also include the jumps at the end of the block in the comparison. */ - -extern void life_analysis (FILE *, int); -extern int update_life_info (sbitmap, enum update_life_extent, int); -extern int update_life_info_in_dirty_blocks (enum update_life_extent, int); -extern int count_or_remove_death_notes (sbitmap, int); -extern int propagate_block (basic_block, regset, regset, regset, int); - -struct propagate_block_info; -extern rtx propagate_one_insn (struct propagate_block_info *, rtx); -extern struct propagate_block_info *init_propagate_block_info - (basic_block, regset, regset, regset, int); -extern void free_propagate_block_info (struct propagate_block_info *); +#define CLEANUP_CFGLAYOUT 32 /* Do cleanup in cfglayout mode. */ /* In lcm.c */ -extern struct edge_list *pre_edge_lcm (FILE *, int, sbitmap *, sbitmap *, +extern struct edge_list *pre_edge_lcm (int, sbitmap *, sbitmap *, sbitmap *, sbitmap *, sbitmap **, sbitmap **); -extern struct edge_list *pre_edge_rev_lcm (FILE *, int, sbitmap *, +extern struct edge_list *pre_edge_rev_lcm (int, sbitmap *, sbitmap *, sbitmap *, sbitmap *, sbitmap **, sbitmap **); extern void compute_available (sbitmap *, sbitmap *, sbitmap *, sbitmap *); /* In predict.c */ -extern void estimate_probability (struct loops *); -extern void expected_value_to_br_prob (void); -extern bool maybe_hot_bb_p (basic_block); -extern bool probably_cold_bb_p (basic_block); -extern bool probably_never_executed_bb_p (basic_block); -extern bool tree_predicted_by_p (basic_block, enum br_predictor); -extern bool rtl_predicted_by_p (basic_block, enum br_predictor); +extern bool maybe_hot_bb_p (const_basic_block); +extern bool probably_cold_bb_p (const_basic_block); +extern bool probably_never_executed_bb_p (const_basic_block); +extern bool tree_predicted_by_p (const_basic_block, enum br_predictor); +extern bool rtl_predicted_by_p (const_basic_block, enum br_predictor); extern void tree_predict_edge (edge, enum br_predictor, int); extern void rtl_predict_edge (edge, enum br_predictor, int); extern void predict_edge_def (edge, enum br_predictor, enum prediction); extern void guess_outgoing_edge_probabilities (basic_block); extern void remove_predictions_associated_with_edge (edge); +extern bool edge_probability_reliable_p (const_edge); +extern bool br_prob_note_reliable_p (const_rtx); -/* In flow.c */ -extern void init_flow (void); +/* In cfg.c */ +extern void dump_regset (regset, FILE *); +extern void debug_regset (regset); +extern void init_flow (struct function *); extern void debug_bb (basic_block); extern basic_block debug_bb_n (int); extern void dump_regset (regset, FILE *); extern void debug_regset (regset); -extern void allocate_reg_life_data (void); extern void expunge_block (basic_block); extern void link_block (basic_block, basic_block); extern void unlink_block (basic_block); extern void compact_blocks (void); extern basic_block alloc_block (void); -extern void find_unreachable_blocks (void); -extern int delete_noop_moves (void); -extern basic_block force_nonfallthru (edge); -extern rtx block_label (basic_block); -extern bool forwarder_block_p (basic_block); -extern bool purge_all_dead_edges (void); -extern bool purge_dead_edges (basic_block); -extern void find_many_sub_basic_blocks (sbitmap); -extern void rtl_make_eh_edge (sbitmap, basic_block, rtx); -extern bool can_fallthru (basic_block, basic_block); -extern bool could_fall_through (basic_block, basic_block); -extern void flow_nodes_print (const char *, const sbitmap, FILE *); -extern void flow_edge_list_print (const char *, const edge *, int, FILE *); extern void alloc_aux_for_block (basic_block, int); extern void alloc_aux_for_blocks (int); extern void clear_aux_for_blocks (void); @@ -921,82 +860,82 @@ extern void alloc_aux_for_edge (edge, int); extern void alloc_aux_for_edges (int); extern void clear_aux_for_edges (void); extern void free_aux_for_edges (void); -extern void find_basic_blocks (rtx); -extern bool cleanup_cfg (int); -extern bool delete_unreachable_blocks (void); -extern bool merge_seq_blocks (void); -typedef struct conflict_graph_def *conflict_graph; +/* In cfganal.c */ +extern void find_unreachable_blocks (void); +extern bool forwarder_block_p (const_basic_block); +extern bool can_fallthru (basic_block, basic_block); +extern bool could_fall_through (basic_block, basic_block); +extern void flow_nodes_print (const char *, const_sbitmap, FILE *); +extern void flow_edge_list_print (const char *, const edge *, int, FILE *); -/* Callback function when enumerating conflicts. The arguments are - the smaller and larger regno in the conflict. Returns zero if - enumeration is to continue, nonzero to halt enumeration. */ -typedef int (*conflict_graph_enum_fn) (int, int, void *); +/* In cfgrtl.c */ +extern basic_block force_nonfallthru (edge); +extern rtx block_label (basic_block); +extern bool purge_all_dead_edges (void); +extern bool purge_dead_edges (basic_block); +/* In cfgbuild.c. */ +extern void find_many_sub_basic_blocks (sbitmap); +extern void rtl_make_eh_edge (sbitmap, basic_block, rtx); +extern void find_basic_blocks (rtx); -/* Prototypes of operations on conflict graphs. */ +/* In cfgcleanup.c. */ +extern bool cleanup_cfg (int); +extern bool delete_unreachable_blocks (void); -extern conflict_graph conflict_graph_new - (int); -extern void conflict_graph_delete (conflict_graph); -extern int conflict_graph_add (conflict_graph, int, int); -extern int conflict_graph_conflict_p (conflict_graph, int, int); -extern void conflict_graph_enum (conflict_graph, int, conflict_graph_enum_fn, - void *); -extern void conflict_graph_merge_regs (conflict_graph, int, int); -extern void conflict_graph_print (conflict_graph, FILE*); extern bool mark_dfs_back_edges (void); extern void set_edge_can_fallthru_flag (void); extern void update_br_prob_note (basic_block); extern void fixup_abnormal_edges (void); -extern bool inside_basic_block_p (rtx); -extern bool control_flow_insn_p (rtx); +extern bool inside_basic_block_p (const_rtx); +extern bool control_flow_insn_p (const_rtx); +extern rtx get_last_bb_insn (basic_block); /* In bb-reorder.c */ -extern void reorder_basic_blocks (unsigned int); +extern void reorder_basic_blocks (void); /* In dominance.c */ enum cdi_direction { - CDI_DOMINATORS, - CDI_POST_DOMINATORS + CDI_DOMINATORS = 1, + CDI_POST_DOMINATORS = 2 }; -enum dom_state -{ - DOM_NONE, /* Not computed at all. */ - DOM_NO_FAST_QUERY, /* The data is OK, but the fast query data are not usable. */ - DOM_OK /* Everything is ok. */ -}; - -extern enum dom_state dom_computed[2]; - +extern enum dom_state dom_info_state (enum cdi_direction); +extern void set_dom_info_availability (enum cdi_direction, enum dom_state); extern bool dom_info_available_p (enum cdi_direction); extern void calculate_dominance_info (enum cdi_direction); extern void free_dominance_info (enum cdi_direction); extern basic_block nearest_common_dominator (enum cdi_direction, basic_block, basic_block); -extern basic_block nearest_common_dominator_for_set (enum cdi_direction, +extern basic_block nearest_common_dominator_for_set (enum cdi_direction, bitmap); extern void set_immediate_dominator (enum cdi_direction, basic_block, basic_block); extern basic_block get_immediate_dominator (enum cdi_direction, basic_block); -extern bool dominated_by_p (enum cdi_direction, basic_block, basic_block); -extern int get_dominated_by (enum cdi_direction, basic_block, basic_block **); -extern unsigned get_dominated_by_region (enum cdi_direction, basic_block *, - unsigned, basic_block *); +extern bool dominated_by_p (enum cdi_direction, const_basic_block, const_basic_block); +extern VEC (basic_block, heap) *get_dominated_by (enum cdi_direction, basic_block); +extern VEC (basic_block, heap) *get_dominated_by_region (enum cdi_direction, + basic_block *, + unsigned); extern void add_to_dominance_info (enum cdi_direction, basic_block); extern void delete_from_dominance_info (enum cdi_direction, basic_block); -basic_block recount_dominator (enum cdi_direction, basic_block); +basic_block recompute_dominator (enum cdi_direction, basic_block); extern void redirect_immediate_dominators (enum cdi_direction, basic_block, basic_block); -extern void iterate_fix_dominators (enum cdi_direction, basic_block *, int); +extern void iterate_fix_dominators (enum cdi_direction, + VEC (basic_block, heap) *, bool); extern void verify_dominators (enum cdi_direction); extern basic_block first_dom_son (enum cdi_direction, basic_block); extern basic_block next_dom_son (enum cdi_direction, basic_block); +unsigned bb_dom_dfs_in (enum cdi_direction, basic_block); +unsigned bb_dom_dfs_out (enum cdi_direction, basic_block); + extern edge try_redirect_by_replacing_jump (edge, basic_block, bool); extern void break_superblocks (void); +extern void relink_block_chain (bool); extern void check_bb_profile (basic_block, FILE *); extern void update_bb_profile_for_threading (basic_block, int, gcov_type, edge); extern void init_rtl_bb_info (basic_block); @@ -1007,172 +946,46 @@ extern void set_bb_original (basic_block, basic_block); extern basic_block get_bb_original (basic_block); extern void set_bb_copy (basic_block, basic_block); extern basic_block get_bb_copy (basic_block); +void set_loop_copy (struct loop *, struct loop *); +struct loop *get_loop_copy (struct loop *); + + +extern rtx insert_insn_end_bb_new (rtx, basic_block); #include "cfghooks.h" -/* In struct-equiv.c */ - -/* Constants used to size arrays in struct equiv_info (currently only one). - When these limits are exceeded, struct_equiv returns zero. - The maximum number of pseudo registers that are different in the two blocks, - but appear in equivalent places and are dead at the end (or where one of - a pair is dead at the end). */ -#define STRUCT_EQUIV_MAX_LOCAL 16 -/* The maximum number of references to an input register that struct_equiv - can handle. */ - -/* Structure used to track state during struct_equiv that can be rolled - back when we find we can't match an insn, or if we want to match part - of it in a different way. - This information pertains to the pair of partial blocks that has been - matched so far. Since this pair is structurally equivalent, this is - conceptually just one partial block expressed in two potentially - different ways. */ -struct struct_equiv_checkpoint +/* Return true when one of the predecessor edges of BB is marked with EDGE_EH. */ +static inline bool +bb_has_eh_pred (basic_block bb) { - int ninsns; /* Insns are matched so far. */ - int local_count; /* Number of block-local registers. */ - int input_count; /* Number of inputs to the block. */ - - /* X_START and Y_START are the first insns (in insn stream order) - of the partial blocks that have been considered for matching so far. - Since we are scanning backwards, they are also the instructions that - are currently considered - or the last ones that have been considered - - for matching (Unless we tracked back to these because a preceding - instruction failed to match). */ - rtx x_start, y_start; - - /* INPUT_VALID indicates if we have actually set up X_INPUT / Y_INPUT - during the current pass; we keep X_INPUT / Y_INPUT around between passes - so that we can match REG_EQUAL / REG_EQUIV notes referring to these. */ - bool input_valid; - - /* Some information would be expensive to exactly checkpoint, so we - merely increment VERSION any time information about local - registers, inputs and/or register liveness changes. When backtracking, - it is decremented for changes that can be undone, and if a discrepancy - remains, NEED_RERUN in the relevant struct equiv_info is set to indicate - that a new pass should be made over the entire block match to get - accurate register information. */ - int version; -}; + edge e; + edge_iterator ei; -/* A struct equiv_info is used to pass information to struct_equiv and - to gather state while two basic blocks are checked for structural - equivalence. */ + FOR_EACH_EDGE (e, ei, bb->preds) + { + if (e->flags & EDGE_EH) + return true; + } + return false; +} -struct equiv_info +/* Return true when one of the predecessor edges of BB is marked with EDGE_ABNORMAL. */ +static inline bool +bb_has_abnormal_pred (basic_block bb) { - /* Fields set up by the caller to struct_equiv_block_eq */ - - basic_block x_block, y_block; /* The two blocks being matched. */ - - /* MODE carries the mode bits from cleanup_cfg if we are called from - try_crossjump_to_edge, and additionally it carries the - STRUCT_EQUIV_* bits described above. */ - int mode; - - /* INPUT_COST is the cost that adding an extra input to the matched blocks - is supposed to have, and is taken into account when considering if the - matched sequence should be extended backwards. input_cost < 0 means - don't accept any inputs at all. */ - int input_cost; - - - /* Fields to track state inside of struct_equiv_block_eq. Some of these - are also outputs. */ - - /* X_INPUT and Y_INPUT are used by struct_equiv to record a register that - is used as an input parameter, i.e. where different registers are used - as sources. This is only used for a register that is live at the end - of the blocks, or in some identical code at the end of the blocks; - Inputs that are dead at the end go into X_LOCAL / Y_LOCAL. */ - rtx x_input, y_input; - /* When a previous pass has identified a valid input, INPUT_REG is set - by struct_equiv_block_eq, and it is henceforth replaced in X_BLOCK - for the input. */ - rtx input_reg; - - /* COMMON_LIVE keeps track of the registers which are currently live - (as we scan backwards from the end) and have the same numbers in both - blocks. N.B. a register that is in common_live is unsuitable to become - a local reg. */ - regset common_live; - /* Likewise, X_LOCAL_LIVE / Y_LOCAL_LIVE keep track of registers that are - local to one of the blocks; these registers must not be accepted as - identical when encountered in both blocks. */ - regset x_local_live, y_local_live; - - /* EQUIV_USED indicates for which insns a REG_EQUAL or REG_EQUIV note is - being used, to avoid having to backtrack in the next pass, so that we - get accurate life info for this insn then. For each such insn, - the bit with the number corresponding to the CUR.NINSNS value at the - time of scanning is set. */ - bitmap equiv_used; - - /* Current state that can be saved & restored easily. */ - struct struct_equiv_checkpoint cur; - /* BEST_MATCH is used to store the best match so far, weighing the - cost of matched insns COSTS_N_INSNS (CUR.NINSNS) against the cost - CUR.INPUT_COUNT * INPUT_COST of setting up the inputs. */ - struct struct_equiv_checkpoint best_match; - /* If a checkpoint restore failed, or an input conflict newly arises, - NEED_RERUN is set. This has to be tested by the caller to re-run - the comparison if the match appears otherwise sound. The state kept in - x_start, y_start, equiv_used and check_input_conflict ensures that - we won't loop indefinitely. */ - bool need_rerun; - /* If there is indication of an input conflict at the end, - CHECK_INPUT_CONFLICT is set so that we'll check for input conflicts - for each insn in the next pass. This is needed so that we won't discard - a partial match if there is a longer match that has to be abandoned due - to an input conflict. */ - bool check_input_conflict; - /* HAD_INPUT_CONFLICT is set if CHECK_INPUT_CONFLICT was already set and we - have passed a point where there were multiple dying inputs. This helps - us decide if we should set check_input_conflict for the next pass. */ - bool had_input_conflict; - - /* LIVE_UPDATE controls if we want to change any life info at all. We - set it to false during REG_EQUAL / REG_EUQIV note comparison of the final - pass so that we don't introduce new registers just for the note; if we - can't match the notes without the current register information, we drop - them. */ - bool live_update; - - /* X_LOCAL and Y_LOCAL are used to gather register numbers of register pairs - that are local to X_BLOCK and Y_BLOCK, with CUR.LOCAL_COUNT being the index - to the next free entry. */ - rtx x_local[STRUCT_EQUIV_MAX_LOCAL], y_local[STRUCT_EQUIV_MAX_LOCAL]; - /* LOCAL_RVALUE is nonzero if the corresponding X_LOCAL / Y_LOCAL entry - was a source operand (including STRICT_LOW_PART) for the last invocation - of struct_equiv mentioning it, zero if it was a destination-only operand. - Since we are scanning backwards, this means the register is input/local - for the (partial) block scanned so far. */ - bool local_rvalue[STRUCT_EQUIV_MAX_LOCAL]; - - - /* Additional fields that are computed for the convenience of the caller. */ - - /* DYING_INPUTS is set to the number of local registers that turn out - to be inputs to the (possibly partial) block. */ - int dying_inputs; - /* X_END and Y_END are the last insns in X_BLOCK and Y_BLOCK, respectively, - that are being compared. A final jump insn will not be included. */ - rtx x_end, y_end; - - /* If we are matching tablejumps, X_LABEL in X_BLOCK corresponds to - Y_LABEL in Y_BLOCK. */ - rtx x_label, y_label; - -}; + edge e; + edge_iterator ei; -extern bool insns_match_p (rtx, rtx, struct equiv_info *); -extern int struct_equiv_block_eq (int, struct equiv_info *); -extern bool struct_equiv_init (int, struct equiv_info *); -extern bool rtx_equiv_p (rtx *, rtx, int, struct equiv_info *); + FOR_EACH_EDGE (e, ei, bb->preds) + { + if (e->flags & EDGE_ABNORMAL) + return true; + } + return false; +} -/* In cfgrtl.c */ -extern bool condjump_equiv_p (struct equiv_info *, bool); +/* In cfgloopmanip.c. */ +extern edge mfb_kj_edge; +bool mfb_keep_just (edge); #endif /* GCC_BASIC_BLOCK_H */