X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbenode.c;h=023a0933329f701b022539dd1e267019aa4c99e9;hb=65c7054fd76fe79d02225ee567f63bae64946fc2;hp=84d69c0c67f4a7695780bb60355c667e00eadafa;hpb=9b24fe0ec0f4412c790ee4a7c6fc022fd28064a1;p=libfirm

diff --git a/ir/be/benode.c b/ir/be/benode.c
index 84d69c0c6..023a09333 100644
--- a/ir/be/benode.c
+++ b/ir/be/benode.c
@@ -18,6 +18,7 @@
 #include "set.h"
 #include "pmap.h"
 #include "util.h"
+#include "debug.h"
 
 #include "irop_t.h"
 #include "irmode_t.h"
@@ -31,6 +32,8 @@
 
 #include "beirgmod.h"
 
+#define DBG_LEVEL 0
+
 typedef enum _node_kind_t {
   node_kind_spill,
   node_kind_reload,
@@ -48,16 +51,15 @@ typedef struct {
 } be_op_t;
 
 static int templ_pos_Spill[] = {
-  arch_pos_make_in(0)
+	0
 };
 
 static int templ_pos_Reload[] = {
-  arch_pos_make_out(0)
+	-1
 };
 
 static int templ_pos_Copy[] = {
-  arch_pos_make_in(0),
-  arch_pos_make_out(0)
+	0, -1
 };
 
 #define ARRSIZE(x) (sizeof(x) / sizeof(x[0]))
@@ -96,17 +98,15 @@ ir_node *new_Spill(const be_node_factory_t *factory,
 }
 
 ir_node *new_Reload(const be_node_factory_t *factory,
-    const arch_register_class_t *cls,
-    ir_graph *irg, ir_node *bl, ir_node *spill_node)
+    const arch_register_class_t *cls, ir_graph *irg,
+    ir_node *bl, ir_mode *mode, ir_node *spill_node)
 {
-  ir_mode *mode;
   ir_node *in[1];
   ir_op *op = get_op(factory, cls, node_kind_reload)->op;
 
   assert(op && "Reload opcode must be present for this register class");
-  assert(is_Spill(factory, spill_node) && "Operand of Reload must be a Spill");
+  // assert(is_Spill(factory, spill_node) && "Operand of Reload must be a Spill");
   in[0] = spill_node;
-  mode = get_irn_mode(get_irn_n(spill_node, 0));
 
   return new_ir_node(NULL, irg, bl, op, mode, 1, in);
 }
@@ -125,13 +125,58 @@ ir_node *new_Copy(const be_node_factory_t *factory,
     ir_graph *irg, ir_node *bl, ir_node *in)
 {
   ir_node *ins[1];
-  ir_op *op = get_op(factory, cls, node_kind_perm)->op;
+  ir_op *op = get_op(factory, cls, node_kind_copy)->op;
 
   ins[0] = in;
 
   return new_ir_node(NULL, irg, bl, op, get_irn_mode(in), 1, ins);
 }
 
