X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbenode.c;h=a60e01a18c79f084f29734f082fff5ff4550e9dc;hb=f804d333c7b5459c3c1a6bfc188ecdc54346be73;hp=b8e3090050648a5cf6196c4448e0f3a7cb706dbe;hpb=1df970bed5ce32fdbef097e1dd60e23546fe7de6;p=libfirm

diff --git a/ir/be/benode.c b/ir/be/benode.c
index b8e309005..a60e01a18 100644
--- a/ir/be/benode.c
+++ b/ir/be/benode.c
@@ -37,9 +37,10 @@
 
 #include "beirgmod.h"
 
-#define DBG_LEVEL 0
+/* Sometimes we want to put const nodes into get_irn_generic_attr ... */
+#define get_irn_attr(irn) get_irn_generic_attr((ir_node *) (irn))
 
-#define BENODE_MAGIC FOURCC('B', 'E', 'N', 'O')
+static unsigned be_node_tag = FOURCC('B', 'E', 'N', 'O');
 
 typedef enum _node_kind_t {
 	node_kind_spill,
@@ -58,167 +59,217 @@ typedef struct {
 	int *pos;
 } be_op_t;
 
+typedef struct {
+	arch_register_req_t req;
+	unsigned            negate_limited : 1;
+	void                (*old_limited)(void *ptr, bitset_t *bs);
+	void                *old_limited_env;
+} be_req_t;
+
 typedef struct {
 	const arch_register_t *reg;
-	arch_register_req_t   req;
+	be_req_t              req;
 } be_reg_data_t;
 
 typedef struct {
-	unsigned      magic;
-	const be_op_t *op;
-	int           n_regs;
-	be_reg_data_t reg_data[1];
+	int                         n_outs;
+	const arch_register_class_t *cls;
+	be_reg_data_t               *reg_data;
 } be_node_attr_t;
 
 typedef struct {
-	be_node_attr_t attr;
+	be_node_attr_t node_attr;
 	ir_node *spill_ctx;  /**< The node in whose context this spill was introduced. */
-	unsigned offset;     /**< The offset of the memory location the spill writes to
-						   in the spill area. */
+	entity *ent;     /**< The entity in the stack frame the spill writes to. */
 } be_spill_attr_t;
 
+static ir_op *op_Spill;
+static ir_op *op_Reload;
+static ir_op *op_Perm;
+static ir_op *op_Copy;
+static ir_op *op_Keep;
 
-ir_node *new_Keep(ir_graph *irg, ir_node *bl, int n, ir_node *in[])
-{
-	static ir_op *keep_op = NULL;
-	ir_node *irn;
+static int beo_base = -1;
 
-	if(!keep_op)
-		keep_op = new_ir_op(get_next_ir_opcode(), "Keep", op_pin_state_pinned,
-			irop_flag_keep, oparity_variable, 0, 0, NULL);
+static const ir_op_ops be_node_op_ops;
 
-	irn = new_ir_node(NULL, irg, bl, keep_op, mode_ANY, n, in);
-	keep_alive(irn);
+#define N   irop_flag_none
+#define L   irop_flag_labeled
+#define C   irop_flag_commutative
+#define X   irop_flag_cfopcode
+#define I   irop_flag_ip_cfopcode
+#define F   irop_flag_fragile
+#define Y   irop_flag_forking
+#define H   irop_flag_highlevel
+#define c   irop_flag_constlike
+#define K   irop_flag_keep
 
-	return irn;
-}
+void be_node_init(void) {
+	static int inited = 0;
 
-static int templ_pos_Spill[] = {
-	0
-};
+	if(inited)
+		return;
 
-static int templ_pos_Reload[] = {
-	-1
-};
+	inited = 1;
 
-static int templ_pos_Copy[] = {
-	0, -1
-};
+	/* Acquire all needed opcodes. */
+	beo_base = get_next_ir_opcodes(beo_Last - 1);
 
-static int templ_pos_Kill[] = {
-	0
-};
+	op_Spill  = new_ir_op(beo_base + beo_Spill,  "Spill",  op_pin_state_mem_pinned, N, oparity_unary,    0, sizeof(be_spill_attr_t), &be_node_op_ops);
+	op_Reload = new_ir_op(beo_base + beo_Reload, "Reload", op_pin_state_mem_pinned, N, oparity_zero,     0, sizeof(be_node_attr_t),  &be_node_op_ops);
+	op_Perm   = new_ir_op(beo_base + beo_Perm,   "Perm",   op_pin_state_pinned,     N, oparity_variable, 0, sizeof(be_node_attr_t),  &be_node_op_ops);
+	op_Copy   = new_ir_op(beo_base + beo_Copy,   "Copy",   op_pin_state_pinned,     N, oparity_unary,    0, sizeof(be_node_attr_t),  &be_node_op_ops);
+	op_Keep   = new_ir_op(beo_base + beo_Keep,   "Keep",   op_pin_state_pinned,     K, oparity_variable, 0, sizeof(be_node_attr_t),  &be_node_op_ops);
 
-static int dump_node(ir_node *irn, FILE *f, dump_reason_t reason);
+	set_op_tag(op_Spill,  &be_node_tag);
+	set_op_tag(op_Reload, &be_node_tag);
+	set_op_tag(op_Perm,   &be_node_tag);
+	set_op_tag(op_Copy,   &be_node_tag);
+	set_op_tag(op_Keep,   &be_node_tag);
+}
 
-static const ir_op_ops be_node_ops = {
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	dump_node,
-	NULL
-};
+static void *init_node_attr(ir_node* irn, const arch_register_class_t *cls, ir_graph *irg, int n_outs)
+{
+	be_node_attr_t *a = get_irn_attr(irn);
+
+	a->n_outs   = n_outs;
+	a->cls      = cls;
+	a->reg_data = NULL;
+
+	if(n_outs > 0) {
+		int i;
+
+		a->reg_data = NEW_ARR_D(be_reg_data_t, get_irg_obstack(irg), n_outs);
+		memset(a->reg_data, 0, n_outs * sizeof(a->reg_data[0]));
+		for(i = 0; i < n_outs; ++i) {
+			a->reg_data[i].req.req.cls  = cls;
+			a->reg_data[i].req.req.type = arch_register_req_type_normal;
+		}
+	}
+
+	return a;
+}
 
 static INLINE int is_be_node(const ir_node *irn)
 {
-	const be_node_attr_t *attr = (const be_node_attr_t *) &irn->attr;
-	return attr->magic == BENODE_MAGIC;
+	return get_op_tag(get_irn_op(irn)) == &be_node_tag;
 }
 
-static INLINE int is_be_kind(const ir_node *irn, node_kind_t kind)
+be_opcode_t get_irn_be_opcode(const ir_node *irn)
 {
-	const be_node_attr_t *a = (const be_node_attr_t *) &irn->attr;
-	return a->magic == BENODE_MAGIC && a->op && a->op->kind == kind;
+	return is_be_node(irn) ? get_irn_opcode(irn) - beo_base : beo_NoBeOp;
 }
 
-static INLINE void *get_attr_and_check(ir_node *irn, node_kind_t kind)
+ir_node *be_new_Spill(const arch_register_class_t *cls, ir_graph *irg, ir_node *bl, ir_node *to_spill, ir_node *ctx)
 {
-	is_be_kind(irn, kind);
-	return &irn->attr;
-}
+	be_spill_attr_t *a;
+	ir_node *in[1];
+	ir_node *res;
 
-static be_node_attr_t *init_node_attr(ir_node *irn,
-									  const be_op_t *op,
-									  const arch_register_class_t *cls,
-									  int n_regs)
+	in[0] = to_spill;
+	res   = new_ir_node(NULL, irg, bl, op_Spill, mode_M, 1, in);
+	a     = init_node_attr(res, cls, irg, 0);
+	a->ent       = NULL;
+	a->spill_ctx = ctx;
+	return res;
+}
 
