X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;ds=sidebyside;f=gcc%2Fbasic-block.h;h=3ff1cd645ea42194ab51e4f6ad7be05cb514a37b;hb=22bb664ca0021f4e540cdfa56bc1d4238a7c1356;hp=50d3e628aeaac0b9352147ea4b2c0d75bbb5ea2c;hpb=94ba1cf1cb865588f328a111068e2c04bd2fd718;p=pf3gnuchains%2Fgcc-fork.git diff --git a/gcc/basic-block.h b/gcc/basic-block.h index 50d3e628aea..3ff1cd645ea 100644 --- a/gcc/basic-block.h +++ b/gcc/basic-block.h @@ -1,6 +1,6 @@ -/* Define control and data flow tables, and regsets. +/* Define control flow data structures for the CFG. Copyright (C) 1987, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. This file is part of GCC. @@ -21,91 +21,10 @@ along with GCC; see the file COPYING3. If not see #ifndef GCC_BASIC_BLOCK_H #define GCC_BASIC_BLOCK_H -#include "bitmap.h" -#include "sbitmap.h" -#include "varray.h" -#include "partition.h" -#include "hard-reg-set.h" #include "predict.h" #include "vec.h" #include "function.h" -/* Head of register set linked list. */ -typedef bitmap_head regset_head; - -/* A pointer to a regset_head. */ -typedef bitmap regset; - -/* Allocate a register set with oballoc. */ -#define ALLOC_REG_SET(OBSTACK) BITMAP_ALLOC (OBSTACK) - -/* Do any cleanup needed on a regset when it is no longer used. */ -#define FREE_REG_SET(REGSET) BITMAP_FREE (REGSET) - -/* Initialize a new regset. */ -#define INIT_REG_SET(HEAD) bitmap_initialize (HEAD, ®_obstack) - -/* Clear a register set by freeing up the linked list. */ -#define CLEAR_REG_SET(HEAD) bitmap_clear (HEAD) - -/* Copy a register set to another register set. */ -#define COPY_REG_SET(TO, FROM) bitmap_copy (TO, FROM) - -/* Compare two register sets. */ -#define REG_SET_EQUAL_P(A, B) bitmap_equal_p (A, B) - -/* `and' a register set with a second register set. */ -#define AND_REG_SET(TO, FROM) bitmap_and_into (TO, FROM) - -/* `and' the complement of a register set with a register set. */ -#define AND_COMPL_REG_SET(TO, FROM) bitmap_and_compl_into (TO, FROM) - -/* Inclusive or a register set with a second register set. */ -#define IOR_REG_SET(TO, FROM) bitmap_ior_into (TO, FROM) - -/* Exclusive or a register set with a second register set. */ -#define XOR_REG_SET(TO, FROM) bitmap_xor_into (TO, FROM) - -/* Or into TO the register set FROM1 `and'ed with the complement of FROM2. */ -#define IOR_AND_COMPL_REG_SET(TO, FROM1, FROM2) \ - bitmap_ior_and_compl_into (TO, FROM1, FROM2) - -/* Clear a single register in a register set. */ -#define CLEAR_REGNO_REG_SET(HEAD, REG) bitmap_clear_bit (HEAD, REG) - -/* Set a single register in a register set. */ -#define SET_REGNO_REG_SET(HEAD, REG) bitmap_set_bit (HEAD, REG) - -/* Return true if a register is set in a register set. */ -#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 *, const_bitmap); -#define REG_SET_TO_HARD_REG_SET(TO, FROM) \ -do { \ - CLEAR_HARD_REG_SET (TO); \ - reg_set_to_hard_reg_set (&TO, FROM); \ -} while (0) - -typedef bitmap_iterator reg_set_iterator; - -/* Loop over all registers in REGSET, starting with MIN, setting REGNUM to the - register number and executing CODE for all registers that are set. */ -#define EXECUTE_IF_SET_IN_REG_SET(REGSET, MIN, REGNUM, RSI) \ - EXECUTE_IF_SET_IN_BITMAP (REGSET, MIN, REGNUM, RSI) - -/* Loop over all registers in REGSET1 and REGSET2, starting with MIN, setting - REGNUM to the register number and executing CODE for all registers that are - set in the first regset and not set in the second. */ -#define EXECUTE_IF_AND_COMPL_IN_REG_SET(REGSET1, REGSET2, MIN, REGNUM, RSI) \ - EXECUTE_IF_AND_COMPL_IN_BITMAP (REGSET1, REGSET2, MIN, REGNUM, RSI) - -/* Loop over all registers in REGSET1 and REGSET2, starting with MIN, setting - REGNUM to the register number and executing CODE for all registers that are - set in both regsets. */ -#define EXECUTE_IF_AND_IN_REG_SET(REGSET1, REGSET2, MIN, REGNUM, RSI) \ - EXECUTE_IF_AND_IN_BITMAP (REGSET1, REGSET2, MIN, REGNUM, RSI) \ - /* Type we use to hold basic block counters. Should be at least 64bit. Although a counter cannot be negative, we use a signed type, because erroneous negative counts can be generated when the @@ -114,8 +33,7 @@ typedef bitmap_iterator reg_set_iterator; typedef HOST_WIDEST_INT gcov_type; /* Control flow edge information. */ -struct edge_def GTY(()) -{ +struct GTY(()) edge_def { /* The two blocks at the ends of the edge. */ struct basic_block_def *src; struct basic_block_def *dest; @@ -129,7 +47,8 @@ struct edge_def GTY(()) /* Auxiliary info specific to a pass. */ PTR GTY ((skip (""))) aux; - /* Location of any goto implicit in the edge, during tree-ssa. */ + /* Location of any goto implicit in the edge and associated BLOCK. */ + tree goto_block; location_t goto_locus; /* The index number corresponding to this edge in the edge vector @@ -142,37 +61,38 @@ struct edge_def GTY(()) in profile.c */ }; -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 +/* Always update the table in cfg.c dump_edge_info. */ +#define EDGE_FALLTHRU 0x0001 /* 'Straight line' flow */ +#define EDGE_ABNORMAL 0x0002 /* Strange flow, like computed label, or eh */ -#define EDGE_ABNORMAL_CALL 4 /* Call with abnormal exit +#define EDGE_ABNORMAL_CALL 0x0004 /* Call with abnormal exit like an exception, or sibcall */ -#define EDGE_EH 8 /* Exception throw */ -#define EDGE_FAKE 16 /* Not a real edge (profile.c) */ -#define EDGE_DFS_BACK 32 /* A backwards edge */ -#define EDGE_CAN_FALLTHRU 64 /* Candidate for straight line +#define EDGE_EH 0x0008 /* Exception throw */ +#define EDGE_FAKE 0x0010 /* Not a real edge (profile.c) */ +#define EDGE_DFS_BACK 0x0020 /* A backwards edge */ +#define EDGE_CAN_FALLTHRU 0x0040 /* Candidate for straight line flow. */ -#define EDGE_IRREDUCIBLE_LOOP 128 /* Part of irreducible loop. */ -#define EDGE_SIBCALL 256 /* Edge from sibcall to exit. */ -#define EDGE_LOOP_EXIT 512 /* Exit of a loop. */ -#define EDGE_TRUE_VALUE 1024 /* Edge taken when controlling +#define EDGE_IRREDUCIBLE_LOOP 0x0080 /* Part of irreducible loop. */ +#define EDGE_SIBCALL 0x0100 /* Edge from sibcall to exit. */ +#define EDGE_LOOP_EXIT 0x0200 /* Exit of a loop. */ +#define EDGE_TRUE_VALUE 0x0400 /* Edge taken when controlling predicate is nonzero. */ -#define EDGE_FALSE_VALUE 2048 /* Edge taken when controlling +#define EDGE_FALSE_VALUE 0x0800 /* Edge taken when controlling predicate is zero. */ -#define EDGE_EXECUTABLE 4096 /* Edge is executable. Only +#define EDGE_EXECUTABLE 0x1000 /* Edge is executable. Only valid during SSA-CCP. */ -#define EDGE_CROSSING 8192 /* Edge crosses between hot +#define EDGE_CROSSING 0x2000 /* Edge crosses between hot and cold sections, when we do partitioning. */ -#define EDGE_ALL_FLAGS 16383 +#define EDGE_PRESERVE 0x4000 /* Never merge blocks via this edge. */ +#define EDGE_ALL_FLAGS 0x7fff -#define EDGE_COMPLEX (EDGE_ABNORMAL | EDGE_ABNORMAL_CALL | EDGE_EH) +#define EDGE_COMPLEX \ + (EDGE_ABNORMAL | EDGE_ABNORMAL_CALL | EDGE_EH | EDGE_PRESERVE) /* Counter summary from the last set of coverage counts read by profile.c. */ @@ -182,7 +102,6 @@ extern const struct gcov_ctr_summary *profile_info; struct loop; /* Declared in tree-flow.h. */ -struct edge_prediction; struct rtl_bb_info; /* A basic block is a sequence of instructions with only entry and @@ -211,8 +130,7 @@ struct rtl_bb_info; basic blocks. */ /* Basic block information indexed by block number. */ -struct basic_block_def GTY((chain_next ("%h.next_bb"), chain_prev ("%h.prev_bb"))) -{ +struct GTY((chain_next ("%h.next_bb"), chain_prev ("%h.prev_bb"))) basic_block_def { /* The edges into and out of the block. */ VEC(edge,gc) *preds; VEC(edge,gc) *succs; @@ -247,12 +165,14 @@ struct basic_block_def GTY((chain_next ("%h.next_bb"), chain_prev ("%h.prev_bb") /* Expected frequency. Normalized to be in range 0 to BB_FREQ_MAX. */ int frequency; + /* The discriminator for this block. */ + int discriminator; + /* Various flags. See BB_* below. */ int flags; }; -struct rtl_bb_info GTY(()) -{ +struct GTY(()) rtl_bb_info { /* The first and last insns of the block. */ rtx head_; rtx end_; @@ -266,8 +186,7 @@ struct rtl_bb_info GTY(()) int visited; }; -struct gimple_bb_info GTY(()) -{ +struct GTY(()) gimple_bb_info { /* Sequence of statements in this block. */ gimple_seq seq; @@ -275,9 +194,6 @@ struct gimple_bb_info GTY(()) gimple_seq 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); DEF_VEC_ALLOC_P(basic_block,heap); @@ -290,7 +206,9 @@ DEF_VEC_ALLOC_P(basic_block,heap); the compilation, so they are never cleared. All other flags may be cleared by clear_bb_flags(). It is generally - a bad idea to rely on any flags being up-to-date. */ + a bad idea to rely on any flags being up-to-date. + + Always update the table in cfg.c dump_bb_info. */ enum bb_flags { @@ -332,7 +250,13 @@ enum bb_flags /* Set on blocks that cannot be threaded through. Only used in cfgcleanup.c. */ - BB_NONTHREADABLE_BLOCK = 1 << 11 + BB_NONTHREADABLE_BLOCK = 1 << 11, + + /* Set on blocks that were modified in some way. This bit is set in + df_set_bb_dirty, but not cleared by df_analyze, so it can be used + to test whether a block has been modified prior to a df_analyze + call. */ + BB_MODIFIED = 1 << 12 }; /* Dummy flag for convenience in the hot/cold partitioning code. */ @@ -359,12 +283,20 @@ enum dom_state DOM_OK /* Everything is ok. */ }; +/* What sort of profiling information we have. */ +enum profile_status_d +{ + PROFILE_ABSENT, + PROFILE_GUESSED, + PROFILE_READ, + PROFILE_LAST /* Last value, used by profile streaming. */ +}; + /* 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 source compatibility following the definition of this struct. */ -struct control_flow_graph GTY(()) -{ +struct GTY(()) control_flow_graph { /* Block pointers for the exit and entry of a function. These are always the head and tail of the basic block list. */ basic_block x_entry_block_ptr; @@ -382,15 +314,14 @@ struct control_flow_graph GTY(()) /* The first free basic block number. */ int x_last_basic_block; + /* UIDs for LABEL_DECLs. */ + int last_label_uid; + /* Mapping of labels to their associated blocks. At present only used for the gimple CFG. */ VEC(basic_block,gc) *x_label_to_block_map; - enum profile_status { - PROFILE_ABSENT, - PROFILE_GUESSED, - PROFILE_READ - } x_profile_status; + enum profile_status_d x_profile_status; /* Whether the dominators and the postdominators are available. */ enum dom_state x_dom_computed[2]; @@ -401,9 +332,6 @@ struct control_flow_graph GTY(()) /* 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. */ @@ -460,7 +388,7 @@ struct control_flow_graph GTY(()) 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)); \ @@ -480,23 +408,20 @@ struct control_flow_graph GTY(()) #define FOR_ALL_BB_FN(BB, FN) \ for (BB = ENTRY_BLOCK_PTR_FOR_FUNCTION (FN); BB; BB = BB->next_bb) -extern bitmap_obstack reg_obstack; - /* Stuff for recording basic block info. */ #define BB_HEAD(B) (B)->il.rtl->head_ #define BB_END(B) (B)->il.rtl->end_ -/* Special block numbers [markers] for entry and exit. */ +/* Special block numbers [markers] for entry and exit. + Neither of them is supposed to hold actual statements. */ #define ENTRY_BLOCK (0) #define EXIT_BLOCK (1) /* The two blocks that are always in the cfg. */ #define NUM_FIXED_BLOCKS (2) - -#define BLOCK_NUM(INSN) (BLOCK_FOR_INSN (INSN)->index + 0) #define set_block_for_insn(INSN, BB) (BLOCK_FOR_INSN (INSN) = BB) extern void compute_bb_for_insn (void); @@ -506,6 +431,7 @@ extern void update_bb_for_insn (basic_block); extern void insert_insn_on_edge (rtx, edge); basic_block split_edge_and_insert (edge, rtx); +extern void commit_one_edge_insertion (edge e); extern void commit_edge_insertions (void); extern void remove_fake_edges (void); @@ -528,8 +454,8 @@ extern int pre_and_rev_post_order_compute (int *, int *, bool); extern int dfs_enumerate_from (basic_block, int, bool (*)(const_basic_block, const void *), basic_block *, int, const void *); -extern void compute_dominance_frontiers (bitmap *); -extern bitmap compute_idf (bitmap, bitmap *); +extern void compute_dominance_frontiers (struct bitmap_head_def *); +extern bitmap compute_idf (bitmap, struct bitmap_head_def *); 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 *); @@ -639,7 +565,7 @@ single_pred_p (const_basic_block bb) static inline edge single_succ_edge (const_basic_block bb) { - gcc_assert (single_succ_p (bb)); + gcc_checking_assert (single_succ_p (bb)); return EDGE_SUCC (bb, 0); } @@ -649,7 +575,7 @@ single_succ_edge (const_basic_block bb) static inline edge single_pred_edge (const_basic_block bb) { - gcc_assert (single_pred_p (bb)); + gcc_checking_assert (single_pred_p (bb)); return EDGE_PRED (bb, 0); } @@ -681,7 +607,7 @@ typedef struct { static inline VEC(edge,gc) * ei_container (edge_iterator i) { - gcc_assert (i.container); + gcc_checking_assert (i.container); return *i.container; } @@ -732,7 +658,7 @@ ei_one_before_end_p (edge_iterator i) static inline void ei_next (edge_iterator *i) { - gcc_assert (i->index < EDGE_COUNT (ei_container (*i))); + gcc_checking_assert (i->index < EDGE_COUNT (ei_container (*i))); i->index++; } @@ -740,7 +666,7 @@ ei_next (edge_iterator *i) static inline void ei_prev (edge_iterator *i) { - gcc_assert (i->index > 0); + gcc_checking_assert (i->index > 0); i->index--; } @@ -829,18 +755,15 @@ extern void compute_available (sbitmap *, sbitmap *, sbitmap *, sbitmap *); /* In predict.c */ extern bool maybe_hot_bb_p (const_basic_block); extern bool maybe_hot_edge_p (edge); -extern bool probably_cold_bb_p (const_basic_block); extern bool probably_never_executed_bb_p (const_basic_block); extern bool optimize_bb_for_size_p (const_basic_block); extern bool optimize_bb_for_speed_p (const_basic_block); extern bool optimize_edge_for_size_p (edge); extern bool optimize_edge_for_speed_p (edge); -extern bool optimize_insn_for_size_p (void); -extern bool optimize_insn_for_speed_p (void); -extern bool optimize_function_for_size_p (struct function *); -extern bool optimize_function_for_speed_p (struct function *); extern bool optimize_loop_for_size_p (struct loop *); extern bool optimize_loop_for_speed_p (struct loop *); +extern bool optimize_loop_nest_for_size_p (struct loop *); +extern bool optimize_loop_nest_for_speed_p (struct loop *); extern bool gimple_predicted_by_p (const_basic_block, enum br_predictor); extern bool rtl_predicted_by_p (const_basic_block, enum br_predictor); extern void gimple_predict_edge (edge, enum br_predictor, int); @@ -850,25 +773,20 @@ 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); +extern bool predictable_edge_p (edge); /* 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 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 alloc_aux_for_block (basic_block, int); extern void alloc_aux_for_blocks (int); extern void clear_aux_for_blocks (void); extern void free_aux_for_blocks (void); -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); @@ -882,24 +800,31 @@ extern void flow_nodes_print (const char *, const_sbitmap, FILE *); extern void flow_edge_list_print (const char *, const edge *, int, FILE *); /* In cfgrtl.c */ -extern basic_block force_nonfallthru (edge); extern rtx block_label (basic_block); +extern rtx bb_note (basic_block); extern bool purge_all_dead_edges (void); extern bool purge_dead_edges (basic_block); +extern bool fixup_abnormal_edges (void); +extern basic_block force_nonfallthru_and_redirect (edge, basic_block, rtx); /* 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); + +enum replace_direction { dir_none, dir_forward, dir_backward, dir_both }; /* In cfgcleanup.c. */ extern bool cleanup_cfg (int); +extern int flow_find_cross_jump (basic_block, basic_block, rtx *, rtx *, + enum replace_direction*); +extern int flow_find_head_matching_sequence (basic_block, basic_block, + rtx *, rtx *, int); + extern bool delete_unreachable_blocks (void); 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 (const_rtx); extern bool control_flow_insn_p (const_rtx); extern rtx get_last_bb_insn (basic_block); @@ -932,6 +857,10 @@ extern VEC (basic_block, heap) *get_dominated_by (enum cdi_direction, basic_bloc extern VEC (basic_block, heap) *get_dominated_by_region (enum cdi_direction, basic_block *, unsigned); +extern VEC (basic_block, heap) *get_dominated_to_depth (enum cdi_direction, + basic_block, int); +extern VEC (basic_block, heap) *get_all_dominated_blocks (enum cdi_direction, + basic_block); extern void add_to_dominance_info (enum cdi_direction, basic_block); extern void delete_from_dominance_info (enum cdi_direction, basic_block); basic_block recompute_dominator (enum cdi_direction, basic_block); @@ -961,9 +890,6 @@ 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" /* Return true when one of the predecessor edges of BB is marked with EDGE_EH. */ @@ -996,6 +922,20 @@ bb_has_abnormal_pred (basic_block bb) return false; } +/* Return the fallthru edge in EDGES if it exists, NULL otherwise. */ +static inline edge +find_fallthru_edge (VEC(edge,gc) *edges) +{ + edge e; + edge_iterator ei; + + FOR_EACH_EDGE (e, ei, edges) + if (e->flags & EDGE_FALLTHRU) + break; + + return e; +} + /* In cfgloopmanip.c. */ extern edge mfb_kj_edge; extern bool mfb_keep_just (edge);