/*
- * Copyright (C) 1995-2007 University of Karlsruhe. All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe. All right reserved.
*
* This file is part of libFirm.
*
static const arch_register_class_t *flag_class = NULL;
static const arch_register_t *flags_reg = NULL;
static func_rematerialize remat = NULL;
+static int changed;
static ir_node *default_remat(ir_node *node, ir_node *after)
{
return;
}
- copy = remat(flags_needed, node);
+ changed = 1;
+ copy = remat(flags_needed, node);
if(get_irn_mode(copy) == mode_T) {
ir_node *block = get_nodes_block(copy);
ir_node *node;
ir_node *flags_needed = NULL;
ir_node *flag_consumers = NULL;
- int pn;
+ int pn = -1;
(void) env;
sched_foreach_reverse(block, node) {
flag_consumers = NULL;
}
- /* test wether node destroys the flags */
+ /* test whether node destroys the flags */
if(flags_needed != NULL && is_modify_flags(node)) {
/* rematerialize */
rematerialize_or_move(flags_needed, node, flag_consumers, pn);
flag_consumers = NULL;
}
- /* test wether the current node needs flags */
+ /* test whether the current node needs flags */
arity = get_irn_arity(node);
for(i = 0; i < arity; ++i) {
- //ir_node *in = get_irn_n(node, i);
const arch_register_class_t *cls
= arch_get_irn_reg_class(arch_env, node, i);
if(cls == flag_class) {
/* spiller can't (correctly) remat flag consumers at the moment */
assert(!arch_irn_is(arch_env, node, rematerializable));
- if(new_flags_needed != flags_needed) {
+
+ if(skip_Proj(new_flags_needed) != flags_needed) {
if(flags_needed != NULL) {
/* rematerialize node */
rematerialize_or_move(flags_needed, node, flag_consumers, pn);
}
flags_needed = new_flags_needed;
- arch_set_irn_register(arch_env, flags_needed, flags_reg);
+ arch_set_irn_register(arch_env, flags_needed, flags_reg);
if(is_Proj(flags_needed)) {
pn = get_Proj_proj(flags_needed);
flags_needed = get_Proj_pred(flags_needed);
flag_class = flag_cls;
flags_reg = & flag_class->regs[0];
remat = remat_func;
+ changed = 0;
if(remat == NULL)
remat = &default_remat;
set_using_irn_link(irg);
irg_block_walk_graph(irg, fix_flags_walker, NULL, NULL);
clear_using_irn_link(irg);
+
+ if(changed) {
+ be_remove_dead_nodes_from_schedule(birg);
+ }
}