/*
- * 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;
op_set = &env->op_set;
block = get_nodes_block(irn);
- cls = arch_get_irn_reg_class_out(other_different);
+ cls = arch_get_irn_reg_class(other_different);
/* Make a not spillable copy of the different node */
/* this is needed because the different irn could be */
cpy = find_copy(skip_Proj(irn), other_different);
if (! cpy) {
cpy = be_new_Copy(cls, block, other_different);
- arch_irn_set_flags(cpy, arch_irn_flags_dont_spill);
+ arch_set_irn_flags(cpy, arch_irn_flags_dont_spill);
DB((dbg_constr, LEVEL_1, "created non-spillable %+F for value %+F\n", cpy, other_different));
} else {
DB((dbg_constr, LEVEL_1, "using already existing %+F for value %+F\n", cpy, 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_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);
+ const arch_register_req_t *req = arch_get_irn_register_req(irn);
if (arch_register_req_is(req, must_be_different)) {
const unsigned other = req->other_different;
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;
/* 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 */
+ /* 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);
/* get some Proj and find out the register class of that Proj. */
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);
+ const arch_register_class_t *cls = arch_get_irn_reg_class(one_proj);
assert(is_Proj(one_proj));
DB((dbg_permmove, LEVEL_1, "perm move %+F irg %+F\n", perm, irg));
while (!sched_is_begin(node)) {
const arch_register_req_t *req;
int input = -1;
- ir_node *proj;
+ ir_node *proj = NULL;
/* search if node is a INPUT of Perm */
foreach_out_edge(perm, edge) {
break;
if (arch_irn_is(node, modify_flags))
break;
- req = arch_get_register_req_out(node);
+ req = arch_get_irn_register_req(node);
if (req->type != arch_register_req_type_normal)
break;
for (i = get_irn_arity(node) - 1; i >= 0; --i) {
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++;
perm_stayed = push_through_perm(irn);
if (perm_stayed)
- lower_perm_node(irn, walk_env);
+ lower_perm_node(irn, (lower_env_t*)walk_env);
}
void lower_nodes_after_ra(ir_graph *irg, int do_copy)