#include "ircons.h"
#include "debug.h"
-#include "irhooks.h"
#include "xmalloc.h"
#include "irnodeset.h"
#include "irnodemap.h"
#include "irgwalk.h"
#include "array_t.h"
-#include "bearch_t.h"
+#include "bearch.h"
#include "belower.h"
-#include "benode_t.h"
-#include "besched_t.h"
+#include "benode.h"
+#include "besched.h"
#include "bestat.h"
#include "bessaconstr.h"
#include "beintlive_t.h"
DEBUG_ONLY(static firm_dbg_module_t *dbg;)
DEBUG_ONLY(static firm_dbg_module_t *dbg_constr;)
+DEBUG_ONLY(static firm_dbg_module_t *dbg_permmove;)
/** Associates an ir_node with it's copy and CopyKeep. */
typedef struct {
/** Environment for constraints. */
typedef struct {
- be_irg_t *birg;
+ ir_graph *irg;
ir_nodemap_t op_set;
struct obstack obst;
} constraint_env_t;
/** Lowering walker environment. */
typedef struct _lower_env_t {
- be_irg_t *birg;
- unsigned do_copy : 1;
+ ir_graph *irg;
+ unsigned do_copy : 1;
} lower_env_t;
/** Holds a Perm register pair. */
} perm_cycle_t;
/** returns the number register pairs marked as checked. */
-static int get_n_checked_pairs(reg_pair_t *pairs, int n) {
- int i, n_checked = 0;
+static int get_n_unchecked_pairs(reg_pair_t const *const pairs, int const n)
+{
+ int n_unchecked = 0;
+ int i;
for (i = 0; i < n; i++) {
- if (pairs[i].checked)
- n_checked++;
+ if (!pairs[i].checked)
+ n_unchecked++;
}
- return n_checked;
+ return n_unchecked;
}
/**
* @param reg The register to look for
* @return The corresponding node or NULL if not found
*/
-static ir_node *get_node_for_in_register(reg_pair_t *pairs, int n, const arch_register_t *reg) {
+static ir_node *get_node_for_in_register(reg_pair_t *pairs, int n, const arch_register_t *reg)
+{
int i;
for (i = 0; i < n; i++) {
* @param reg The register to look for
* @return The corresponding node or NULL if not found
*/
-static ir_node *get_node_for_out_register(reg_pair_t *pairs, int n, const arch_register_t *reg) {
+static ir_node *get_node_for_out_register(reg_pair_t *pairs, int n, const arch_register_t *reg)
+{
int i;
for (i = 0; i < n; i++) {
*
* @return The corresponding index in pairs or -1 if not found
*/
-static int get_pairidx_for_in_regidx(reg_pair_t *pairs, int n, unsigned reg_idx) {
+static int get_pairidx_for_in_regidx(reg_pair_t *pairs, int n, unsigned reg_idx)
+{
int i;
for (i = 0; i < n; i++) {
*
* @return The corresponding index in pairs or -1 if not found
*/
-static int get_pairidx_for_out_regidx(reg_pair_t *pairs, int n, unsigned reg_idx) {
+static int get_pairidx_for_out_regidx(reg_pair_t *pairs, int n, unsigned reg_idx)
+{
int i;
for (i = 0; i < n; i++) {
* Gets an array of register pairs and tries to identify a cycle or chain
* starting at position start.
*
- * @param cycle Variable to hold the cycle
- * @param pairs Array of register pairs
- * @param start Index to start
+ * @param cycle Variable to hold the cycle
+ * @param pairs Array of register pairs
+ * @param n length of the pairs array
+ * @param start Index to start
+ *
* @return The cycle or chain
*/
static void get_perm_cycle(perm_cycle_t *const cycle,
{
int head = pairs[start].in_reg->index;
int cur_idx = pairs[start].out_reg->index;
- int const n_pairs_done = get_n_checked_pairs(pairs, n);
+ int const n_pairs_todo = get_n_unchecked_pairs(pairs, n);
perm_type_t cycle_tp = PERM_CYCLE;
int idx;
}
/* assume worst case: all remaining pairs build a cycle or chain */
- cycle->elems = XMALLOCNZ(const arch_register_t*, (n - n_pairs_done) * 2);
+ cycle->elems = XMALLOCNZ(const arch_register_t*, n_pairs_todo * 2);
cycle->n_elems = 2; /* initial number of elements is 2 */
cycle->elems[0] = pairs[start].in_reg;
cycle->elems[1] = pairs[start].out_reg;
*
* @param irn The perm node
* @param block The block the perm node belongs to
- * @param walk_env The environment
+ * @param env The lowerer environment
*/
-static void lower_perm_node(ir_node *irn, void *walk_env)
+static void lower_perm_node(ir_node *irn, lower_env_t *env)
{
- lower_env_t *const env = walk_env;
const arch_register_class_t *const reg_class = arch_get_irn_register(get_irn_n(irn, 0))->reg_class;
- ir_graph *const irg = get_irn_irg(irn);
ir_node *const block = get_nodes_block(irn);
- int const n = get_irn_arity(irn);
- reg_pair_t *const pairs = alloca(n * sizeof(pairs[0]));
+ int const arity = get_irn_arity(irn);
+ reg_pair_t *const pairs = ALLOCAN(reg_pair_t, arity);
int keep_perm = 0;
int do_copy = env->do_copy;
/* Get the schedule predecessor node to the perm.
* nodes after this node, everything should be ok. */
ir_node * sched_point = sched_prev(irn);
const ir_edge_t * edge;
+ const ir_edge_t * next;
+ int n;
int i;
DBG((dbg, LEVEL_1, "perm: %+F, sched point is %+F\n", irn, sched_point));
assert(sched_point && "Perm is not scheduled or has no predecessor");
- assert(n == get_irn_n_edges(irn) && "perm's in and out numbers different");
+ assert(arity == get_irn_n_edges(irn) && "perm's in and out numbers different");
/* build the list of register pairs (in, out) */
- i = 0;
- foreach_out_edge(irn, edge) {
- reg_pair_t *const pair = &pairs[i++];
- ir_node *const out = get_edge_src_irn(edge);
- long const pn = get_Proj_proj(out);
- ir_node *const in = get_irn_n(irn, pn);
+ n = 0;
+ foreach_out_edge_safe(irn, edge, next) {
+ ir_node *const out = get_edge_src_irn(edge);
+ long const pn = get_Proj_proj(out);
+ ir_node *const in = get_irn_n(irn, pn);
+ arch_register_t const *const in_reg = arch_get_irn_register(in);
+ arch_register_t const *const out_reg = arch_get_irn_register(out);
+ reg_pair_t * pair;
+
+ if (in_reg == out_reg) {
+ DBG((dbg, LEVEL_1, "%+F removing equal perm register pair (%+F, %+F, %s)\n",
+ irn, in, out, out_reg->name));
+ exchange(out, in);
+ continue;
+ }
+ pair = &pairs[n++];
pair->in_node = in;
- pair->in_reg = arch_get_irn_register(in);
+ pair->in_reg = in_reg;
pair->out_node = out;
- pair->out_reg = arch_get_irn_register(out);
+ pair->out_reg = out_reg;
pair->checked = 0;
}
- /* Mark all equal pairs as checked, and exchange the OUT proj with the IN
- * node. */
- for (i = 0; i < n; i++) {
- reg_pair_t *const pair = &pairs[i];
-
- if (pair->in_reg->index != pair->out_reg->index)
- continue;
-
- DBG((dbg, LEVEL_1, "%+F removing equal perm register pair (%+F, %+F, %s)\n",
- irn, pair->in_node, pair->out_node, pair->out_reg->name));
-
- /* reroute the edges from the proj to the argument */
- exchange(pair->out_node, pair->in_node);
-
- pair->checked = 1;
- }
+ DBG((dbg, LEVEL_1, "%+F has %d unresolved constraints\n", irn, n));
/* Set do_copy to 0 if it's on but we have no free register */
/* TODO check for free register */
}
/* check for cycles and chains */
- while (get_n_checked_pairs(pairs, n) < n) {
+ while (get_n_unchecked_pairs(pairs, n) > 0) {
perm_cycle_t cycle;
int j;
}
DB((dbg, LEVEL_1, "\n"));
- if (n == 2 && cycle.type == PERM_CYCLE) {
+ if (cycle.type == PERM_CYCLE && arity == 2) {
/* We don't need to do anything if we have a Perm with two elements
* which represents a cycle, because those nodes already represent
* exchange nodes */
DBG((dbg, LEVEL_1, "%+F (%+F, %s) and (%+F, %s)\n",
irn, res1, cycle.elems[i]->name, res2, cycle.elems[i + 1]->name));
- cpyxchg = be_new_Perm(reg_class, irg, block, 2, in);
+ cpyxchg = be_new_Perm(reg_class, block, 2, in);
if (i > 0) {
/* cycle is not done yet */
int pidx = get_pairidx_for_in_regidx(pairs, n, cycle.elems[i]->index);
/* create intermediate proj */
- res1 = new_r_Proj(irg, block, cpyxchg, get_irn_mode(res1), 0);
+ res1 = new_r_Proj(cpyxchg, get_irn_mode(res1), 0);
/* set as in for next Perm */
pairs[pidx].in_node = res1;
arch_set_irn_register(res1, cycle.elems[i]);
/* insert the copy/exchange node in schedule after the magic schedule node (see above) */
- sched_add_after(sched_point, cpyxchg);
+ sched_add_after(skip_Proj(sched_point), cpyxchg);
- DBG((dbg, LEVEL_1, "replacing %+F with %+F, placed new node after %+F\n", irn, cpyxchg, sched_point));
+ DB((dbg, LEVEL_1, "replacing %+F with %+F, placed new node after %+F\n", irn, cpyxchg, sched_point));
/* set the new scheduling point */
sched_point = res1;
} else {
ir_node *cpyxchg;
- DBG((dbg, LEVEL_1, "%+F creating copy node (%+F, %s) -> (%+F, %s)\n",
+ DB((dbg, LEVEL_1, "%+F creating copy node (%+F, %s) -> (%+F, %s)\n",
irn, arg1, cycle.elems[i]->name, res2, cycle.elems[i + 1]->name));
- cpyxchg = be_new_Copy(reg_class, irg, block, arg1);
+ cpyxchg = be_new_Copy(reg_class, block, arg1);
arch_set_irn_register(cpyxchg, cycle.elems[i + 1]);
/* exchange copy node and proj */
exchange(res2, cpyxchg);
/* insert the copy/exchange node in schedule after the magic schedule node (see above) */
- sched_add_after(sched_point, cpyxchg);
+ sched_add_after(skip_Proj(sched_point), cpyxchg);
/* set the new scheduling point */
sched_point = cpyxchg;
-static int has_irn_users(const ir_node *irn) {
+static int has_irn_users(const ir_node *irn)
+{
return get_irn_out_edge_first_kind(irn, EDGE_KIND_NORMAL) != 0;
}
}
}
-static void gen_assure_different_pattern(ir_node *irn, ir_node *other_different, constraint_env_t *env) {
- ir_graph *irg;
+static void gen_assure_different_pattern(ir_node *irn, ir_node *other_different, constraint_env_t *env)
+{
ir_nodemap_t *op_set;
ir_node *block;
const arch_register_class_t *cls;
ir_node *keep, *cpy;
op_copy_assoc_t *entry;
- if (arch_irn_is(other_different, ignore) ||
+ if (arch_irn_is_ignore(other_different) ||
!mode_is_datab(get_irn_mode(other_different))) {
- DBG((dbg_constr, LEVEL_1, "ignore constraint for %+F because other_irn is ignore or not a datab node\n", irn));
+ DB((dbg_constr, LEVEL_1, "ignore constraint for %+F because other_irn is ignore or not a datab node\n", irn));
return;
}
- irg = be_get_birg_irg(env->birg);
op_set = &env->op_set;
block = get_nodes_block(irn);
- cls = arch_get_irn_reg_class(other_different, -1);
+ cls = arch_get_irn_reg_class_out(other_different);
/* Make a not spillable copy of the different node */
/* this is needed because the different irn could be */
/* check if already exists such a copy in the schedule immediately before */
cpy = find_copy(skip_Proj(irn), other_different);
if (! cpy) {
- cpy = be_new_Copy(cls, irg, block, other_different);
- be_node_set_flags(cpy, BE_OUT_POS(0), arch_irn_flags_dont_spill);
- DBG((dbg_constr, LEVEL_1, "created non-spillable %+F for value %+F\n", cpy, other_different));
+ cpy = be_new_Copy(cls, block, other_different);
+ arch_irn_set_flags(cpy, arch_irn_flags_dont_spill);
+ DB((dbg_constr, LEVEL_1, "created non-spillable %+F for value %+F\n", cpy, other_different));
} else {
- DBG((dbg_constr, LEVEL_1, "using already existing %+F for value %+F\n", cpy, other_different));
+ DB((dbg_constr, LEVEL_1, "using already existing %+F for value %+F\n", cpy, other_different));
}
/* Add the Keep resp. CopyKeep and reroute the users */
/* of the other_different irn in case of CopyKeep. */
if (has_irn_users(other_different)) {
- keep = be_new_CopyKeep_single(cls, irg, block, cpy, irn, get_irn_mode(other_different));
- be_node_set_reg_class(keep, 1, cls);
+ keep = be_new_CopyKeep_single(cls, block, cpy, irn, get_irn_mode(other_different));
+ be_node_set_reg_class_in(keep, 1, cls);
} else {
ir_node *in[2];
in[0] = irn;
in[1] = cpy;
- keep = be_new_Keep(cls, irg, block, 2, in);
+ keep = be_new_Keep(block, 2, in);
}
- DBG((dbg_constr, LEVEL_1, "created %+F(%+F, %+F)\n\n", keep, irn, cpy));
+ DB((dbg_constr, LEVEL_1, "created %+F(%+F, %+F)\n\n", keep, irn, cpy));
/* insert copy and keep into schedule */
assert(sched_is_scheduled(irn) && "need schedule to assure constraints");
if (! sched_is_scheduled(cpy))
sched_add_before(skip_Proj(irn), cpy);
- sched_add_after(irn, keep);
+ sched_add_after(skip_Proj(irn), keep);
/* insert the other different and it's copies into the map */
entry = ir_nodemap_get(op_set, other_different);
if (! entry) {
- entry = obstack_alloc(&env->obst, sizeof(*entry));
+ entry = OALLOC(&env->obst, op_copy_assoc_t);
entry->cls = cls;
ir_nodeset_init(&entry->copies);
* @param skipped_irn if irn is a Proj node, its predecessor, else irn
* @param env the constraint environment
*/
-static void assure_different_constraints(ir_node *irn, ir_node *skipped_irn, constraint_env_t *env) {
- const arch_register_req_t *req = arch_get_register_req(irn, -1);
+static void assure_different_constraints(ir_node *irn, ir_node *skipped_irn, constraint_env_t *env)
+{
+ const arch_register_req_t *req = arch_get_register_req_out(irn);
if (arch_register_req_is(req, must_be_different)) {
const unsigned other = req->other_different;
* @param block The block to be checked
* @param walk_env The walker environment
*/
-static void assure_constraints_walker(ir_node *block, void *walk_env) {
+static void assure_constraints_walker(ir_node *block, void *walk_env)
+{
ir_node *irn;
sched_foreach_reverse(block, irn) {
* Melt all copykeeps pointing to the same node
* (or Projs of the same node), copying the same operand.
*/
-static void melt_copykeeps(constraint_env_t *cenv) {
- be_irg_t *birg = cenv->birg;
- ir_graph *irg = be_get_birg_irg(birg);
+static void melt_copykeeps(constraint_env_t *cenv)
+{
ir_nodemap_iterator_t map_iter;
ir_nodemap_entry_t map_entry;
ref_mode_T = skip_Proj(get_irn_n(ref, 1));
obstack_grow(&obst, &ref, sizeof(ref));
- DBG((dbg_constr, LEVEL_1, "Trying to melt %+F:\n", ref));
+ DB((dbg_constr, LEVEL_1, "Trying to melt %+F:\n", ref));
/* check for copykeeps pointing to the same mode_T node as the reference copykeep */
for (j = 0; j < num_ck; ++j) {
if (j != idx && cur_ck && skip_Proj(get_irn_n(cur_ck, 1)) == ref_mode_T) {
obstack_grow(&obst, &cur_ck, sizeof(cur_ck));
ir_nodeset_remove(&entry->copies, cur_ck);
- DBG((dbg_constr, LEVEL_1, "\t%+F\n", cur_ck));
+ DB((dbg_constr, LEVEL_1, "\t%+F\n", cur_ck));
ck_arr[j] = NULL;
++n_melt;
sched_remove(cur_ck);
/* check, if we found some candidates for melting */
if (n_melt == 1) {
- DBG((dbg_constr, LEVEL_1, "\tno candidate found\n"));
+ DB((dbg_constr, LEVEL_1, "\tno candidate found\n"));
continue;
}
}
#ifdef KEEP_ALIVE_COPYKEEP_HACK
- new_ck = be_new_CopyKeep(entry->cls, irg, get_nodes_block(ref), be_get_CopyKeep_op(ref), n_melt, new_ck_in, mode_ANY);
+ new_ck = be_new_CopyKeep(entry->cls, get_nodes_block(ref), be_get_CopyKeep_op(ref), n_melt, new_ck_in, mode_ANY);
keep_alive(new_ck);
#else
- new_ck = be_new_CopyKeep(entry->cls, irg, get_nodes_block(ref), be_get_CopyKeep_op(ref), n_melt, new_ck_in, get_irn_mode(ref));
+ new_ck = be_new_CopyKeep(entry->cls, get_nodes_block(ref), be_get_CopyKeep_op(ref), n_melt, new_ck_in, get_irn_mode(ref));
#endif /* KEEP_ALIVE_COPYKEEP_HACK */
/* set register class for all kept inputs */
for (j = 1; j <= n_melt; ++j)
- be_node_set_reg_class(new_ck, j, entry->cls);
+ be_node_set_reg_class_in(new_ck, j, entry->cls);
ir_nodeset_insert(&entry->copies, new_ck);
} while (be_is_Keep(sched_pt) || be_is_CopyKeep(sched_pt));
sched_add_before(sched_pt, new_ck);
- DBG((dbg_constr, LEVEL_1, "created %+F, scheduled before %+F\n", new_ck, sched_pt));
+ DB((dbg_constr, LEVEL_1, "created %+F, scheduled before %+F\n", new_ck, sched_pt));
/* finally: kill the reference copykeep */
kill_node(ref);
}
}
-/**
- * Walks over all nodes to assure register constraints.
- *
- * @param birg The birg structure containing the irg
- */
-void assure_constraints(be_irg_t *birg) {
- ir_graph *irg = be_get_birg_irg(birg);
+void assure_constraints(ir_graph *irg)
+{
constraint_env_t cenv;
- ir_node **nodes;
ir_nodemap_iterator_t map_iter;
ir_nodemap_entry_t map_entry;
FIRM_DBG_REGISTER(dbg_constr, "firm.be.lower.constr");
- cenv.birg = birg;
+ cenv.irg = irg;
ir_nodemap_init(&cenv.op_set);
obstack_init(&cenv.obst);
/* for all */
foreach_ir_nodemap(&cenv.op_set, map_entry, map_iter) {
- op_copy_assoc_t *entry = map_entry.data;
- int n;
- ir_node *cp;
- ir_nodeset_iterator_t iter;
+ op_copy_assoc_t *entry = map_entry.data;
+ int n = ir_nodeset_size(&entry->copies);
+ ir_node **nodes = ALLOCAN(ir_node*, n);
+ ir_node *cp;
+ ir_nodeset_iterator_t iter;
be_ssa_construction_env_t senv;
- n = ir_nodeset_size(&entry->copies);
- nodes = alloca(n * sizeof(nodes[0]));
-
/* put the node in an array */
DBG((dbg_constr, LEVEL_1, "introduce copies for %+F ", map_entry.node));
DB((dbg_constr, LEVEL_1, "\n"));
/* introduce the copies for the operand and it's copies */
- be_ssa_construction_init(&senv, birg);
+ be_ssa_construction_init(&senv, irg);
be_ssa_construction_add_copy(&senv, map_entry.node);
be_ssa_construction_add_copies(&senv, nodes, n);
be_ssa_construction_fix_users(&senv, map_entry.node);
/* so we transform unnecessary ones into Keeps. */
foreach_ir_nodeset(&entry->copies, cp, iter) {
if (be_is_CopyKeep(cp) && get_irn_n_edges(cp) < 1) {
+ int n = get_irn_arity(cp);
ir_node *keep;
- int n = get_irn_arity(cp);
- keep = be_new_Keep(arch_get_irn_reg_class(cp, -1),
- irg, get_nodes_block(cp), n, get_irn_in(cp) + 1);
+ keep = be_new_Keep(get_nodes_block(cp), n, get_irn_in(cp) + 1);
sched_add_before(cp, keep);
/* Set all ins (including the block) of the CopyKeep BAD to keep the verifier happy. */
ir_nodemap_destroy(&cenv.op_set);
obstack_free(&cenv.obst, NULL);
- be_liveness_invalidate(be_get_birg_liveness(birg));
+ be_liveness_invalidate(be_get_irg_liveness(irg));
}
* @note This routine needs interference.
* @note Probably, we can implement it a little more efficient.
* Especially searching the frontier lazily might be better.
- * @param perm The perm.
- * @param data The walker data (lower_env_t).
+ *
+ * @param perm The perm
+ * @param env The lowerer environment
+ *
* @return 1, if there is something left to perm over.
* 0, if removed the complete perm.
*/
-static int push_through_perm(ir_node *perm, void *data)
+static int push_through_perm(ir_node *perm)
{
- lower_env_t *env = data;
-
ir_graph *irg = get_irn_irg(perm);
ir_node *bl = get_nodes_block(perm);
ir_node *node;
int n_moved;
int new_size;
ir_node *frontier = bl;
- FIRM_DBG_REGISTER(firm_dbg_module_t *mod, "firm.be.lower.permmove");
-
+ ir_node *irn;
int i, n;
- const ir_edge_t *edge;
- ir_node *one_proj = NULL, *irn;
- const arch_register_class_t *cls = NULL;
-
- DBG((mod, LEVEL_1, "perm move %+F irg %+F\n", perm, irg));
/* get some Proj and find out the register class of that Proj. */
- edge = get_irn_out_edge_first_kind(perm, EDGE_KIND_NORMAL);
- one_proj = get_edge_src_irn(edge);
+ const ir_edge_t *edge = get_irn_out_edge_first_kind(perm, EDGE_KIND_NORMAL);
+ ir_node *one_proj = get_edge_src_irn(edge);
+ const arch_register_class_t *cls = arch_get_irn_reg_class_out(one_proj);
assert(is_Proj(one_proj));
- cls = arch_get_irn_reg_class(one_proj, -1);
+
+ DB((dbg_permmove, LEVEL_1, "perm move %+F irg %+F\n", perm, irg));
/* Find the point in the schedule after which the
* potentially movable nodes must be defined.
* the former dead operand would be live now at the point of
* the Perm, increasing the register pressure by one.
*/
- sched_foreach_reverse_from (sched_prev(perm), irn) {
+ sched_foreach_reverse_from(sched_prev(perm), irn) {
for (i = get_irn_arity(irn) - 1; i >= 0; --i) {
ir_node *op = get_irn_n(irn, i);
+ be_lv_t *lv = be_get_irg_liveness(irg);
if (arch_irn_consider_in_reg_alloc(cls, op) &&
- !values_interfere(env->birg, op, one_proj)) {
+ !be_values_interfere(lv, op, one_proj)) {
frontier = irn;
goto found_front;
}
}
found_front:
- DBG((mod, LEVEL_2, "\tfrontier: %+F\n", frontier));
+ DB((dbg_permmove, LEVEL_2, "\tfrontier: %+F\n", frontier));
node = sched_prev(perm);
n_moved = 0;
- while(!sched_is_begin(node)) {
+ while (!sched_is_begin(node)) {
const arch_register_req_t *req;
int input = -1;
ir_node *proj;
}
}
/* it wasn't an input to the perm, we can't do anything more */
- if(input < 0)
+ if (input < 0)
break;
- if(!sched_comes_after(frontier, node))
+ if (!sched_comes_after(frontier, node))
break;
if (arch_irn_is(node, modify_flags))
break;
- if(is_Proj(node)) {
- req = arch_get_register_req(get_Proj_pred(node),
- -1 - get_Proj_proj(node));
- } else {
- req = arch_get_register_req(node, -1);
- }
- if(req->type != arch_register_req_type_normal)
+ req = arch_get_register_req_out(node);
+ if (req->type != arch_register_req_type_normal)
break;
- for(i = get_irn_arity(node) - 1; i >= 0; --i) {
+ for (i = get_irn_arity(node) - 1; i >= 0; --i) {
ir_node *opop = get_irn_n(node, i);
if (arch_irn_consider_in_reg_alloc(cls, opop)) {
break;
}
}
- if(i >= 0)
+ if (i >= 0)
break;
- DBG((mod, LEVEL_2, "\tmoving %+F after %+F, killing %+F\n", node, perm, proj));
+ DBG((dbg_permmove, LEVEL_2, "\tmoving %+F after %+F, killing %+F\n", node, perm, proj));
/* move the movable node in front of the Perm */
sched_remove(node);
}
/* well, we could not push anything through the perm */
- if(n_moved == 0)
+ if (n_moved == 0)
return 1;
new_size = arity - n_moved;
- if(new_size == 0) {
+ if (new_size == 0) {
+ sched_remove(perm);
+ kill_node(perm);
return 0;
}
- map = alloca(new_size * sizeof(map[0]));
- proj_map = alloca(arity * sizeof(proj_map[0]));
+ map = ALLOCAN(int, new_size);
+ proj_map = ALLOCAN(int, arity);
memset(proj_map, -1, sizeof(proj_map[0]));
n = 0;
- for(i = 0; i < arity; ++i) {
- if(bitset_is_set(moved, i))
+ for (i = 0; i < arity; ++i) {
+ if (bitset_is_set(moved, i))
continue;
map[n] = i;
proj_map[i] = n;
if (!be_is_Perm(irn))
return;
- perm_stayed = push_through_perm(irn, walk_env);
- if (!perm_stayed)
- return;
-
- lower_perm_node(irn, walk_env);
+ perm_stayed = push_through_perm(irn);
+ if (perm_stayed)
+ lower_perm_node(irn, walk_env);
}
-/**
- * Walks over all blocks in an irg and performs lowering need to be
- * done after register allocation (e.g. perm lowering).
- *
- * @param birg The birg object
- * @param do_copy 1 == resolve cycles with a free reg if available
- */
-void lower_nodes_after_ra(be_irg_t *birg, int do_copy) {
+void lower_nodes_after_ra(ir_graph *irg, int do_copy)
+{
lower_env_t env;
- ir_graph *irg;
FIRM_DBG_REGISTER(dbg, "firm.be.lower");
+ FIRM_DBG_REGISTER(dbg_permmove, "firm.be.lower.permmove");
- env.birg = birg;
+ env.irg = irg;
env.do_copy = do_copy;
/* we will need interference */
- be_liveness_assure_chk(be_get_birg_liveness(birg));
+ be_liveness_assure_chk(be_get_irg_liveness(irg));
- irg = be_get_birg_irg(birg);
irg_walk_graph(irg, NULL, lower_nodes_after_ra_walker, &env);
}
projects / libfirm / blobdiff