+ir_node *be_new_Reload(const arch_register_class_t *cls, ir_graph *irg, ir_node *bl, ir_mode *mode, ir_node *mem)
 {
-	be_node_attr_t *attr = (be_node_attr_t *) &irn->attr;
-	int i;
+	ir_node *in[1];
+	ir_node *res;
 
-	attr->magic   = BENODE_MAGIC;
-	attr->n_regs  = n_regs;
-	attr->op      = op;
+	in[0] = mem;
+	res   = new_ir_node(NULL, irg, bl, op_Reload, mode, 1, in);
+	init_node_attr(res, cls, irg, 1);
+	return res;
+}
 
-	for(i = 0; i < n_regs; ++i) {
-		be_reg_data_t *rd = attr->reg_data + i;
+ir_node *be_new_Perm(const arch_register_class_t *cls, ir_graph *irg, ir_node *bl, int n, ir_node *in[])
+{
+	ir_node *irn = new_ir_node(NULL, irg, bl, op_Perm, mode_T, n, in);
+	init_node_attr(irn, cls, irg, n);
+	return irn;
+}
 
-		memset(&rd->req, 0, sizeof(rd->req));
-		rd->reg         = NULL;
-		rd->req.cls     = cls;
-		rd->req.type    = arch_register_req_type_normal;
-	}
+ir_node *be_new_Copy(const arch_register_class_t *cls, ir_graph *irg, ir_node *bl, ir_node *op)
+{
+	ir_node *in[1];
+	ir_node *res;
 
-	return attr;
+	in[0] = op;
+	res   = new_ir_node(NULL, irg, bl, op_Copy, get_irn_mode(op), 1, in);
+	init_node_attr(res, cls, irg, 1);
+	return res;
 }
 
