X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Fcfg.c;h=4b6de6d66a8f7196d8f7110e3983a44e4142a727;hb=a38904360a9b5e258d5011e686ebf58e89399379;hp=77d92aa4d42ef89a4318cf7528d8643c0b8c2538;hpb=cea1c7f4d6bc66d786c979c80711d1a330d64a17;p=pf3gnuchains%2Fgcc-fork.git diff --git a/gcc/cfg.c b/gcc/cfg.c index 77d92aa4d42..4b6de6d66a8 100644 --- a/gcc/cfg.c +++ b/gcc/cfg.c @@ -1,6 +1,6 @@ /* Control flow graph manipulation code for GNU compiler. Copyright (C) 1987, 1988, 1992, 1993, 1994, 1995, 1996, 1997, 1998, - 1999, 2000, 2001, 2002 Free Software Foundation, Inc. + 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. This file is part of GCC. @@ -20,7 +20,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* This file contains low level functions to manipulate the CFG and - analyze it. All other modules should not transform the datastructure + analyze it. All other modules should not transform the data structure directly and use abstraction instead. The file is supposed to be ordered bottom-up and should not contain any code dependent on a particular intermediate language (RTL or trees). @@ -39,10 +39,16 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA - Allocation of AUX fields for basic blocks alloc_aux_for_blocks, free_aux_for_blocks, alloc_aux_for_block - clear_bb_flags + - Consistency checking + verify_flow_info + - Dumping and debugging + print_rtl_with_bb, dump_bb, debug_bb, debug_bb_n */ #include "config.h" #include "system.h" +#include "coretypes.h" +#include "tm.h" #include "tree.h" #include "rtl.h" #include "hard-reg-set.h" @@ -55,6 +61,9 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include "toplev.h" #include "tm_p.h" #include "obstack.h" +#include "alloc-pool.h" +#include "timevar.h" +#include "ggc.h" /* The obstack on which the flow graph components are allocated. */ @@ -73,105 +82,62 @@ int last_basic_block; int n_edges; -/* First edge in the deleted edges chain. */ - -edge first_deleted_edge; -static basic_block first_deleted_block; - /* The basic block array. */ varray_type basic_block_info; /* The special entry and exit blocks. */ +basic_block ENTRY_BLOCK_PTR, EXIT_BLOCK_PTR; + +/* Memory alloc pool for bb member rbi. */ +alloc_pool rbi_pool; -struct basic_block_def entry_exit_blocks[2] -= {{NULL, /* head */ - NULL, /* end */ - NULL, /* head_tree */ - NULL, /* end_tree */ - NULL, /* pred */ - NULL, /* succ */ - NULL, /* local_set */ - NULL, /* cond_local_set */ - NULL, /* global_live_at_start */ - NULL, /* global_live_at_end */ - NULL, /* aux */ - ENTRY_BLOCK, /* index */ - NULL, /* prev_bb */ - EXIT_BLOCK_PTR, /* next_bb */ - 0, /* loop_depth */ - NULL, /* loop_father */ - 0, /* count */ - 0, /* frequency */ - 0 /* flags */ - }, - { - NULL, /* head */ - NULL, /* end */ - NULL, /* head_tree */ - NULL, /* end_tree */ - NULL, /* pred */ - NULL, /* succ */ - NULL, /* local_set */ - NULL, /* cond_local_set */ - NULL, /* global_live_at_start */ - NULL, /* global_live_at_end */ - NULL, /* aux */ - EXIT_BLOCK, /* index */ - ENTRY_BLOCK_PTR, /* prev_bb */ - NULL, /* next_bb */ - 0, /* loop_depth */ - NULL, /* loop_father */ - 0, /* count */ - 0, /* frequency */ - 0 /* flags */ - } -}; - -void debug_flow_info PARAMS ((void)); -static void free_edge PARAMS ((edge)); +void debug_flow_info (void); +static void free_edge (edge); /* Called once at initialization time. */ void -init_flow () +init_flow (void) { static int initialized; - first_deleted_edge = 0; - first_deleted_block = 0; n_edges = 0; if (!initialized) { gcc_obstack_init (&flow_obstack); - flow_firstobj = (char *) obstack_alloc (&flow_obstack, 0); + flow_firstobj = obstack_alloc (&flow_obstack, 0); initialized = 1; } else { obstack_free (&flow_obstack, flow_firstobj); - flow_firstobj = (char *) obstack_alloc (&flow_obstack, 0); + flow_firstobj = obstack_alloc (&flow_obstack, 0); } + + ENTRY_BLOCK_PTR = ggc_alloc_cleared (sizeof (*ENTRY_BLOCK_PTR)); + ENTRY_BLOCK_PTR->index = ENTRY_BLOCK; + EXIT_BLOCK_PTR = ggc_alloc_cleared (sizeof (*EXIT_BLOCK_PTR)); + EXIT_BLOCK_PTR->index = EXIT_BLOCK; + ENTRY_BLOCK_PTR->next_bb = EXIT_BLOCK_PTR; + EXIT_BLOCK_PTR->prev_bb = ENTRY_BLOCK_PTR; } /* Helper function for remove_edge and clear_edges. Frees edge structure without actually unlinking it from the pred/succ lists. */ static void -free_edge (e) - edge e; +free_edge (edge e ATTRIBUTE_UNUSED) { n_edges--; - memset (e, 0, sizeof *e); - e->succ_next = first_deleted_edge; - first_deleted_edge = e; + /* ggc_free (e); */ } /* Free the memory associated with the edge structures. */ void -clear_edges () +clear_edges (void) { basic_block bb; edge e; @@ -211,28 +177,46 @@ clear_edges () /* Allocate memory for basic_block. */ basic_block -alloc_block () +alloc_block (void) { basic_block bb; - - if (first_deleted_block) - { - bb = first_deleted_block; - first_deleted_block = (basic_block) bb->succ; - bb->succ = NULL; - } - else - { - bb = (basic_block) obstack_alloc (&flow_obstack, sizeof *bb); - memset (bb, 0, sizeof *bb); - } + bb = ggc_alloc_cleared (sizeof (*bb)); return bb; } +/* Create memory pool for rbi_pool. */ + +void +alloc_rbi_pool (void) +{ + rbi_pool = create_alloc_pool ("rbi pool", + sizeof (struct reorder_block_def), + n_basic_blocks + 2); +} + +/* Free rbi_pool. */ + +void +free_rbi_pool (void) +{ + free_alloc_pool (rbi_pool); +} + +/* Initialize rbi (the structure containing data used by basic block + duplication and reordering) for the given basic block. */ + +void +initialize_bb_rbi (basic_block bb) +{ + if (bb->rbi) + abort (); + bb->rbi = pool_alloc (rbi_pool); + memset (bb->rbi, 0, sizeof (struct reorder_block_def)); +} + /* Link block B to chain after AFTER. */ void -link_block (b, after) - basic_block b, after; +link_block (basic_block b, basic_block after) { b->next_bb = after->next_bb; b->prev_bb = after; @@ -242,20 +226,21 @@ link_block (b, after) /* Unlink block B from chain. */ void -unlink_block (b) - basic_block b; +unlink_block (basic_block b) { b->next_bb->prev_bb = b->prev_bb; b->prev_bb->next_bb = b->next_bb; + b->prev_bb = NULL; + b->next_bb = NULL; } /* Sequentially order blocks and compact the arrays. */ void -compact_blocks () +compact_blocks (void) { int i; basic_block bb; - + i = 0; FOR_EACH_BB (bb) { @@ -267,35 +252,51 @@ compact_blocks () if (i != n_basic_blocks) abort (); + for (; i < last_basic_block; i++) + BASIC_BLOCK (i) = NULL; + last_basic_block = n_basic_blocks; } - /* Remove block B from the basic block array. */ void -expunge_block (b) - basic_block b; +expunge_block (basic_block b) { unlink_block (b); BASIC_BLOCK (b->index) = NULL; n_basic_blocks--; - - /* Invalidate data to make bughunting easier. */ - memset (b, 0, sizeof *b); - b->index = -3; - b->succ = (edge) first_deleted_block; - first_deleted_block = (basic_block) b; + /* ggc_free (b); */ } +/* Create an edge connecting SRC and DEST with flags FLAGS. Return newly + created edge. Use this only if you are sure that this edge can't + possibly already exist. */ + +edge +unchecked_make_edge (basic_block src, basic_block dst, int flags) +{ + edge e; + e = ggc_alloc_cleared (sizeof (*e)); + n_edges++; + + e->succ_next = src->succ; + e->pred_next = dst->pred; + e->src = src; + e->dest = dst; + e->flags = flags; + + src->succ = e; + dst->pred = e; + + return e; +} + /* Create an edge connecting SRC and DST with FLAGS optionally using edge cache CACHE. Return the new edge, NULL if already exist. */ edge -cached_make_edge (edge_cache, src, dst, flags) - sbitmap *edge_cache; - basic_block src, dst; - int flags; +cached_make_edge (sbitmap *edge_cache, basic_block src, basic_block dst, int flags) { int use_edge_cache; edge e; @@ -317,7 +318,7 @@ cached_make_edge (edge_cache, src, dst, flags) if (flags == 0) return NULL; - /* FALLTHRU */ + /* Fall through. */ case 0: for (e = src->succ; e; e = e->succ_next) if (e->dest == dst) @@ -328,26 +329,7 @@ cached_make_edge (edge_cache, src, dst, flags) break; } - if (first_deleted_edge) - { - e = first_deleted_edge; - first_deleted_edge = e->succ_next; - } - else - { - e = (edge) obstack_alloc (&flow_obstack, sizeof *e); - memset (e, 0, sizeof *e); - } - n_edges++; - - e->succ_next = src->succ; - e->pred_next = dst->pred; - e->src = src; - e->dest = dst; - e->flags = flags; - - src->succ = e; - dst->pred = e; + e = unchecked_make_edge (src, dst, flags); if (use_edge_cache) SET_BIT (edge_cache[src->index], dst->index); @@ -359,9 +341,7 @@ cached_make_edge (edge_cache, src, dst, flags) created edge or NULL if already exist. */ edge -make_edge (src, dest, flags) - basic_block src, dest; - int flags; +make_edge (basic_block src, basic_block dest, int flags) { return cached_make_edge (NULL, src, dest, flags); } @@ -370,9 +350,7 @@ make_edge (src, dest, flags) that it is the single edge leaving SRC. */ edge -make_single_succ_edge (src, dest, flags) - basic_block src, dest; - int flags; +make_single_succ_edge (basic_block src, basic_block dest, int flags) { edge e = make_edge (src, dest, flags); @@ -384,8 +362,7 @@ make_single_succ_edge (src, dest, flags) /* This function will remove an edge from the flow graph. */ void -remove_edge (e) - edge e; +remove_edge (edge e) { edge last_pred = NULL; edge last_succ = NULL; @@ -420,9 +397,7 @@ remove_edge (e) /* Redirect an edge's successor from one block to another. */ void -redirect_edge_succ (e, new_succ) - edge e; - basic_block new_succ; +redirect_edge_succ (edge e, basic_block new_succ) { edge *pe; @@ -440,9 +415,7 @@ redirect_edge_succ (e, new_succ) /* Like previous but avoid possible duplicate edge. */ edge -redirect_edge_succ_nodup (e, new_succ) - edge e; - basic_block new_succ; +redirect_edge_succ_nodup (edge e, basic_block new_succ) { edge s; @@ -470,9 +443,7 @@ redirect_edge_succ_nodup (e, new_succ) /* Redirect an edge's predecessor from one block to another. */ void -redirect_edge_pred (e, new_pred) - edge e; - basic_block new_pred; +redirect_edge_pred (edge e, basic_block new_pred) { edge *pe; @@ -489,7 +460,7 @@ redirect_edge_pred (e, new_pred) } void -clear_bb_flags () +clear_bb_flags (void) { basic_block bb; @@ -498,57 +469,59 @@ clear_bb_flags () } void -dump_flow_info (file) - FILE *file; +dump_flow_info (FILE *file) { int i; - int max_regno = max_reg_num (); basic_block bb; static const char * const reg_class_names[] = REG_CLASS_NAMES; - fprintf (file, "%d registers.\n", max_regno); - for (i = FIRST_PSEUDO_REGISTER; i < max_regno; i++) - if (REG_N_REFS (i)) - { - enum reg_class class, altclass; - - fprintf (file, "\nRegister %d used %d times across %d insns", - i, REG_N_REFS (i), REG_LIVE_LENGTH (i)); - if (REG_BASIC_BLOCK (i) >= 0) - fprintf (file, " in block %d", REG_BASIC_BLOCK (i)); - if (REG_N_SETS (i)) - fprintf (file, "; set %d time%s", REG_N_SETS (i), - (REG_N_SETS (i) == 1) ? "" : "s"); - if (regno_reg_rtx[i] != NULL && REG_USERVAR_P (regno_reg_rtx[i])) - fprintf (file, "; user var"); - if (REG_N_DEATHS (i) != 1) - fprintf (file, "; dies in %d places", REG_N_DEATHS (i)); - if (REG_N_CALLS_CROSSED (i) == 1) - fprintf (file, "; crosses 1 call"); - else if (REG_N_CALLS_CROSSED (i)) - fprintf (file, "; crosses %d calls", REG_N_CALLS_CROSSED (i)); - if (regno_reg_rtx[i] != NULL - && PSEUDO_REGNO_BYTES (i) != UNITS_PER_WORD) - fprintf (file, "; %d bytes", PSEUDO_REGNO_BYTES (i)); - - class = reg_preferred_class (i); - altclass = reg_alternate_class (i); - if (class != GENERAL_REGS || altclass != ALL_REGS) + if (reg_n_info) + { + int max_regno = max_reg_num (); + fprintf (file, "%d registers.\n", max_regno); + for (i = FIRST_PSEUDO_REGISTER; i < max_regno; i++) + if (REG_N_REFS (i)) { - if (altclass == ALL_REGS || class == ALL_REGS) - fprintf (file, "; pref %s", reg_class_names[(int) class]); - else if (altclass == NO_REGS) - fprintf (file, "; %s or none", reg_class_names[(int) class]); - else - fprintf (file, "; pref %s, else %s", - reg_class_names[(int) class], - reg_class_names[(int) altclass]); + enum reg_class class, altclass; + + fprintf (file, "\nRegister %d used %d times across %d insns", + i, REG_N_REFS (i), REG_LIVE_LENGTH (i)); + if (REG_BASIC_BLOCK (i) >= 0) + fprintf (file, " in block %d", REG_BASIC_BLOCK (i)); + if (REG_N_SETS (i)) + fprintf (file, "; set %d time%s", REG_N_SETS (i), + (REG_N_SETS (i) == 1) ? "" : "s"); + if (regno_reg_rtx[i] != NULL && REG_USERVAR_P (regno_reg_rtx[i])) + fprintf (file, "; user var"); + if (REG_N_DEATHS (i) != 1) + fprintf (file, "; dies in %d places", REG_N_DEATHS (i)); + if (REG_N_CALLS_CROSSED (i) == 1) + fprintf (file, "; crosses 1 call"); + else if (REG_N_CALLS_CROSSED (i)) + fprintf (file, "; crosses %d calls", REG_N_CALLS_CROSSED (i)); + if (regno_reg_rtx[i] != NULL + && PSEUDO_REGNO_BYTES (i) != UNITS_PER_WORD) + fprintf (file, "; %d bytes", PSEUDO_REGNO_BYTES (i)); + + class = reg_preferred_class (i); + altclass = reg_alternate_class (i); + if (class != GENERAL_REGS || altclass != ALL_REGS) + { + if (altclass == ALL_REGS || class == ALL_REGS) + fprintf (file, "; pref %s", reg_class_names[(int) class]); + else if (altclass == NO_REGS) + fprintf (file, "; %s or none", reg_class_names[(int) class]); + else + fprintf (file, "; pref %s, else %s", + reg_class_names[(int) class], + reg_class_names[(int) altclass]); + } + + if (regno_reg_rtx[i] != NULL && REG_POINTER (regno_reg_rtx[i])) + fprintf (file, "; pointer"); + fprintf (file, ".\n"); } - - if (regno_reg_rtx[i] != NULL && REG_POINTER (regno_reg_rtx[i])) - fprintf (file, "; pointer"); - fprintf (file, ".\n"); - } + } fprintf (file, "\n%d basic blocks, %d edges.\n", n_basic_blocks, n_edges); FOR_EACH_BB (bb) @@ -557,8 +530,7 @@ dump_flow_info (file) int sum; gcov_type lsum; - fprintf (file, "\nBasic block %d: first insn %d, last %d, ", - bb->index, INSN_UID (bb->head), INSN_UID (bb->end)); + fprintf (file, "\nBasic block %d ", bb->index); fprintf (file, "prev %d, next %d, ", bb->prev_bb->index, bb->next_bb->index); fprintf (file, "loop_depth %d, count ", bb->loop_depth); @@ -588,7 +560,7 @@ dump_flow_info (file) /* Check the consistency of profile information. We can't do that in verify_flow_info, as the counts may get invalid for incompletely - solved graphs, later elliminating of conditionals or roundoff errors. + solved graphs, later eliminating of conditionals or roundoff errors. It is still practical to have them reported for debugging of simple testcases. */ sum = 0; @@ -622,16 +594,13 @@ dump_flow_info (file) } void -debug_flow_info () +debug_flow_info (void) { dump_flow_info (stderr); } void -dump_edge_info (file, e, do_succ) - FILE *file; - edge e; - int do_succ; +dump_edge_info (FILE *file, edge e, int do_succ) { basic_block side = (do_succ ? e->dest : e->src); @@ -653,8 +622,11 @@ dump_edge_info (file, e, do_succ) if (e->flags) { - static const char * const bitnames[] - = {"fallthru", "ab", "abcall", "eh", "fake", "dfs_back", "can_fallthru"}; + static const char * const bitnames[] = { + "fallthru", "ab", "abcall", "eh", "fake", "dfs_back", + "can_fallthru", "irreducible", "sibcall", "loop_exit", + "true", "false", "exec" + }; int comma = 0; int i, flags = e->flags; @@ -684,13 +656,11 @@ static void *first_block_aux_obj = 0; static struct obstack edge_aux_obstack; static void *first_edge_aux_obj = 0; -/* Allocate an memory block of SIZE as BB->aux. The obstack must +/* Allocate a memory block of SIZE as BB->aux. The obstack must be first initialized by alloc_aux_for_blocks. */ inline void -alloc_aux_for_block (bb, size) - basic_block bb; - int size; +alloc_aux_for_block (basic_block bb, int size) { /* Verify that aux field is clear. */ if (bb->aux || !first_block_aux_obj) @@ -703,8 +673,7 @@ alloc_aux_for_block (bb, size) alloc_aux_for_block for each basic block. */ void -alloc_aux_for_blocks (size) - int size; +alloc_aux_for_blocks (int size) { static int initialized; @@ -717,7 +686,7 @@ alloc_aux_for_blocks (size) /* Check whether AUX data are still allocated. */ else if (first_block_aux_obj) abort (); - first_block_aux_obj = (char *) obstack_alloc (&block_aux_obstack, 0); + first_block_aux_obj = obstack_alloc (&block_aux_obstack, 0); if (size) { basic_block bb; @@ -730,7 +699,7 @@ alloc_aux_for_blocks (size) /* Clear AUX pointers of all blocks. */ void -clear_aux_for_blocks () +clear_aux_for_blocks (void) { basic_block bb; @@ -742,7 +711,7 @@ clear_aux_for_blocks () of all blocks. */ void -free_aux_for_blocks () +free_aux_for_blocks (void) { if (!first_block_aux_obj) abort (); @@ -752,13 +721,11 @@ free_aux_for_blocks () clear_aux_for_blocks (); } -/* Allocate an memory edge of SIZE as BB->aux. The obstack must +/* Allocate a memory edge of SIZE as BB->aux. The obstack must be first initialized by alloc_aux_for_edges. */ inline void -alloc_aux_for_edge (e, size) - edge e; - int size; +alloc_aux_for_edge (edge e, int size) { /* Verify that aux field is clear. */ if (e->aux || !first_edge_aux_obj) @@ -771,8 +738,7 @@ alloc_aux_for_edge (e, size) alloc_aux_for_edge for each basic edge. */ void -alloc_aux_for_edges (size) - int size; +alloc_aux_for_edges (int size) { static int initialized; @@ -786,7 +752,7 @@ alloc_aux_for_edges (size) else if (first_edge_aux_obj) abort (); - first_edge_aux_obj = (char *) obstack_alloc (&edge_aux_obstack, 0); + first_edge_aux_obj = obstack_alloc (&edge_aux_obstack, 0); if (size) { basic_block bb; @@ -804,7 +770,7 @@ alloc_aux_for_edges (size) /* Clear AUX pointers of all edges. */ void -clear_aux_for_edges () +clear_aux_for_edges (void) { basic_block bb; edge e; @@ -820,7 +786,7 @@ clear_aux_for_edges () of all edges. */ void -free_aux_for_edges () +free_aux_for_edges (void) { if (!first_edge_aux_obj) abort (); @@ -829,3 +795,69 @@ free_aux_for_edges () clear_aux_for_edges (); } + +void +debug_bb (basic_block bb) +{ + dump_bb (bb, stderr, 0); +} + +basic_block +debug_bb_n (int n) +{ + basic_block bb = BASIC_BLOCK (n); + dump_bb (bb, stderr, 0); + return bb; +} + +/* Dumps cfg related information about basic block BB to FILE. */ + +static void +dump_cfg_bb_info (FILE *file, basic_block bb) +{ + unsigned i; + bool first = true; + static const char * const bb_bitnames[] = + { + "dirty", "new", "reachable", "visited", "irreducible_loop", "superblock" + }; + const unsigned n_bitnames = sizeof (bb_bitnames) / sizeof (char *); + edge e; + + fprintf (file, "Basic block %d", bb->index); + for (i = 0; i < n_bitnames; i++) + if (bb->flags & (1 << i)) + { + if (first) + fprintf (file, " ("); + else + fprintf (file, ", "); + first = false; + fprintf (file, bb_bitnames[i]); + } + if (!first) + fprintf (file, ")"); + fprintf (file, "\n"); + + fprintf (file, "Predecessors: "); + for (e = bb->pred; e; e = e->pred_next) + dump_edge_info (file, e, 0); + + fprintf (file, "\nSuccessors: "); + for (e = bb->succ; e; e = e->succ_next) + dump_edge_info (file, e, 1); + fprintf (file, "\n\n"); +} + +/* Dumps a brief description of cfg to FILE. */ + +void +brief_dump_cfg (FILE *file) +{ + basic_block bb; + + FOR_EACH_BB (bb) + { + dump_cfg_bb_info (file, bb); + } +}