/*
- * Copyright (C) 1995-2008 University of Karlsruhe. All right reserved.
+ * Copyright (C) 1995-2011 University of Karlsruhe. All right reserved.
*
* This file is part of libFirm.
*
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. */
+/** Associates an ir_node with its copy and CopyKeep. */
typedef struct {
ir_nodeset_t copies; /**< all non-spillable copies of this irn */
const arch_register_class_t *cls;
/** 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;
+typedef struct lower_env_t {
+ ir_graph *irg;
+ unsigned do_copy : 1;
} lower_env_t;
/** Holds a Perm register pair. */
-typedef struct _reg_pair_t {
+typedef struct reg_pair_t {
const arch_register_t *in_reg; /**< a perm IN register */
ir_node *in_node; /**< the in node to which the register belongs */
int checked; /**< indicates whether the pair was check for cycle or not */
} reg_pair_t;
-typedef enum _perm_type_t {
+typedef enum perm_type_t {
PERM_CYCLE,
PERM_CHAIN,
PERM_SWAP,
} perm_type_t;
/** Structure to represent cycles or chains in a Perm. */
-typedef struct _perm_cycle_t {
+typedef struct perm_cycle_t {
const arch_register_t **elems; /**< the registers in the cycle */
int n_elems; /**< number of elements in the cycle */
perm_type_t type; /**< type (CHAIN or CYCLE) */
int pidx = get_pairidx_for_in_regidx(pairs, n, cycle.elems[i]->index);
/* create intermediate proj */
- res1 = new_r_Proj(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;
static void gen_assure_different_pattern(ir_node *irn, ir_node *other_different, constraint_env_t *env)
{
- ir_graph *irg;
ir_nodemap_t *op_set;
ir_node *block;
const arch_register_class_t *cls;
return;
}
- irg = be_get_birg_irg(env->birg);
op_set = &env->op_set;
block = get_nodes_block(irn);
cls = arch_get_irn_reg_class_out(other_different);
sched_add_before(skip_Proj(irn), cpy);
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);
+ /* insert the other different and its copies into the map */
+ entry = (op_copy_assoc_t*)ir_nodemap_get(op_set, other_different);
if (! entry) {
entry = OALLOC(&env->obst, op_copy_assoc_t);
entry->cls = cls;
static void assure_constraints_walker(ir_node *block, void *walk_env)
{
ir_node *irn;
+ constraint_env_t *env = (constraint_env_t*)walk_env;
sched_foreach_reverse(block, irn) {
ir_mode *mode = get_irn_mode(irn);
mode = get_irn_mode(proj);
if (mode_is_datab(mode))
- assure_different_constraints(proj, irn, walk_env);
+ assure_different_constraints(proj, irn, env);
}
} else if (mode_is_datab(mode)) {
- assure_different_constraints(irn, irn, walk_env);
+ assure_different_constraints(irn, irn, env);
}
}
}
/* for all */
foreach_ir_nodemap(&cenv->op_set, map_entry, map_iter) {
- op_copy_assoc_t *entry = map_entry.data;
+ op_copy_assoc_t *entry = (op_copy_assoc_t*)map_entry.data;
int idx, num_ck;
ir_node *cp;
struct obstack obst;
}
}
-/**
- * Walks over all nodes to assure register constraints.
- *
- * @param birg The birg structure containing the irg
- */
-void assure_constraints(be_irg_t *birg)
+void assure_constraints(ir_graph *irg)
{
- ir_graph *irg = be_get_birg_irg(birg);
constraint_env_t cenv;
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_nodeset_size(&entry->copies);
+ op_copy_assoc_t *entry = (op_copy_assoc_t*)map_entry.data;
+ size_t n = ir_nodeset_size(&entry->copies);
ir_node **nodes = ALLOCAN(ir_node*, n);
ir_node *cp;
ir_nodeset_iterator_t iter;
DB((dbg_constr, LEVEL_1, "\n"));
- /* introduce the copies for the operand and it's copies */
- be_ssa_construction_init(&senv, birg);
+ /* introduce the copies for the operand and its copies */
+ 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);
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));
}
* @return 1, if there is something left to perm over.
* 0, if removed the complete perm.
*/
-static int push_through_perm(ir_node *perm, lower_env_t *env)
+static int push_through_perm(ir_node *perm)
{
ir_graph *irg = get_irn_irg(perm);
ir_node *bl = get_nodes_block(perm);
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) &&
- !be_values_interfere(env->birg->lv, op, one_proj)) {
+ !be_values_interfere(lv, op, one_proj)) {
frontier = irn;
goto found_front;
}
arch_set_irn_register(node, arch_get_irn_register(proj));
/* reroute all users of the proj to the moved node. */
- edges_reroute(proj, node, irg);
-
- /* and kill it */
- set_Proj_pred(proj, new_Bad());
- kill_node(proj);
+ exchange(proj, node);
bitset_set(moved, input);
n_moved++;
if (!be_is_Perm(irn))
return;
- perm_stayed = push_through_perm(irn, walk_env);
+ perm_stayed = push_through_perm(irn);
if (perm_stayed)
- lower_perm_node(irn, walk_env);
+ lower_perm_node(irn, (lower_env_t*)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