X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbetranshlp.c;h=9a723544fc125d3c11e9fb19cdf8726203748143;hb=a1e9069afa4fa1e16e2d176bcd7905d6a1ed4677;hp=ad59dbb1597e7a7d57f95b541e673fcebdf9e71d;hpb=e07b61c6ed5d198a484761f8a40a4f26520d964d;p=libfirm

diff --git a/ir/be/betranshlp.c b/ir/be/betranshlp.c
index ad59dbb15..9a723544f 100644
--- a/ir/be/betranshlp.c
+++ b/ir/be/betranshlp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2010 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -24,9 +24,7 @@
  * @date        14.06.2007
  * @version     $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "pdeq.h"
 #include "irop_t.h"
@@ -41,13 +39,13 @@
 #include "cgana.h"
 #include "debug.h"
 
-#include "beirg_t.h"
+#include "beirg.h"
 #include "betranshlp.h"
+#include "belive.h"
+#include "benode.h"
 
 typedef struct be_transform_env_t {
 	ir_graph *irg;         /**< The irg, the node should be created in */
-	int      visited;      /**< visited count that indicates whether a
-	                            node is already transformed */
 	waitq    *worklist;    /**< worklist of nodes that still need to be
 	                            transformed */
 	ir_node  *old_anchor;  /**< the old anchor node in the old irg */
@@ -56,15 +54,19 @@ typedef struct be_transform_env_t {
 
 static be_transform_env_t env;
 
-void be_set_transformed_node(ir_node *old_node, ir_node *new_node) {
+void be_set_transformed_node(ir_node *old_node, ir_node *new_node)
+{
 	set_irn_link(old_node, new_node);
+	mark_irn_visited(old_node);
 }
 
-int be_is_transformed(const ir_node *node) {
+int be_is_transformed(const ir_node *node)
+{
 	return irn_visited(node);
 }
 
-static INLINE ir_node *be_get_transformed_node(ir_node *old_node) {
+static inline ir_node *be_get_transformed_node(ir_node *old_node)
+{
 	if (irn_visited(old_node)) {
 		ir_node *new_node = get_irn_link(old_node);
 		assert(new_node != NULL);
@@ -73,7 +75,8 @@ static INLINE ir_node *be_get_transformed_node(ir_node *old_node) {
 	return NULL;
 }
 
-void be_duplicate_deps(ir_node *old_node, ir_node *new_node) {
+void be_duplicate_deps(ir_node *old_node, ir_node *new_node)
+{
 	int i;
 	int deps = get_irn_deps(old_node);
 
@@ -85,7 +88,43 @@ void be_duplicate_deps(ir_node *old_node, ir_node *new_node) {
 	}
 }
 
-ir_node *be_duplicate_node(ir_node *node) {
+void be_dep_on_frame(ir_node* node)
+{
+	ir_graph *const irg = current_ir_graph;
+
+	if (get_irg_start_block(irg) == get_nodes_block(node))
+		add_irn_dep(node, get_irg_frame(irg));
+}
+
+void be_set_transform_function(ir_op *op, be_transform_func func)
+{
+	/* shouldn't be assigned twice (except for exchanging the default
+	 * be_duplicate_node entries) */
+	assert(op->ops.generic == NULL
+			|| op->ops.generic == (op_func) be_duplicate_node);
+	op->ops.generic = (op_func) func;
+}
+
+void be_start_transform_setup(void)
+{
+	clear_irp_opcodes_generic_func();
+
+	be_set_transform_function(op_Bad,         be_duplicate_node);
+	be_set_transform_function(op_be_Barrier,  be_duplicate_node);
+	be_set_transform_function(op_be_Copy,     be_duplicate_node);
+	be_set_transform_function(op_be_CopyKeep, be_duplicate_node);
+	be_set_transform_function(op_be_IncSP,    be_duplicate_node);
+	be_set_transform_function(op_be_Keep,     be_duplicate_node);
+	be_set_transform_function(op_be_Return,   be_duplicate_node);
+	be_set_transform_function(op_be_Start,    be_duplicate_node);
+	be_set_transform_function(op_NoMem,       be_duplicate_node);
+	be_set_transform_function(op_Pin,         be_duplicate_node);
+	be_set_transform_function(op_Start,       be_duplicate_node);
+	be_set_transform_function(op_Sync,        be_duplicate_node);
+}
+
+ir_node *be_duplicate_node(ir_node *node)
+{
 	ir_node  *block = be_transform_node(get_nodes_block(node));
 	ir_graph *irg   = env.irg;
 	dbg_info *dbgi  = get_irn_dbg_info(node);
@@ -103,7 +142,7 @@ ir_node *be_duplicate_node(ir_node *node) {
 			add_irn_n(new_node, in);
 		}
 	} else {
-		ir_node **ins = alloca(arity * sizeof(ins[0]));
+		ir_node **ins = ALLOCAN(ir_node*, arity);
 		for (i = 0; i < arity; ++i) {
 			ir_node *in = get_irn_n(node, i);
 			ins[i] = be_transform_node(in);
@@ -112,49 +151,40 @@ ir_node *be_duplicate_node(ir_node *node) {
 		new_node = new_ir_node(dbgi, irg, block, op, mode, arity, ins);
 	}
 
-	copy_node_attr(node, new_node);
+	copy_node_attr(irg, node, new_node);
 	be_duplicate_deps(node, new_node);
 
-#ifdef DEBUG_libfirm
 	new_node->node_nr = node->node_nr;
-#endif
-
 	return new_node;
 }
 
-/**
- * Calls transformation function for given node and marks it visited.
- */
-ir_node *be_transform_node(ir_node *node) {
-	ir_op   *op;
-	ir_node *new_node = be_get_transformed_node(node);
+ir_node *be_transform_node(ir_node *node)
+{
+	ir_op             *op;
+	ir_node           *new_node = be_get_transformed_node(node);
+	be_transform_func *transform;
 
 	if (new_node != NULL)
 		return new_node;
 
-	mark_irn_visited(node);
 	DEBUG_ONLY(be_set_transformed_node(node, NULL));
 
 	op = get_irn_op(node);
-	if (op->ops.generic) {
-		be_transform_func *transform = (be_transform_func *)op->ops.generic;
-
-		new_node = transform(node);
-		assert(new_node != NULL);
-	} else {
-		new_node = be_duplicate_node(node);
+	if (op->ops.generic == NULL) {
+		panic("No transform function registered for node %+F.", node);
 	}
+	transform = (be_transform_func *)op->ops.generic;
+
+	new_node = transform(node);
+	assert(new_node != NULL);
 
 	be_set_transformed_node(node, new_node);
-	mark_irn_visited(new_node);
 	hook_dead_node_elim_subst(current_ir_graph, node, new_node);
 	return new_node;
 }
 
-/**
- * enqueue all inputs into the transform queue.
- */
-void be_enqueue_preds(ir_node *node) {
+void be_enqueue_preds(ir_node *node)
+{
 	int i, arity;
 
 	/* put the preds in the worklist */
@@ -168,17 +198,16 @@ void be_enqueue_preds(ir_node *node) {
 /**
  * Rewire nodes which are potential loops (like Phis) to avoid endless loops.
  */
-static void fix_loops(ir_node *node) {
+static void fix_loops(ir_node *node)
+{
 	int i, arity;
 	int changed;
 
 	assert(node_is_in_irgs_storage(env.irg, node));
 
-	if (irn_visited(node))
+	if (irn_visited_else_mark(node))
 		return;
 
-	mark_irn_visited(node);
-
 	changed = 0;
 	if (! is_Block(node)) {
 		ir_node *block     = get_nodes_block(node);
@@ -207,7 +236,7 @@ static void fix_loops(ir_node *node) {
 		fix_loops(in);
 	}
 	/* fix proj block */
-	if(is_Proj(node)) {
+	if (is_Proj(node)) {
 		set_nodes_block(node, get_nodes_block(get_Proj_pred(node)));
 		changed = 1;
 	}
@@ -226,23 +255,19 @@ static void fix_loops(ir_node *node) {
 		fix_loops(in);
 	}
 
-	if(changed) {
-		identify_remember(current_ir_graph->value_table, node);
+	if (changed) {
+		identify_remember(node);
 	}
 }
 
-ir_node *be_pre_transform_node(ir_node *place) {
+ir_node *be_pre_transform_node(ir_node *place)
+{
 	if (place == NULL)
 		return NULL;
 
 	return be_transform_node(place);
 }
 
-ir_node *be_get_old_anchor(int anchor)
-{
-	return get_irn_n(env.old_anchor, anchor);
-}
-
 static void pre_transform_anchor(int anchor)
 {
 	ir_node *old_anchor_node = get_irn_n(env.old_anchor, anchor);
@@ -254,16 +279,32 @@ static void kill_unused_anchor(int anchor)
 {
 	ir_node *old_anchor_node = get_irn_n(env.old_anchor, anchor);
 	ir_node *old_bad         = get_irn_n(env.old_anchor, anchor_bad);
-	if(old_anchor_node != NULL && get_irn_n_edges(old_anchor_node) <= 1) {
+	if (old_anchor_node != NULL && get_irn_n_edges(old_anchor_node) <= 1) {
 		set_irn_n(env.old_anchor, anchor, old_bad);
 	}
 }
 
+static ir_node *new_be_Anchor(ir_graph *irg)
+{
+	struct obstack *obst = be_get_be_obst(irg);
+	backend_info_t *info;
+	ir_node        *new_anchor;
+
+	/* Hack: some places in the code ask the Anchor for its register
+	   requirements */
+	new_anchor = new_Anchor(irg);
+	info = be_get_info(new_anchor);
+	info->out_infos = NEW_ARR_D(reg_out_info_t, obst, 1);
+	memset(info->out_infos, 0, 1 * sizeof(info->out_infos[0]));
+	info->out_infos[0].req = arch_no_register_req;
+
+	return new_anchor;
+}
+
 /**
  * Transforms all nodes. Deletes the old obstack and creates a new one.
  */
-static void transform_nodes(ir_graph *irg, arch_pretrans_nodes *pre_transform,
-                            void *cg)
+static void transform_nodes(ir_graph *irg, arch_pretrans_nodes *pre_transform)
 {
 	int       i;
 	ir_node  *old_end, *new_anchor;
@@ -273,7 +314,6 @@ static void transform_nodes(ir_graph *irg, arch_pretrans_nodes *pre_transform,
 	inc_irg_visited(irg);
 
 	env.irg         = irg;
-	env.visited     = get_irg_visited(irg);
 	env.worklist    = new_waitq();
 	env.old_anchor  = irg->anchor;
 
@@ -288,7 +328,7 @@ static void transform_nodes(ir_graph *irg, arch_pretrans_nodes *pre_transform,
 		waitq_put(env.worklist, anchor);
 	}
 
-	new_anchor  = new_Anchor(irg);
+	new_anchor  = new_be_Anchor(irg);
 	irg->anchor = new_anchor;
 
 	/* pre transform some anchors (so they are available in the other transform
@@ -301,7 +341,7 @@ static void transform_nodes(ir_graph *irg, arch_pretrans_nodes *pre_transform,
 	kill_unused_anchor(anchor_tls);
 
 	if (pre_transform)
-		(*pre_transform)(cg);
+		pre_transform();
 
 	/* process worklist (this should transform all nodes in the graph) */
 	while (! waitq_empty(env.worklist)) {
@@ -321,7 +361,6 @@ static void transform_nodes(ir_graph *irg, arch_pretrans_nodes *pre_transform,
 		fix_loops(anchor);
 		set_irn_n(new_anchor, i, anchor);
 	}
-	set_nodes_block(new_anchor, get_irg_anchor(irg, anchor_end_block));
 
 	del_waitq(env.worklist);
 	free_End(old_end);
@@ -331,38 +370,16 @@ static void transform_nodes(ir_graph *irg, arch_pretrans_nodes *pre_transform,
 /**
  * Transform helper for blocks.
  */
-static ir_node *gen_Block(ir_node *node) {
+static ir_node *gen_Block(ir_node *node)
+{
 	ir_graph *irg             = current_ir_graph;
 	dbg_info *dbgi            = get_irn_dbg_info(node);
-	ir_node  *old_start_block = get_irn_n(env.old_anchor, anchor_start_block);
-	ir_node  *macroblock      = get_Block_MacroBlock(node);
 	ir_node  *block;
 
-	/*
-	 * We replace the ProjX from the start node with a jump,
-	 * so the startblock has no preds anymore now
-	 */
-	if (node == old_start_block) {
-		return new_rd_Block(dbgi, irg, 0, NULL);
-	}
-
-	/* we use the old blocks for now, because jumps allow cycles in the graph
-	 * we have to fix this later */
 	block = new_ir_node(dbgi, irg, NULL, get_irn_op(node), get_irn_mode(node),
 	                    get_irn_arity(node), get_irn_in(node) + 1);
-	copy_node_attr(node, block);
-#ifdef DEBUG_libfirm
+	copy_node_attr(irg, node, block);
 	block->node_nr = node->node_nr;
-#endif
-	if (node == macroblock) {
-		/* this node is a macroblock header */
-		set_Block_MacroBlock(block, block);
-	} else {
-		macroblock = be_transform_node(macroblock);
-		set_Block_MacroBlock(block, macroblock);
-	}
-
-	be_set_transformed_node(node, block);
 
 	/* put the preds in the worklist */
 	be_enqueue_preds(node);
@@ -370,7 +387,8 @@ static ir_node *gen_Block(ir_node *node) {
 	return block;
 }
 
-static ir_node *gen_End(ir_node *node) {
+static ir_node *gen_End(ir_node *node)
+{
 	/* end has to be duplicated manually because we need a dynamic in array */
 	ir_graph *irg   = current_ir_graph;
 	dbg_info *dbgi  = get_irn_dbg_info(node);
@@ -379,11 +397,10 @@ static ir_node *gen_End(ir_node *node) {
 	ir_node  *new_end;
 
 	new_end = new_ir_node(dbgi, irg, block, op_End, mode_X, -1, NULL);
-	copy_node_attr(node, new_end);
+	copy_node_attr(irg, node, new_end);
 	be_duplicate_deps(node, new_end);
 
 	set_irg_end(irg, new_end);
-	be_set_transformed_node(new_end, new_end);
 
 	/* transform preds */
 	arity = get_irn_arity(node);
@@ -397,9 +414,8 @@ static ir_node *gen_End(ir_node *node) {
 	return new_end;
 }
 
-void be_transform_graph(be_irg_t *birg, arch_pretrans_nodes *func, void *cg)
+void be_transform_graph(ir_graph *irg, arch_pretrans_nodes *func)
 {
-	ir_graph *irg = birg->irg;
 	ir_graph *old_current_ir_graph = current_ir_graph;
 	struct obstack *old_obst = NULL;
 	struct obstack *new_obst = NULL;
@@ -413,16 +429,20 @@ void be_transform_graph(be_irg_t *birg, arch_pretrans_nodes *func, void *cg)
 	irg->obst = new_obst;
 	irg->last_node_idx = 0;
 
+	/* invalidate phase info as (at least vrp info) is used inside the
+	 * equivalent/compute_value functions and might replace our newly
+	 * created nodes with middleend nodes */
+	irg_invalidate_phases(irg);
+
 	/* create new value table for CSE */
-	del_identities(irg->value_table);
-	irg->value_table = new_identities();
+	new_identities(irg);
 
 	/* enter special helper */
 	op_Block->ops.generic = (op_func)gen_Block;
 	op_End->ops.generic   = (op_func)gen_End;
 
 	/* do the main transformation */
-	transform_nodes(irg, func, cg);
+	transform_nodes(irg, func);
 
 	/* free the old obstack */
 	obstack_free(old_obst, 0);
@@ -438,17 +458,87 @@ void be_transform_graph(be_irg_t *birg, arch_pretrans_nodes *func, void *cg)
 	free_loop_information(irg);
 	set_irg_doms_inconsistent(irg);
 
-	be_liveness_invalidate(be_get_birg_liveness(birg));
+	be_liveness_invalidate(be_get_irg_liveness(irg));
 	/* Hack for now, something is buggy with invalidate liveness... */
-	birg->lv = NULL;
-	be_invalidate_dom_front(birg);
+	be_birg_from_irg(irg)->lv = NULL;
+	be_invalidate_dom_front(irg);
 
 	/* recalculate edges */
 	edges_deactivate(irg);
 	edges_activate(irg);
+}
 
-	if (birg->lv) {
-		be_liveness_free(birg->lv);
-		birg->lv = be_liveness(birg);
+int be_mux_is_abs(ir_node *sel, ir_node *mux_true, ir_node *mux_false)
+{
+	ir_node *cmp_left;
+	ir_node *cmp_right;
+	ir_node *cmp;
+	ir_mode *mode;
+	pn_Cmp   pnc;
+
+	if (!is_Proj(sel))
+		return 0;
+	cmp = get_Proj_pred(sel);
+	if (!is_Cmp(cmp))
+		return 0;
+
+	/**
+	 * Note further that these optimization work even for floating point
+	 * with NaN's because -NaN == NaN.
+	 * However, if +0 and -0 is handled differently, we cannot use the Abs/-Abs
+	 * transformations.
+	 */
+	mode = get_irn_mode(mux_true);
+	if (mode_honor_signed_zeros(mode))
+		return 0;
+
+	/* must be <, <=, >=, > */
+	pnc = get_Proj_proj(sel);
+	switch (pnc) {
+	case pn_Cmp_Ge:
+	case pn_Cmp_Gt:
+	case pn_Cmp_Le:
+	case pn_Cmp_Lt:
+	case pn_Cmp_Uge:
+	case pn_Cmp_Ug:
+	case pn_Cmp_Ul:
+	case pn_Cmp_Ule:
+		break;
+	default:
+		return 0;
 	}
+
+	if (!is_negated_value(mux_true, mux_false))
+		return 0;
+
+	/* must be x cmp 0 */
+	cmp_right = get_Cmp_right(cmp);
+	if (!is_Const(cmp_right) || !is_Const_null(cmp_right))
+		return 0;
+
+	cmp_left = get_Cmp_left(cmp);
+	if (cmp_left == mux_false) {
+		if (pnc & pn_Cmp_Lt) {
+			return 1;
+		} else {
+			assert(pnc & pn_Cmp_Gt);
+			return -1;
+		}
+	} else if (cmp_left == mux_true) {
+		if (pnc & pn_Cmp_Lt) {
+			return -1;
+		} else {
+			assert(pnc & pn_Cmp_Gt);
+			return 1;
+		}
+	}
+
+	return 0;
+}
+
+ir_node *be_get_abs_op(ir_node *sel)
+{
+	ir_node *cmp      = get_Proj_pred(sel);
+	ir_node *cmp_left = get_Cmp_left(cmp);
+	return cmp_left;
 }