-#define ARRSIZE(x) (sizeof(x) / sizeof(x[0]))
+ir_node *be_new_Keep(const arch_register_class_t *cls, ir_graph *irg, ir_node *bl, int n, ir_node *in[])
+{
+	ir_node *irn;
 
-static int cmp_op_map(const void *a, const void *b, size_t size)
+	irn = new_ir_node(NULL, irg, bl, op_Keep, mode_ANY, n, in);
+	init_node_attr(irn, cls, irg, 0);
+	keep_alive(irn);
+	return irn;
+}
+
+int be_is_Spill(const ir_node *irn)
 {
-	const be_op_t *x = a;
-	const be_op_t *y = b;
+	return get_irn_be_opcode(irn) == beo_Spill;
+}
 
-	return !(x->kind == y->kind && x->cls == y->cls);
+int be_is_Reload(const ir_node *irn)
+{
+	return get_irn_be_opcode(irn) == beo_Reload;
 }
 
-static be_op_t *get_op(const be_node_factory_t *fact,
-		const arch_register_class_t *cls, node_kind_t kind)
+int be_is_Copy(const ir_node *irn)
 {
-	be_op_t templ;
+	return get_irn_be_opcode(irn) == beo_Copy;
+}
 
-	templ.kind = kind;
-	templ.cls = cls;
+int be_is_Perm(const ir_node *irn)
+{
+	return get_irn_be_opcode(irn) == beo_Perm;
+}
 
-	return set_insert(fact->ops, &templ, sizeof(templ),
-		HASH_PTR(cls) + 7 * kind);
+int be_is_Keep(const ir_node *irn)
+{
+	return get_irn_be_opcode(irn) == beo_Keep;
 }
 
+static void be_limited(void *data, bitset_t *bs)
+{
+	be_req_t *req = data;
 
+	req->old_limited(req->old_limited_env, bs);
+	if(req->negate_limited)
+		bitset_flip_all(bs);
+}
 
-ir_node *new_Spill(const be_node_factory_t *factory,
-		const arch_register_class_t *cls,
-		ir_graph *irg, ir_node *bl, ir_node *node_to_spill, ir_node *ctx)
+void be_set_Perm_out_req(ir_node *irn, int pos, const arch_register_req_t *req, unsigned negate_limited)
 {
-	be_spill_attr_t *a;
-	ir_node *irn;
-	ir_node *in[1];
-	be_op_t *bop = get_op(factory, cls, node_kind_spill);
-	ir_op *op    = bop->op;
+	be_node_attr_t *a   = get_irn_attr(irn);
+	be_req_t       *r = &a->reg_data[pos].req;
 
-	assert(op && "Spill opcode must be present for this register class");
-	in[0]        = node_to_spill;
-	irn          = new_ir_node(NULL, irg, bl, op, mode_M, 1, in);
-	a            = (be_spill_attr_t *) init_node_attr(irn, bop, cls, 0);
-	a->spill_ctx = ctx;
-	a->offset    = 0;
+	assert(be_is_Perm(irn));
+	assert(pos >= 0 && pos < get_irn_arity(irn));
+	memcpy(&r->req, req, sizeof(req[0]));
 
-	return irn;
+	if(arch_register_req_is(req, limited)) {
+		r->old_limited     = r->req.limited;
+		r->old_limited_env = r->req.limited_env;
+		r->req.limited     = be_limited;
+		r->req.limited_env = r;
+		r->negate_limited  = negate_limited;
+	}
 }
 