+ir_node *be_spill(
+		const be_node_factory_t *factory,
+		const arch_env_t *arch_env,
+		ir_node *irn)
+{
+  const arch_register_class_t *cls = arch_get_irn_reg_class(arch_env, irn, -1);
+  ir_node *bl    = get_nodes_block(irn);
+  ir_graph *irg  = get_irn_irg(bl);
+  ir_node *spill = new_Spill(factory, cls, irg, bl, irn);
+
+	ir_node *insert;
+
+	/*
+	 * search the right insertion point. a spill of a phi cannot be put
+	 * directly after the phi, if there are some phis behind the one which
+	 * is spilled.
+	 */
+	insert = sched_next(irn);
+	while(is_Phi(insert) && !sched_is_end(insert))
+		insert = sched_next(insert);
+
+	sched_add_before(insert, spill);
+  return spill;
+}
+
+ir_node *be_reload(const be_node_factory_t *factory,
+				   const arch_env_t *arch_env,
+				   const arch_register_class_t *cls,
+				   ir_node *irn, int pos, ir_mode *mode, ir_node *spill)
+{
+	ir_node *reload;
+
+  ir_node *bl   = get_nodes_block(irn);
+  ir_graph *irg = get_irn_irg(bl);
+
+	assert(is_Spill(factory, spill)
+			|| (is_Phi(spill) && get_irn_mode(spill) == mode_M));
+
+  reload = new_Reload(factory, cls, irg, bl, mode, spill);
+
+	set_irn_n(irn, pos, reload);
+  sched_add_before(irn, reload);
+  return reload;
+}
+
 /**
  * If the node is a proj, reset the node to the proj's target and return
  * the proj number.
@@ -147,7 +192,7 @@ static int redir_proj(const ir_node **node, int def)
 
   if(is_Proj(n)) {
     *node = get_Proj_pred(n);
-    def = get_Proj_proj(n);
+    def = -(get_Proj_proj(n) + 1);
   }
 
   return def;
@@ -157,64 +202,76 @@ static const arch_register_req_t *
 be_node_get_irn_reg_req(const arch_irn_ops_t *_self,
     arch_register_req_t *req, const ir_node *irn, int pos)
 {
-  be_op_t *bo;
-  const be_node_factory_t *factory =
-    container_of(_self, const be_node_factory_t, irn_ops);
-
-  pos = arch_pos_make_out(redir_proj(&irn, arch_pos_get_index(pos)));
+	be_op_t *bo;
+	const be_node_factory_t *factory =
+		container_of(_self, const be_node_factory_t, irn_ops);
 
-  bo = pmap_get(factory->irn_op_map, get_irn_op(irn));
-
-  if(bo) {
-    int i;
-
-    req->type = arch_register_req_type_normal;
-    req->cls = bo->cls;
-
-    for(i = 0; i < bo->n_pos; ++pos)
-      if(pos == bo->pos[i])
-        return req;
-  }
+	/*
+	 * were interested in an output operand, so
+	 * let's resolve projs.
+	 */
+	if(pos < 0)
+		pos = redir_proj((const ir_node **) &irn, pos);
 
-  return NULL;
-}
+	bo = pmap_get(factory->irn_op_map, get_irn_op(irn));
 
-static int
-be_node_get_n_operands(const arch_irn_ops_t *_self, const ir_node *irn, int in_out)
-{
-  be_op_t *bo;
-  int i, res = 0;
-  const be_node_factory_t *factory =
-    container_of(_self, const be_node_factory_t, irn_ops);
+	if(bo) {
+		int i;
 
-  redir_proj(&irn, 0);
-  bo = pmap_get(factory->irn_op_map, get_irn_op(irn));
+		req->type = arch_register_req_type_normal;
+		req->cls  = bo->cls;
 
-  for(i = 0; i < bo->n_pos; ++i)
-    res += (bo->pos[i] ^ in_out) > 0;
+		for(i = 0; i < bo->n_pos; ++i)
+			if(pos == bo->pos[i])
+				return req;
+	}
 
-  return res;
+	return NULL;
 }
 
 void
 be_node_set_irn_reg(const arch_irn_ops_t *_self, ir_node *irn,
-    int idx, const arch_register_t *reg)
+    const arch_register_t *reg)
 {
-  const arch_register_t **regs;
+	int pos;
+	const arch_register_t **regs;
+	be_op_t *bo;
+	const be_node_factory_t *factory =
+		container_of(_self, const be_node_factory_t, irn_ops);
+
+	pos = redir_proj((const ir_node **) &irn, -1);
+	bo = pmap_get(factory->irn_op_map, get_irn_op(irn));
+
+	if(!bo)
+		return;
 
-  idx = redir_proj((const ir_node **) &irn, idx);
-  regs = (const arch_register_t **) &irn->attr;
-  regs[idx] = reg;
+	regs = (const arch_register_t **) &irn->attr;
+	regs[-pos - 1] = reg;
 }
 
 const arch_register_t *
-be_node_get_irn_reg(const arch_irn_ops_t *_self, const ir_node *irn, int idx)
+be_node_get_irn_reg(const arch_irn_ops_t *_self, const ir_node *irn)
 {
-  const arch_register_t **regs;
-
-  idx = redir_proj(&irn, idx);
-  regs = (const arch_register_t **) &irn->attr;
-  return regs[idx];
+	int i, pos;
+	const arch_register_t **regs;
+	be_op_t *bo;
+	const be_node_factory_t *factory =
+		container_of(_self, const be_node_factory_t, irn_ops);
+
+	pos = redir_proj((const ir_node **) &irn, -1);
+	bo = pmap_get(factory->irn_op_map, get_irn_op(irn));
+
+	if(!bo)
+		return NULL;
+
+	for(i = 0; i < bo->n_pos; ++i) {
+		if(bo->pos[i] == pos) {
+			regs = (const arch_register_t **) &irn->attr;
+			return regs[-pos - 1];
+		}
+	}
+
+	return NULL;
 }
 
 arch_irn_class_t be_node_classify(const arch_irn_ops_t *_self, const ir_node *irn)
