#include "predict.h"
#include "vec.h"
#include "errors.h"
+#include "function.h"
/* Head of register set linked list. */
typedef bitmap_head regset_head;
};
typedef struct edge_def *edge;
-DEF_VEC_GC_P(edge);
+DEF_VEC_P(edge);
+DEF_VEC_ALLOC_P(edge,gc);
#define EDGE_FALLTHRU 1 /* 'Straight line' flow */
#define EDGE_ABNORMAL 2 /* Strange flow, like computed
tree stmt_list;
/* The edges into and out of the block. */
- VEC(edge) *preds;
- VEC(edge) *succs;
+ VEC(edge,gc) *preds;
+ VEC(edge,gc) *succs;
/* The registers that are live on entry to this block. */
bitmap GTY ((skip (""))) global_live_at_start;
struct basic_block_def *next_bb;
/* The data used by basic block copying and reordering functions. */
- struct reorder_block_def * GTY ((skip (""))) rbi;
+ struct reorder_block_def * rbi;
/* Annotations used at the tree level. */
struct bb_ann_d *tree_annotations;
/* Various flags. See BB_* below. */
int flags;
+
+ /* Which section block belongs in, when partitioning basic blocks. */
+ int partition;
};
typedef struct basic_block_def *basic_block;
/* Structure to hold information about the blocks during reordering and
- copying. */
+ copying. Needs to be put on a diet. */
-typedef struct reorder_block_def
+struct reorder_block_def GTY(())
{
rtx header;
rtx footer;
+
basic_block next;
- basic_block original;
- /* Used by loop copying. */
- basic_block copy;
+
+ /* These pointers may be unreliable as the first is only used for
+ debugging (and should probably be removed, and the second is only
+ used by copying. The basic blocks pointed to may be removed and
+ that leaves these pointers pointing to garbage. */
+ basic_block GTY ((skip (""))) original;
+ basic_block GTY ((skip (""))) copy;
+
int duplicated;
int copy_number;
- /* These fields are used by bb-reorder pass. */
+ /* This field is used by the bb-reorder and tracer passes. */
int visited;
-} *reorder_block_def_p;
+};
+
+typedef struct reorder_block_def *reorder_block_def;
#define BB_FREQ_MAX 10000
#define BB_COPY_PARTITION(dstbb, srcbb) \
BB_SET_PARTITION (dstbb, BB_PARTITION (srcbb))
-/* Number of basic blocks in the current function. */
+/* 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(())
+{
+ /* 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;
+ basic_block x_exit_block_ptr;
-extern int n_basic_blocks;
+ /* Index by basic block number, get basic block struct info. */
+ varray_type x_basic_block_info;
-/* First free basic block number. */
+ /* Number of basic blocks in this flow graph. */
+ int x_n_basic_blocks;
-extern int last_basic_block;
+ /* Number of edges in this flow graph. */
+ int x_n_edges;
-/* Number of edges in the current function. */
+ /* The first free basic block number. */
+ int x_last_basic_block;
-extern int n_edges;
+ /* Mapping of labels to their associated blocks. At present
+ only used for the tree CFG. */
+ varray_type x_label_to_block_map;
+
+ enum profile_status {
+ PROFILE_ABSENT,
+ PROFILE_GUESSED,
+ PROFILE_READ
+ } x_profile_status;
+};
+
+/* Defines for accessing the fields of the CFG structure for function FN. */
+#define ENTRY_BLOCK_PTR_FOR_FUNCTION(FN) ((FN)->cfg->x_entry_block_ptr)
+#define EXIT_BLOCK_PTR_FOR_FUNCTION(FN) ((FN)->cfg->x_exit_block_ptr)
+#define basic_block_info_for_function(FN) ((FN)->cfg->x_basic_block_info)
+#define n_basic_blocks_for_function(FN) ((FN)->cfg->x_n_basic_blocks)
+#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 BASIC_BLOCK_FOR_FUNCTION(FN,N) \
+ (VARRAY_BB (basic_block_info_for_function(FN), (N)))
+
+/* Defines for textual backward source compatibility. */
+#define ENTRY_BLOCK_PTR (cfun->cfg->x_entry_block_ptr)
+#define EXIT_BLOCK_PTR (cfun->cfg->x_exit_block_ptr)
+#define basic_block_info (cfun->cfg->x_basic_block_info)
+#define n_basic_blocks (cfun->cfg->x_n_basic_blocks)
+#define n_edges (cfun->cfg->x_n_edges)
+#define last_basic_block (cfun->cfg->x_last_basic_block)
+#define label_to_block_map (cfun->cfg->x_label_to_block_map)
+#define profile_status (cfun->cfg->x_profile_status)
+
+#define BASIC_BLOCK(N) (VARRAY_BB (basic_block_info, (N)))
/* TRUE if we should re-run loop discovery after threading jumps, FALSE
otherwise. */
extern bool rediscover_loops_after_threading;
-/* Signalize the status of profile information in the CFG. */
-extern enum profile_status
-{
- PROFILE_ABSENT,
- PROFILE_GUESSED,
- PROFILE_READ
-} profile_status;
-
-/* Index by basic block number, get basic block struct info. */
-
-extern GTY(()) varray_type basic_block_info;
-
-#define BASIC_BLOCK(N) (VARRAY_BB (basic_block_info, (N)))
-
/* For iterating over basic blocks. */
#define FOR_BB_BETWEEN(BB, FROM, TO, DIR) \
for (BB = FROM; BB != TO; BB = BB->DIR)
-#define FOR_EACH_BB(BB) \
- FOR_BB_BETWEEN (BB, ENTRY_BLOCK_PTR->next_bb, EXIT_BLOCK_PTR, next_bb)
+#define FOR_EACH_BB_FN(BB, FN) \
+ FOR_BB_BETWEEN (BB, (FN)->cfg->x_entry_block_ptr->next_bb, (FN)->cfg->x_exit_block_ptr, next_bb)
+
+#define FOR_EACH_BB(BB) FOR_EACH_BB_FN (BB, cfun)
-#define FOR_EACH_BB_REVERSE(BB) \
- FOR_BB_BETWEEN (BB, EXIT_BLOCK_PTR->prev_bb, ENTRY_BLOCK_PTR, prev_bb)
+#define FOR_EACH_BB_REVERSE_FN(BB, FN) \
+ FOR_BB_BETWEEN (BB, (FN)->cfg->x_exit_block_ptr->prev_bb, (FN)->cfg->x_entry_block_ptr, prev_bb)
+
+#define FOR_EACH_BB_REVERSE(BB) FOR_EACH_BB_REVERSE_FN(BB, cfun)
/* For iterating over insns in basic block. */
#define FOR_BB_INSNS(BB, INSN) \
#define FOR_ALL_BB(BB) \
for (BB = ENTRY_BLOCK_PTR; BB; BB = BB->next_bb)
+#define FOR_ALL_BB_FN(BB, FN) \
+ for (BB = ENTRY_BLOCK_PTR_FOR_FUNCTION (FN); BB; BB = BB->next_bb)
+
/* Special labels found during CFG build. */
extern GTY(()) rtx label_value_list;
/* Special block number not valid for any block. */
#define INVALID_BLOCK (-3)
-/* Similarly, block pointers for the edge list. */
-extern GTY(()) basic_block ENTRY_BLOCK_PTR;
-extern GTY(()) basic_block EXIT_BLOCK_PTR;
-
#define BLOCK_NUM(INSN) (BLOCK_FOR_INSN (INSN)->index + 0)
#define set_block_for_insn(INSN, BB) (BLOCK_FOR_INSN (INSN) = BB)
edge *index_to_edge;
};
+/* The base value for branch probability notes and edge probabilities. */
+#define REG_BR_PROB_BASE 10000
+
/* This is the value which indicates no edge is present. */
#define EDGE_INDEX_NO_EDGE -1
typedef struct {
unsigned index;
- VEC(edge) **container;
+ VEC(edge,gc) **container;
} edge_iterator;
-static inline VEC(edge) *
+static inline VEC(edge,gc) *
ei_container (edge_iterator i)
{
gcc_assert (i.container);
/* Return an iterator pointing to the start of an edge vector. */
static inline edge_iterator
-ei_start_1 (VEC(edge) **ev)
+ei_start_1 (VEC(edge,gc) **ev)
{
edge_iterator i;
/* Return an iterator pointing to the last element of an edge
vector. */
static inline edge_iterator
-ei_last_1 (VEC(edge) **ev)
+ei_last_1 (VEC(edge,gc) **ev)
{
edge_iterator i;
return !ei_end_p (i) ? ei_edge (i) : NULL;
}
+/* Return 1 if we should continue to iterate. Return 0 otherwise.
+ *Edge P is set to the next edge if we are to continue to iterate
+ and NULL otherwise. */
+
+static inline bool
+ei_cond (edge_iterator ei, edge *p)
+{
+ if (!ei_end_p (ei))
+ {
+ *p = ei_edge (ei);
+ return 1;
+ }
+ else
+ {
+ *p = NULL;
+ return 0;
+ }
+}
+
/* This macro serves as a convenient way to iterate each edge in a
vector of predecessor or successor edges. It must not be used when
an element might be removed during the traversal, otherwise
}
*/
-#define FOR_EACH_EDGE(EDGE,ITER,EDGE_VEC) \
- for ((EDGE) = NULL, (ITER) = ei_start ((EDGE_VEC)); \
- ((EDGE) = ei_safe_edge ((ITER))); \
+#define FOR_EACH_EDGE(EDGE,ITER,EDGE_VEC) \
+ for ((ITER) = ei_start ((EDGE_VEC)); \
+ ei_cond ((ITER), &(EDGE)); \
ei_next (&(ITER)))
struct edge_list * create_edge_list (void);
#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_EQUAL_NOTES 128 /* Take into account REG_EQUAL notes. */
-#define PROP_SCAN_DEAD_STORES 256 /* Scan for dead code. */
-#define PROP_ASM_SCAN 512 /* Internal flag used within flow.c
+#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_FINAL (PROP_DEATH_NOTES | PROP_LOG_LINKS \
| PROP_REG_INFO | PROP_KILL_DEAD_CODE \
| PROP_SCAN_DEAD_CODE | PROP_AUTOINC \
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 (int);
+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 void partition_hot_cold_basic_blocks (void);
/* In cfg.c */
-extern void alloc_rbi_pool (void);
extern void initialize_bb_rbi (basic_block bb);
-extern void free_rbi_pool (void);
/* In dominance.c */