/* Loop manipulation code for GNU compiler.
- Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2003, 2004, 2005, 2007 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
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
+<http://www.gnu.org/licenses/>. */
#include "config.h"
#include "system.h"
struct loop *);
static void loop_redirect_edge (edge, basic_block);
static void remove_bbs (basic_block *, int);
-static bool rpe_enum_p (basic_block, void *);
+static bool rpe_enum_p (const_basic_block, const void *);
static int find_path (edge, basic_block **);
static void fix_loop_placements (struct loop *, bool *);
static bool fix_bb_placement (basic_block);
static void fix_bb_placements (basic_block, bool *);
-static basic_block create_preheader (struct loop *, int);
static void unloop (struct loop *, bool *);
#define RDIV(X,Y) (((X) + (Y) / 2) / (Y))
/* Checks whether basic block BB is dominated by DATA. */
static bool
-rpe_enum_p (basic_block bb, void *data)
+rpe_enum_p (const_basic_block bb, const void *data)
{
- return dominated_by_p (CDI_DOMINATORS, bb, data);
+ return dominated_by_p (CDI_DOMINATORS, bb, (const_basic_block) data);
}
/* Remove basic blocks BBS. NBBS is the number of the basic blocks. */
remove_path (edge e)
{
edge ae;
- basic_block *rem_bbs, *bord_bbs, *dom_bbs, from, bb;
- int i, nrem, n_bord_bbs, n_dom_bbs, nreml;
+ basic_block *rem_bbs, *bord_bbs, from, bb;
+ VEC (basic_block, heap) *dom_bbs;
+ int i, nrem, n_bord_bbs, nreml;
sbitmap seen;
bool irred_invalidated = false;
struct loop **deleted_loop;
/* Remove the path. */
from = e->src;
remove_branch (e);
- dom_bbs = XCNEWVEC (basic_block, n_basic_blocks);
+ dom_bbs = NULL;
/* Cancel loops contained in the path. */
deleted_loop = XNEWVEC (struct loop *, nrem);
free (deleted_loop);
/* Find blocks whose dominators may be affected. */
- n_dom_bbs = 0;
sbitmap_zero (seen);
for (i = 0; i < n_bord_bbs; i++)
{
ldom;
ldom = next_dom_son (CDI_DOMINATORS, ldom))
if (!dominated_by_p (CDI_DOMINATORS, from, ldom))
- dom_bbs[n_dom_bbs++] = ldom;
+ VEC_safe_push (basic_block, heap, dom_bbs, ldom);
}
free (seen);
/* Recount dominators. */
- iterate_fix_dominators (CDI_DOMINATORS, dom_bbs, n_dom_bbs);
- free (dom_bbs);
+ iterate_fix_dominators (CDI_DOMINATORS, dom_bbs, true);
+ VEC_free (basic_block, heap, dom_bbs);
free (bord_bbs);
/* Fix placements of basic blocks inside loops and the placement of
fix_loop_placements (from->loop_father, &irred_invalidated);
if (irred_invalidated
- && (current_loops->state & LOOPS_HAVE_MARKED_IRREDUCIBLE_REGIONS) != 0)
+ && loops_state_satisfies_p (LOOPS_HAVE_MARKED_IRREDUCIBLE_REGIONS))
mark_irreducible_loops ();
return true;
basic_block *bbs;
int i, n;
struct loop *subloop;
+ edge e;
+ edge_iterator ei;
/* Add it to loop structure. */
place_new_loop (loop);
}
}
+ /* Update the information about loop exit edges. */
+ for (i = 0; i < n; i++)
+ {
+ FOR_EACH_EDGE (e, ei, bbs[i]->succs)
+ {
+ rescan_loop_exit (e, false, false);
+ }
+ }
+
free (bbs);
}
{
basic_block succ_bb = latch_edge->dest;
basic_block pred_bb = header_edge->src;
- basic_block *dom_bbs, *body;
- unsigned n_dom_bbs, i;
+ basic_block *body;
+ VEC (basic_block, heap) *dom_bbs;
+ unsigned i;
sbitmap seen;
struct loop *loop = alloc_loop ();
struct loop *outer = loop_outer (succ_bb->loop_father);
scale_loop_frequencies (succ_bb->loop_father, true_scale, REG_BR_PROB_BASE);
/* Update dominators of blocks outside of LOOP. */
- dom_bbs = XCNEWVEC (basic_block, n_basic_blocks);
- n_dom_bbs = 0;
+ dom_bbs = NULL;
seen = sbitmap_alloc (last_basic_block);
sbitmap_zero (seen);
body = get_loop_body (loop);
if (!TEST_BIT (seen, ldom->index))
{
SET_BIT (seen, ldom->index);
- dom_bbs[n_dom_bbs++] = ldom;
+ VEC_safe_push (basic_block, heap, dom_bbs, ldom);
}
}
- iterate_fix_dominators (CDI_DOMINATORS, dom_bbs, n_dom_bbs);
+ iterate_fix_dominators (CDI_DOMINATORS, dom_bbs, false);
free (body);
free (seen);
- free (dom_bbs);
+ VEC_free (basic_block, heap, dom_bbs);
return loop;
}
place_new_loop (cloop);
/* Mark the new loop as copy of LOOP. */
- loop->copy = cloop;
+ set_loop_copy (loop, cloop);
/* Add it to target. */
flow_loop_tree_node_add (target, cloop);
/* Check whether LOOP's body can be duplicated. */
bool
-can_duplicate_loop_p (struct loop *loop)
+can_duplicate_loop_p (const struct loop *loop)
{
int ret;
basic_block *bbs = get_loop_body (loop);
for (aloop = loop->inner, i = 0; aloop; aloop = aloop->next, i++)
orig_loops[i] = aloop;
- loop->copy = target;
+ set_loop_copy (loop, target);
first_active = XNEWVEC (basic_block, n);
if (is_latch)
/* Update dominators of outer blocks if affected. */
for (i = 0; i < n; i++)
{
- basic_block dominated, dom_bb, *dom_bbs;
- int n_dom_bbs,j;
+ basic_block dominated, dom_bb;
+ VEC (basic_block, heap) *dom_bbs;
+ unsigned j;
bb = bbs[i];
bb->aux = 0;
- n_dom_bbs = get_dominated_by (CDI_DOMINATORS, bb, &dom_bbs);
- for (j = 0; j < n_dom_bbs; j++)
+ dom_bbs = get_dominated_by (CDI_DOMINATORS, bb);
+ for (j = 0; VEC_iterate (basic_block, dom_bbs, j, dominated); j++)
{
- dominated = dom_bbs[j];
if (flow_bb_inside_loop_p (loop, dominated))
continue;
dom_bb = nearest_common_dominator (
CDI_DOMINATORS, first_active[i], first_active_latch);
set_immediate_dominator (CDI_DOMINATORS, dominated, dom_bb);
}
- free (dom_bbs);
+ VEC_free (basic_block, heap, dom_bbs);
}
free (first_active);
MFB_KJ_EDGE to the entry part. E is the edge for that we should decide
whether to redirect it. */
-static edge mfb_kj_edge;
-static bool
+edge mfb_kj_edge;
+bool
mfb_keep_just (edge e)
{
return e != mfb_kj_edge;
entry; otherwise we also force preheader block to have only one successor.
The function also updates dominators. */
-static basic_block
+basic_block
create_preheader (struct loop *loop, int flags)
{
edge e, fallthru;
FOR_EACH_LOOP (li, loop, 0)
create_preheader (loop, flags);
- current_loops->state |= LOOPS_HAVE_PREHEADERS;
+ loops_state_set (LOOPS_HAVE_PREHEADERS);
}
/* Forces all loop latches to have only single successor. */
split_edge (e);
}
- current_loops->state |= LOOPS_HAVE_SIMPLE_LATCHES;
+ loops_state_set (LOOPS_HAVE_SIMPLE_LATCHES);
}
/* This function is called from loop_version. It splits the entry edge
struct loop *nloop;
basic_block cond_bb;
- /* CHECKME: Loop versioning does not handle nested loop at this point. */
- if (loop->inner)
- return NULL;
-
/* Record entry and latch edges for the loop */
entry = loop_preheader_edge (loop);
irred_flag = entry->flags & EDGE_IRREDUCIBLE_LOOP;
bool record_exits = false;
struct loop **superloop = XNEWVEC (struct loop *, number_of_loops ());
- gcc_assert (current_loops->state & LOOPS_HAVE_SIMPLE_LATCHES);
-
/* Remove the old bb -> loop mapping. Remember the depth of the blocks in
the loop hierarchy, so that we can recognize blocks whose loop nesting
relationship has changed. */
bb->loop_father = current_loops->tree_root;
}
- if (current_loops->state & LOOPS_HAVE_RECORDED_EXITS)
+ if (loops_state_satisfies_p (LOOPS_HAVE_RECORDED_EXITS))
{
release_recorded_exits ();
record_exits = true;
}
}
- if (current_loops->state & LOOPS_HAVE_PREHEADERS)
+ if (loops_state_satisfies_p (LOOPS_HAVE_PREHEADERS))
create_preheaders (CP_SIMPLE_PREHEADERS);
- if (current_loops->state & LOOPS_HAVE_MARKED_IRREDUCIBLE_REGIONS)
+ if (loops_state_satisfies_p (LOOPS_HAVE_SIMPLE_LATCHES))
+ force_single_succ_latches ();
+
+ if (loops_state_satisfies_p (LOOPS_HAVE_MARKED_IRREDUCIBLE_REGIONS))
mark_irreducible_loops ();
if (record_exits)
OSDN Git Service