-void set_Spill_offset(ir_node *irn, unsigned offset)
+void be_set_Spill_entity(ir_node *irn, entity *ent)
 {
-	be_spill_attr_t *a = (be_spill_attr_t *) &irn->attr;
-	assert(is_be_kind(irn, node_kind_spill));
-	a->offset = offset;
+	be_spill_attr_t *a = get_irn_attr(irn);
+	assert(be_is_Spill(irn));
+	a->ent = ent;
 }
 
 static ir_node *find_a_spill_walker(ir_node *irn, unsigned visited_nr)
@@ -235,16 +286,16 @@ static ir_node *find_a_spill_walker(ir_node *irn, unsigned visited_nr)
 			}
 		}
 
-		else if(is_be_kind(irn, node_kind_spill))
+		else if(get_irn_be_opcode(irn) == beo_Spill)
 			return irn;
 	}
 
 	return NULL;
 }
 
-ir_node *get_Spill_context(const ir_node *irn) {
-	be_spill_attr_t *a = (be_spill_attr_t *) &irn->attr;
-	assert(is_be_kind(irn, node_kind_spill));
+ir_node *be_get_Spill_context(const ir_node *irn) {
+	const be_spill_attr_t *a = get_irn_attr(irn);
+	assert(be_is_Spill(irn));
 	return a->spill_ctx;
 }
 
@@ -259,87 +310,37 @@ static INLINE ir_node *find_a_spill(ir_node *irn)
 	ir_graph *irg       = get_irn_irg(irn);
 	unsigned visited_nr = get_irg_visited(irg) + 1;
 
-	assert(is_be_kind(irn, node_kind_reload));
+	assert(be_is_Reload(irn));
 	set_irg_visited(irg, visited_nr);
 	return find_a_spill_walker(irn, visited_nr);
 }
 
