X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeirgmod.c;h=77ca78312d40309f1f779e9bc35ed44a5d633d90;hb=6e3e499d6c68aee0c6a9ada6a99f16c4f6f8445b;hp=773343f7a5de9183e42ed25f77a5157d6cbc18c5;hpb=1d017c585cbce1afb01e3e8f54b1af6cbcd0eabd;p=libfirm

diff --git a/ir/be/beirgmod.c b/ir/be/beirgmod.c
index 773343f7a..77ca78312 100644
--- a/ir/be/beirgmod.c
+++ b/ir/be/beirgmod.c
@@ -4,10 +4,11 @@
 
 #include <stdlib.h>
 
-#ifdef WIN32
-#include <malloc.h>
-#else
-#include <alloca.h>
+#ifdef HAVE_MALLOC_H
+ #include <malloc.h>
+#endif
+#ifdef HAVE_ALLOCA_H
+ #include <alloca.h>
 #endif
 
 #include "hashptr.h"
@@ -35,9 +36,23 @@
 
 #include "beirgmod.h"
 
-#define DBG_MODULE firm_dbg_register("firm.be.irgmod")
+#define DBG_MODULE "firm.be.irgmod"
 #define DBG_LEVEL SET_LEVEL_0
 
+/*
+  ____                  _
+ |  _ \  ___  _ __ ___ (_)_ __   __ _ _ __   ___ ___
+ | | | |/ _ \| '_ ` _ \| | '_ \ / _` | '_ \ / __/ _ \
+ | |_| | (_) | | | | | | | | | | (_| | | | | (_|  __/
+ |____/ \___/|_| |_| |_|_|_| |_|\__,_|_| |_|\___\___|
+ |  ___| __ ___  _ __ | |_(_) ___ _ __ ___
+ | |_ | '__/ _ \| '_ \| __| |/ _ \ '__/ __|
+ |  _|| | | (_) | | | | |_| |  __/ |  \__ \
+ |_|  |_|  \___/|_| |_|\__|_|\___|_|  |___/
+
+*/
+
+
 struct _dom_front_info_t {
   pmap *df_map;
 };