@@ -228,9 +285,25 @@ arch_irn_class_t be_node_classify(const arch_irn_ops_t *_self, const ir_node *ir
   idx = redir_proj(&irn, 0);
   bo = pmap_get(factory->irn_op_map, get_irn_op(irn));
 
+	switch(bo->kind) {
+#define XXX(a) case node_kind_ ## a: return arch_irn_class_ ## a;
+		XXX(spill)
+		XXX(reload)
+		XXX(perm)
+		XXX(copy)
+#undef XXX
+		default:
+		return 0;
+	}
+
   return 0;
 }
 
+arch_irn_class_t be_node_get_flags(const arch_irn_ops_t *_self, const ir_node *irn)
+{
+	return 0;
+}
+
 static const arch_irn_ops_t *
 be_node_get_irn_ops(const arch_irn_handler_t *_self, const ir_node *irn)
 {
@@ -253,11 +326,10 @@ int is_Spill(const be_node_factory_t *f, const ir_node *irn)
 {
   be_op_t *bo;
   bo = pmap_get(f->irn_op_map, get_irn_op(irn));
-  return bo->kind == node_kind_spill;
+  return bo != NULL && bo->kind == node_kind_spill;
 }
 
-be_node_factory_t *be_node_factory_init(be_node_factory_t *factory,
-    const arch_isa_if_t *isa)
+be_node_factory_t *be_node_factory_init(be_node_factory_t *factory, const arch_isa_t *isa)
 {
   char buf[256];
   int i, j, n;
@@ -269,48 +341,48 @@ be_node_factory_t *be_node_factory_init(be_node_factory_t *factory,
   factory->handler.get_irn_ops = be_node_get_irn_ops;
 
   factory->irn_ops.get_irn_reg_req = be_node_get_irn_reg_req;
-  factory->irn_ops.get_n_operands  = be_node_get_n_operands;
   factory->irn_ops.set_irn_reg     = be_node_set_irn_reg;
   factory->irn_ops.get_irn_reg     = be_node_get_irn_reg;
   factory->irn_ops.classify        = be_node_classify;
+  factory->irn_ops.get_flags       = be_node_get_flags;
 
-  for(i = 0, n = isa->get_n_reg_class(); i < n; ++i) {
-    const arch_register_class_t *cls = isa->get_reg_class(i);
+  for(i = 0, n = arch_isa_get_n_reg_class(isa); i < n; ++i) {
+    const arch_register_class_t *cls = arch_isa_get_reg_class(isa, i);
     be_op_t *ent;
 
     ent = get_op(factory, cls, node_kind_spill);
     snprintf(buf, sizeof(buf), "Spill_%s", cls->name);
     ent->op = new_ir_op(get_next_ir_opcode(), buf, op_pin_state_pinned,
-        0, 0, oparity_unary, 0);
+        0, oparity_unary, 0, 0, NULL);
     ent->n_pos = ARRSIZE(templ_pos_Spill);
     ent->pos = templ_pos_Spill;
     pmap_insert(factory->irn_op_map, ent->op, ent);
 
     ent = get_op(factory, cls, node_kind_reload);
     snprintf(buf, sizeof(buf), "Reload_%s", cls->name);
-    ent->op = new_ir_op(get_next_ir_opcode(), buf, op_pin_state_pinned, 0, 0,
-        oparity_unary, sizeof(const arch_register_t *));
+    ent->op = new_ir_op(get_next_ir_opcode(), buf, op_pin_state_pinned, 0,
+        oparity_unary, 0, sizeof(const arch_register_t *), NULL);
     ent->n_pos = ARRSIZE(templ_pos_Reload);
     ent->pos = templ_pos_Reload;
     pmap_insert(factory->irn_op_map, ent->op, ent);
 
     ent = get_op(factory, cls, node_kind_copy);
     snprintf(buf, sizeof(buf), "Copy_%s", cls->name);
-    ent->op = new_ir_op(get_next_ir_opcode(), buf, op_pin_state_pinned, 0, 0,
-        oparity_unary, sizeof(const arch_register_t *));
+    ent->op = new_ir_op(get_next_ir_opcode(), buf, op_pin_state_pinned, 0,
+        oparity_unary, 0, sizeof(const arch_register_t *), NULL);
     ent->n_pos = ARRSIZE(templ_pos_Copy);
     ent->pos = templ_pos_Copy;
     pmap_insert(factory->irn_op_map, ent->op, ent);
 
     ent = get_op(factory, cls, node_kind_perm);
     snprintf(buf, sizeof(buf), "Perm_%s", cls->name);
-    ent->op = new_ir_op(get_next_ir_opcode(), buf, op_pin_state_pinned, 0, 0,
-        oparity_variable, sizeof(const arch_register_t) * cls->n_regs);
+    ent->op = new_ir_op(get_next_ir_opcode(), buf, op_pin_state_pinned, 0,
+        oparity_variable, 0, sizeof(const arch_register_t) * cls->n_regs, NULL);
     ent->n_pos = 2 * cls->n_regs;
     ent->pos = obstack_alloc(&factory->obst, sizeof(ent->pos[0]) * ent->n_pos);
     for(j = 0; j < ent->n_pos; j += 2) {
-      ent->pos[j] = arch_pos_make_in(j);
-      ent->pos[j + 1] = arch_pos_make_out(j);
+      ent->pos[j] = j;
+      ent->pos[j + 1] = -(j + 1);
     }
     pmap_insert(factory->irn_op_map, ent->op, ent);
 
@@ -319,41 +391,58 @@ be_node_factory_t *be_node_factory_init(be_node_factory_t *factory,
   return factory;
 }
 
-ir_node *insert_Perm_after(const be_main_session_env_t *env,
-    const arch_register_class_t *cls, ir_node *pos)
+ir_node *insert_Perm_after(const be_main_env_t *env,
+						   const arch_register_class_t *cls,
+						   dom_front_info_t *dom_front,
+						   ir_node *pos)
 {
-  const arch_env_t *arch_env = env->main_env->arch_env;
-  ir_node *bl = is_Block(pos) ? pos : get_nodes_block(pos);
-  ir_graph *irg = get_irn_irg(bl);
-  pset *live = put_live_end(bl, pset_new_ptr_default());
+  const arch_env_t *arch_env  = env->arch_env;
+  ir_node *bl                 = is_Block(pos) ? pos : get_nodes_block(pos);
+  ir_graph *irg               = get_irn_irg(bl);
+  pset *live                  = put_live_end(bl, pset_new_ptr_default());
+  firm_dbg_module_t *dbg      = firm_dbg_register("firm.be.node");
+
   ir_node *curr, *irn, *perm, **nodes;
   int i, n;
 
-  ir_printf("Insert Perm after: %+F\n", pos);
+  firm_dbg_set_mask(dbg, DBG_LEVEL);
+  DBG((dbg, LEVEL_1, "Insert Perm after: %+F\n", pos));
 
   sched_foreach_reverse(bl, irn) {
+    ir_node *x;
+
+	/*
+	 * If we encounter the node we want to insert the Perm after,
+	 * exit immediately, so that this node is still live
+	 */
+    if(irn == pos)
+      break;
 
-    if(arch_irn_has_reg_class(arch_env, irn, arch_pos_make_out(0), cls))
+    DBG((dbg, LEVEL_1, "%+F\n", irn));
+    for(x = pset_first(live); x; x = pset_next(live))
+      DBG((dbg, LEVEL_1, "\tlive: %+F\n", x));
+
+    if(arch_irn_has_reg_class(arch_env, irn, -1, cls))
       pset_remove_ptr(live, irn);
 
     for(i = 0, n = get_irn_arity(irn); i < n; ++i) {
       ir_node *op = get_irn_n(irn, i);
 
-      if(arch_irn_has_reg_class(arch_env, op, arch_pos_make_out(0), cls))
+      if(arch_irn_has_reg_class(arch_env, op, -1, cls))
         pset_insert_ptr(live, op);
     }
-
-    if(sched_prev(irn) == pos)
-      break;
   }
 
   n = pset_count(live);
   nodes = malloc(n * sizeof(nodes[0]));
 
-  for(irn = pset_first(live), i = 0; irn; irn = pset_next(live), i++)
+  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;
+  }
 
-  perm = new_Perm(env->main_env->node_factory, cls, irg, bl, n, nodes);
+  perm = new_Perm(env->node_factory, cls, irg, bl, n, nodes);
   sched_add_after(pos, perm);
   free(nodes);
 
@@ -361,14 +450,17 @@ ir_node *insert_Perm_after(const be_main_session_env_t *env,
   for(i = 0; i < n; ++i) {
     ir_node *copies[1];
     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] = proj;
-    be_introduce_copies(env->dom_front, perm_op, array_size(copies), copies);
+    be_introduce_copies(dom_front, perm_op, array_size(copies), copies);
   }
   return perm;
 }