-
-unsigned get_Spill_offset(ir_node *irn)
+entity *be_get_spill_entity(ir_node *irn)
 {
-	be_node_attr_t *a = (be_node_attr_t *) &irn->attr;
-	assert(is_be_node(irn));
+	int opc           = get_irn_opcode(irn);
 
-	switch(a->op->kind) {
-	case node_kind_reload:
-		assert(0 && "not yet implemented");
-		return get_Spill_offset(find_a_spill(irn));
-	case node_kind_spill:
-		return ((be_spill_attr_t *) a)->offset;
+	switch(get_irn_be_opcode(irn)) {
+	case beo_Reload:
+		return be_get_spill_entity(find_a_spill(irn));
+	case beo_Spill:
+		{
+			be_spill_attr_t *a = get_irn_attr(irn);
+			return a->ent;
+		}
 	default:
-		assert(0 && "Illegal node kind (spill/reload required)");
+		assert(0 && "Must give spill/reload node");
 	}
 
-	return 0;
-}
-
-ir_node *new_Reload(const be_node_factory_t *factory,
-		const arch_register_class_t *cls, ir_graph *irg,
-		ir_node *bl, ir_mode *mode, ir_node *spill_node)
-{
-	ir_node *irn, *in[1];
-	be_op_t *bop = get_op(factory, cls, node_kind_reload);
-	ir_op *op    = bop->op;
-
-	assert(op && "Reload opcode must be present for this register class");
-	in[0] = spill_node;
-
-	irn  = new_ir_node(NULL, irg, bl, op, mode, 1, in);
-	init_node_attr(irn, bop, cls, 1);
-
-	return irn;
-}
-
-ir_node *new_Perm(const be_node_factory_t *factory,
-		const arch_register_class_t *cls,
-		ir_graph *irg, ir_node *bl, int arity, ir_node **in)
-{
-	ir_node *irn;
-	be_op_t *bop = get_op(factory, cls, node_kind_perm);
-	ir_op *op    = bop->op;
-
-	irn  = new_ir_node(NULL, irg, bl, op, mode_T, arity, in);
-	init_node_attr(irn, bop, cls, arity);
-
-	return irn;
-}
-
-ir_node *new_Copy(const be_node_factory_t *factory,
-		const arch_register_class_t *cls,
-		ir_graph *irg, ir_node *bl, ir_node *in)
-{
-	ir_node *irn, *ins[1];
-	be_op_t *bop = get_op(factory, cls, node_kind_copy);
-	ir_op *op    = bop->op;
-
-	ins[0] = in;
-
-	irn  = new_ir_node(NULL, irg, bl, op, get_irn_mode(in), 1, ins);
-	init_node_attr(irn, bop, cls, 1);
-
-	return irn;
+	return NULL;
 }
 
-ir_node *be_spill(
-		const be_node_factory_t *factory,
-		const arch_env_t *arch_env,
-		ir_node *irn, ir_node *ctx)
+ir_node *be_spill(const arch_env_t *arch_env, ir_node *irn, ir_node *ctx)
 {
 	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, ctx);
+	ir_node *spill = be_new_Spill(cls, irg, bl, irn, ctx);
 	ir_node *insert;
 
 	/*
@@ -355,165 +356,138 @@ ir_node *be_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 *be_reload(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(be_is_Spill(spill)
-			|| (is_Phi(spill) && get_irn_mode(spill) == mode_M));
+	assert(be_is_Spill(spill) || (is_Phi(spill) && get_irn_mode(spill) == mode_M));
 
-	reload = new_Reload(factory, cls, irg, bl, mode, spill);
+	reload = be_new_Reload(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.
- * @param node The address of a node pointer.
- * @param def  A default value.
- * @return     If *node is a Proj, *node is set to the Proj's target and
- *             the Proj number is returned. Else *node remains the same and @p def
- *             is returned.
- */
-static int redir_proj(const ir_node **node, int def)
+static int redir_proj(const ir_node **node, int pos)
 {
 	const ir_node *n = *node;
 
 	if(is_Proj(n)) {
+		assert(pos == -1 && "Illegal pos for a Proj");
 		*node = get_Proj_pred(n);
-		def = -(get_Proj_proj(n) + 1);
+		return get_Proj_proj(n);
 	}
 
-	return def;
+	return 0;
 }
 
-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)
+static void *put_out_reg_req(arch_register_req_t *req, const ir_node *irn, int out_pos)
 {
-	/* We cannot get output requirements for tuple nodes. */
-	if(get_irn_mode(irn) == mode_T && pos < 0)
-		return NULL;
+	const be_node_attr_t *a = get_irn_attr(irn);
 
-	/*
-	 * if we're interested in an output operand (pos < 0), so let's resolve projs.
-	 */
-	if(pos < 0)
-		pos = redir_proj((const ir_node **) &irn, pos);
 
-	if(is_be_node(irn)) {
-		const be_node_attr_t *a = (const be_node_attr_t *) &irn->attr;
-		const be_op_t *bo       = a->op;
-		int i;
-
-		for(i = 0; i < bo->n_pos; ++i) {
-			if(pos == bo->pos[i]) {
-
-				/* be nodes have no input constraints.
-				   so return normal register requirements. */
-				if(pos >= 0) {
-					memset(req, 0, sizeof(req[0]));
-					req->cls = bo->cls;
-					req->type = arch_register_req_type_normal;
-				}
-
-				/*
-				 * if an output requirement is requested,
-				 * return the one stored in the node.
-				 */
-				else
-					*req = a->reg_data[-pos - 1].req;
-
-				return req;
-			}
-		}
+	if(out_pos < a->n_outs)
+		memcpy(req, &a->reg_data[out_pos].req, sizeof(req[0]));
+	else {
+		req->type = arch_register_req_type_none;
+		req->cls  = NULL;
 	}
 
-	return NULL;
+	return req;
 }
 
-void be_set_Perm_out_req(ir_node *irn, int pos, const arch_register_req_t *req)
+static void *put_in_reg_req(arch_register_req_t *req, const ir_node *irn, int pos)
 {
-	be_node_attr_t *a = get_attr_and_check(irn, node_kind_perm);
-	assert(pos >= 0 && pos < get_irn_arity(irn) && "position out of range");
-	a->reg_data[pos].req = *req;
+	const be_node_attr_t *a = get_irn_attr(irn);
+	int n                   = get_irn_arity(irn);
+
+	req->type = arch_register_req_type_none;
+	req->cls  = NULL;
+
+	switch(get_irn_be_opcode(irn)) {
+	case beo_Spill:
+	case beo_Copy:
+	case beo_Keep:
+	case beo_Perm:
+		if(pos < n) {
+			req->type = arch_register_req_type_normal;
+			req->cls  = a->cls;
+		}
+		break;
+	case beo_Reload:
+	default:
+		req = NULL;
+	}
+
+	return req;
 }
 
-void
-be_node_set_irn_reg(const arch_irn_ops_t *_self, ir_node *irn,
-		const arch_register_t *reg)
+static const arch_register_req_t *
+be_node_get_irn_reg_req(const void *self, arch_register_req_t *req, const ir_node *irn, int pos)
 {
-	int pos;
-	be_op_t *bo;
-	be_node_attr_t *attr;
-	const be_node_factory_t *factory =
-		container_of(_self, const be_node_factory_t, irn_ops);
+	int out_pos = pos;
 
-	if(get_irn_mode(irn) == mode_T)
-		return;
+	if(pos < 0) {
+		if(get_irn_mode(irn) == mode_T)
+			return NULL;
 
-	pos = redir_proj((const ir_node **) &irn, -1);
-	bo = pmap_get(factory->irn_op_map, get_irn_op(irn));
+		out_pos = redir_proj((const ir_node **) &irn, pos);
+		assert(is_be_node(irn));
+		return put_out_reg_req(req, irn, out_pos);
+	}
 
-	if(!bo)
-		return;
+	else {
+		return is_be_node(irn) ? put_in_reg_req(req, irn, pos) : NULL;
+	}
 
-	attr = (be_node_attr_t *) &irn->attr;
-	attr->reg_data[-pos - 1].reg = reg;
+	return req;
 }
 
-const arch_register_t *
-be_node_get_irn_reg(const arch_irn_ops_t *_self, const ir_node *irn)
+static void
+be_node_set_irn_reg(const void *_self, ir_node *irn, const arch_register_t *reg)
 {
-	int i, pos;
-	be_op_t *bo;
-	const be_node_factory_t *factory =
-		container_of(_self, const be_node_factory_t, irn_ops);
+	int out_pos;
+	be_node_attr_t *a;
 
-	if(get_irn_mode(irn) == mode_T)
-		return NULL;
+	out_pos = redir_proj((const ir_node **) &irn, -1);
+	a       = get_irn_attr(irn);
 
-	pos = redir_proj((const ir_node **) &irn, -1);
-	bo = pmap_get(factory->irn_op_map, get_irn_op(irn));
+	assert(is_be_node(irn));
+	assert(out_pos < a->n_outs && "position too high");
+	a->reg_data[out_pos].reg = reg;
+}
 
-	if(!bo)
-		return NULL;
+const arch_register_t *
+be_node_get_irn_reg(const void *_self, const ir_node *irn)
+{
+	int out_pos;
+	be_node_attr_t *a;
 
-	for(i = 0; i < bo->n_pos; ++i) {
-		if(bo->pos[i] == pos) {
-			be_node_attr_t *attr = (be_node_attr_t *) &irn->attr;
-			return attr->reg_data[-pos - 1].reg;
-		}
-	}
+	out_pos = redir_proj((const ir_node **) &irn, -1);
+	a       = get_irn_attr(irn);
 
-	return NULL;
+	assert(is_be_node(irn));
+	assert(out_pos < a->n_outs && "position too high");
+
+	return a->reg_data[out_pos].reg;
 }
 
-arch_irn_class_t be_node_classify(const arch_irn_ops_t *_self, const ir_node *irn)
+arch_irn_class_t be_node_classify(const void *_self, const ir_node *irn)
 {
-	const be_node_factory_t *factory = container_of(_self, const be_node_factory_t, irn_ops);
+	redir_proj((const ir_node **) &irn, -1);
 
-	be_op_t *bo;
-	int idx;
-
-	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)
+	switch(get_irn_be_opcode(irn)) {
+#define XXX(a,b) case beo_ ## a: return arch_irn_class_ ## b;
+		XXX(Spill, spill)
+		XXX(Reload, reload)
+		XXX(Perm, perm)
+		XXX(Copy, copy)
 #undef XXX
 		default:
 		return 0;
@@ -522,139 +496,61 @@ arch_irn_class_t be_node_classify(const arch_irn_ops_t *_self, const ir_node *ir
 	return 0;
 }
 
-arch_irn_class_t be_node_get_flags(const arch_irn_ops_t *_self, const ir_node *irn)
+arch_irn_class_t be_node_get_flags(const void *_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)
-{
-	be_op_t *bo;
-	const be_node_factory_t *factory =
-		container_of(_self, const be_node_factory_t, handler);
-
-	redir_proj(&irn, 0);
-	bo = pmap_get(factory->irn_op_map, get_irn_op(irn));
-
-	return bo ? &factory->irn_ops : NULL;
-}
-
-const arch_irn_handler_t *be_node_get_irn_handler(const be_node_factory_t *f)
-{
-	return &f->handler;
-}
-
-int be_is_Spill(const ir_node *irn)
-{
-	return is_be_kind(irn, node_kind_spill);
-}
+static const arch_irn_ops_if_t be_node_irn_ops_if = {
+	be_node_get_irn_reg_req,
+	be_node_set_irn_reg,
+	be_node_get_irn_reg,
+	be_node_classify,
+	be_node_get_flags,
+};
 
-int be_is_Reload(const ir_node *irn)
-{
-	return is_be_kind(irn, node_kind_reload);
-}
+static const arch_irn_ops_t be_node_irn_ops = {
+	&be_node_irn_ops_if
+};
 
-int be_is_Copy(const ir_node *irn)
+const void *be_node_get_arch_ops(const arch_irn_handler_t *self, const ir_node *irn)
 {
-	return is_be_kind(irn, node_kind_copy);
+	redir_proj((const ir_node **) &irn, -1);
+	return is_be_node(irn) ? &be_node_irn_ops : NULL;
 }
 
-int be_is_Perm(const ir_node *irn)
-{
-	return is_be_kind(irn, node_kind_perm);
-}
-
-
-be_node_factory_t *be_node_factory_init(be_node_factory_t *factory, const arch_isa_t *isa)
-{
-	int i, j, n;
-
-	factory->ops = new_set(cmp_op_map, 64);
-	factory->irn_op_map = pmap_create();
-	obstack_init(&factory->obst);
-
-	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.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 = 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);
-		ent->op = new_ir_op(get_next_ir_opcode(), "Spill", op_pin_state_pinned,
-				0, oparity_unary, 0, sizeof(be_spill_attr_t), &be_node_ops);
-		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);
-		ent->op = new_ir_op(get_next_ir_opcode(), "Reload", op_pin_state_pinned, 0,
-				oparity_unary, 0, sizeof(be_node_attr_t), &be_node_ops);
-		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);
-		ent->op = new_ir_op(get_next_ir_opcode(), "Copy", op_pin_state_pinned, 0,
-				oparity_unary, 0, sizeof(be_node_attr_t), &be_node_ops);
-		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);
-		ent->op = new_ir_op(get_next_ir_opcode(), "Perm", op_pin_state_pinned, 0,
-				oparity_variable, 0,
-				sizeof(be_node_attr_t)
-				+ sizeof(be_reg_data_t) * cls->n_regs, &be_node_ops);
-		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) {
-			int k = j / 2;
-			ent->pos[j] = k;
-			ent->pos[j + 1] = -(k + 1);
-		}
-		pmap_insert(factory->irn_op_map, ent->op, ent);
-
-	}
-
-	return factory;
-}
+const arch_irn_handler_t be_node_irn_handler = {
+	be_node_get_arch_ops
+};
 
 static int dump_node(ir_node *irn, FILE *f, dump_reason_t reason)
 {
-	be_node_attr_t *at = (be_node_attr_t *) &irn->attr;
-	const be_op_t *bo;
+	be_node_attr_t *at = get_irn_attr(irn);
 	int i;
 
 	assert(is_be_node(irn));
-	bo = at->op;
 
 	switch(reason) {
 		case dump_node_opcode_txt:
-			fprintf(f, get_op_name(bo->op));
+			fprintf(f, get_op_name(get_irn_op(irn)));
 			break;
 		case dump_node_mode_txt:
 			fprintf(f, get_mode_name(get_irn_mode(irn)));
 			break;
 		case dump_node_nodeattr_txt:
-			fprintf(f, "%s ", bo->cls->name);
 			break;
 		case dump_node_info_txt:
-			for(i = 0; i < at->n_regs; ++i) {
+			fprintf(f, "reg class: %s\n", at->cls->name);
+			for(i = 0; i < at->n_outs; ++i) {
 				const arch_register_t *reg = at->reg_data[i].reg;
 				fprintf(f, "reg #%d: %s\n", i, reg ? reg->name : "n/a");
 			}
 
-			if(bo->kind == node_kind_spill) {
+			if(get_irn_be_opcode(irn) == beo_Spill) {
 				be_spill_attr_t *a = (be_spill_attr_t *) at;
+				unsigned ofs = get_entity_offset_bytes(a->ent);
 				ir_fprintf(f, "spill context: %+F\n", a->spill_ctx);
-				ir_fprintf(f, "spill offset: %u\n", a->offset);
+				ir_fprintf(f, "spill entity: %+F offset %x (%d)\n", a->ent, ofs, ofs);
 			}
 			break;
 	}
@@ -662,39 +558,45 @@ static int dump_node(ir_node *irn, FILE *f, dump_reason_t reason)
 	return 0;
 }
 
-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->arch_env;
-	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_module_t *dbg      = firm_dbg_register("be.node");
+static const ir_op_ops be_node_op_ops = {
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	dump_node,
+	NULL
+};
 
+pset *nodes_live_at(const arch_env_t *arch_env, const arch_register_class_t *cls, const ir_node *pos, pset *live)
+{
+	firm_dbg_module_t *dbg = firm_dbg_register("firm.be.node");
+	ir_node *bl            = get_nodes_block(pos);
+	ir_node *irn;
 	irn_live_t *li;
-	ir_node *curr, *irn, *perm, **nodes;
-	int i, n;
-
-	DBG((dbg, LEVEL_1, "Insert Perm after: %+F\n", pos));
-
 
 	live_foreach(bl, li) {
 		ir_node *irn = (ir_node *) li->irn;
-		if(live_is_end(li) && arch_irn_has_reg_class(arch_env, irn, -1, cls))
+		if(live_is_end(li) && arch_irn_consider_in_reg_alloc(arch_env, cls, irn))
 			pset_insert_ptr(live, irn);
 	}
 
 	sched_foreach_reverse(bl, irn) {
+		int i, n;
 		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 we encounter the node we want to insert the Perm after,
+		* exit immediately, so that this node is still live
+		*/
 		if(irn == pos)
-			break;
+			return live;
 
 		DBG((dbg, LEVEL_1, "%+F\n", irn));
 		for(x = pset_first(live); x; x = pset_next(live))
@@ -706,12 +608,37 @@ ir_node *insert_Perm_after(const be_main_env_t *env,
 		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, -1, cls))
+			if(arch_irn_consider_in_reg_alloc(arch_env, cls, op))
 				pset_insert_ptr(live, op);
 		}
 	}
 
+	return NULL;
+}
+
+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_module_t *dbg      = firm_dbg_register("be.node");
+
+	ir_node *curr, *irn, *perm, **nodes;
+	int i, n;
+
+	DBG((dbg, LEVEL_1, "Insert Perm after: %+F\n", pos));
+
+	if(!nodes_live_at(arch_env, cls, pos, live))
+		assert(0 && "position not found");
+
 	n = pset_count(live);
+
+	if(n == 0)
+		return NULL;
+
 	nodes = malloc(n * sizeof(nodes[0]));
 
 	DBG((dbg, LEVEL_1, "live:\n"));
@@ -720,7 +647,7 @@ ir_node *insert_Perm_after(const be_main_env_t *env,
 		nodes[i] = irn;
 	}
 
-	perm = new_Perm(env->node_factory, cls, irg, bl, n, nodes);
+	perm = be_new_Perm(cls, irg, bl, n, nodes);
 	sched_add_after(pos, perm);
 	free(nodes);
 
@@ -738,7 +665,7 @@ ir_node *insert_Perm_after(const be_main_env_t *env,
 		curr = proj;
 
 		copies[0] = proj;
-		be_introduce_copies(dom_front, perm_op, array_size(copies), copies);
+		be_introduce_copies(dom_front, perm_op, 1, copies);
 	}
 	return perm;
 }