@@ -94,7 +109,7 @@ static void compute_df(ir_node *n, pmap *df_map)
 
 dom_front_info_t *be_compute_dominance_frontiers(ir_graph *irg)
 {
-  dom_front_info_t *info = malloc(sizeof(*info));
+  dom_front_info_t *info = xmalloc(sizeof(*info));
 
   edges_assure(irg);
   info->df_map = pmap_create();
@@ -124,7 +139,7 @@ static void determine_phi_blocks(pset *copies, pset* copy_blocks, pset *phi_bloc
 {
 	ir_node *bl;
 	pdeq *worklist = new_pdeq();
-	firm_dbg_module_t *dbg = DBG_MODULE;
+	FIRM_DBG_REGISTER(firm_dbg_module_t *dbg, DBG_MODULE);
 
 	/*
 	* Fill the worklist queue and the rest of the orig blocks array.
@@ -164,6 +179,20 @@ static void determine_phi_blocks(pset *copies, pset* copy_blocks, pset *phi_bloc
 	del_pdeq(worklist);
 }
 
+/*
+  ____ ____    _
+ / ___/ ___|  / \
+ \___ \___ \ / _ \
+  ___) |__) / ___ \
+ |____/____/_/   \_\
+   ____                _                   _   _
+  / ___|___  _ __  ___| |_ _ __ _   _  ___| |_(_) ___  _ __
+ | |   / _ \| '_ \/ __| __| '__| | | |/ __| __| |/ _ \| '_ \
+ | |__| (_) | | | \__ \ |_| |  | |_| | (__| |_| | (_) | | | |
+  \____\___/|_| |_|___/\__|_|   \__,_|\___|\__|_|\___/|_| |_|
+
+*/
+
 /**
  * Find the copy of the given original node whose value is 'active'
  * at a usage.
@@ -188,7 +217,7 @@ static ir_node *search_def(ir_node *usage, int pos, pset *copies, pset *copy_blo
 {
 	ir_node *curr_bl;
 	ir_node *start_irn;
-	firm_dbg_module_t *dbg = DBG_MODULE;
+	FIRM_DBG_REGISTER(firm_dbg_module_t *dbg, DBG_MODULE);
 
 	curr_bl = get_nodes_block(usage);
 
@@ -235,7 +264,7 @@ static ir_node *search_def(ir_node *usage, int pos, pset *copies, pset *copy_blo
 				ir_node **ins = xmalloc(n_preds * sizeof(ins[0]));
 
 				for(i = 0; i < n_preds; ++i)
-					ins[i] = new_r_Unknown(irg, mode);
+					ins[i] = new_r_Bad(irg);
 
 				phi = new_r_Phi(irg, curr_bl, n_preds, ins, mode);
 				DBG((dbg, LEVEL_2, "\tcreating phi %+F in %+F\n", phi, curr_bl));
@@ -268,8 +297,8 @@ static ir_node *search_def(ir_node *usage, int pos, pset *copies, pset *copy_blo
 
 static void fix_usages(pset *copies, pset *copy_blocks, pset *phi_blocks, pset *phis, pset *ignore_uses)
 {
-	firm_dbg_module_t *dbg = DBG_MODULE;
-	int n_outs             = 0;
+	int n_outs = 0;
+	FIRM_DBG_REGISTER(firm_dbg_module_t *dbg, DBG_MODULE);
 
 	struct obstack obst;
 	ir_node *irn;
@@ -384,7 +413,7 @@ void be_ssa_constr_set_phis_ignore(dom_front_info_t *df, pset *nodes, pset *phis
 	pset *phi_blocks       = pset_new_ptr(n);
 	int save_optimize      = get_optimize();
 	int save_normalize     = get_opt_normalize();
-	firm_dbg_module_t *dbg = DBG_MODULE;
+	FIRM_DBG_REGISTER(firm_dbg_module_t *dbg, DBG_MODULE);
 
 	ir_node *irn;
 
@@ -439,3 +468,69 @@ void be_ssa_constr_set(dom_front_info_t *info, pset *nodes)
 	assert(pset_count(empty_set) == 0);
 	be_ssa_constr_set_ignore(info, nodes, empty_set);
 }
+
+/*
+  ___                     _     ____
+ |_ _|_ __  ___  ___ _ __| |_  |  _ \ ___ _ __ _ __ ___
+  | || '_ \/ __|/ _ \ '__| __| | |_) / _ \ '__| '_ ` _ \
+  | || | | \__ \  __/ |  | |_  |  __/  __/ |  | | | | | |
+ |___|_| |_|___/\___|_|   \__| |_|   \___|_|  |_| |_| |_|
+
+*/
+
+ir_node *insert_Perm_after(const arch_env_t *arch_env,
+						   const arch_register_class_t *cls,
+						   dom_front_info_t *dom_front,
+						   ir_node *pos)
+{
+	ir_node *bl                 = is_Block(pos) ? pos : get_nodes_block(pos);
+	ir_graph *irg               = get_irn_irg(bl);
+	pset *live                  = pset_new_ptr_default();
+	FIRM_DBG_REGISTER(firm_dbg_module_t *dbg, "be.node");
+
+	ir_node *curr, *irn, *perm, **nodes;
+	int i, n;
+
+	DBG((dbg, LEVEL_1, "Insert Perm after: %+F\n", pos));
+
+	if(!be_liveness_nodes_live_at(arch_env, cls, pos, live));
+
+	n = pset_count(live);
+
+	if(n == 0) {
+		del_pset(live);
+		return NULL;
+	}
+
+	nodes = xmalloc(n * sizeof(nodes[0]));
+
+	DBG((dbg, LEVEL_1, "live:\n"));
+	for(irn = pset_first(live), i = 0; irn; irn = pset_next(live), i++) {
+		DBG((dbg, LEVEL_1, "\t%+F\n", irn));
+		nodes[i] = irn;
+	}
+	del_pset(live);
+
+	perm = be_new_Perm(cls, irg, bl, n, nodes);
+	sched_add_after(pos, perm);
+	free(nodes);
+
+	curr = perm;
+	for(i = 0; i < n; ++i) {
+		ir_node *copies[2];
+		ir_node *perm_op = get_irn_n(perm, i);
+		const arch_register_t *reg = arch_get_irn_register(arch_env, perm_op);
+
+		ir_mode *mode = get_irn_mode(perm_op);
+		ir_node *proj = new_r_Proj(irg, bl, perm, mode, i);
+		arch_set_irn_register(arch_env, proj, reg);
+
+		sched_add_after(curr, proj);
+		curr = proj;
+
+		copies[0] = perm_op;
+		copies[1] = proj;
+		be_ssa_constr(dom_front, 2, copies);
+	}
+	return perm;
+}