X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbenode.c;h=5fe59a9409ac995899e321acae12738b43c9e65b;hb=8e4e49e66d1d578b31a5ffce9bb6ff94ba985dfb;hp=e798492b8a236bb723dc5fc1ab4acc5ec9bc7517;hpb=8ccfe04ca59ff56fc32b2323b80cee2a5194694d;p=libfirm

diff --git a/ir/be/benode.c b/ir/be/benode.c
index e798492b8..5fe59a940 100644
--- a/ir/be/benode.c
+++ b/ir/be/benode.c
@@ -22,7 +22,6 @@
  * @brief       Backend node support for generic backend nodes.
  * @author      Sebastian Hack
  * @date        17.05.2005
- * @version     $Id$
  *
  * Backend node support for generic backend nodes.
  * This file provides Perm, Copy, Spill and Reload nodes.
@@ -283,7 +282,7 @@ ir_node *be_new_Spill(const arch_register_class_t *cls,
 	 */
 	be_set_constr_in(res, n_be_Spill_frame, arch_no_register_req);
 
-	arch_set_out_register_req(res, 0, arch_no_register_req);
+	arch_set_irn_register_req_out(res, 0, arch_no_register_req);
 
 	return res;
 }
@@ -305,7 +304,7 @@ ir_node *be_new_Reload(const arch_register_class_t *cls,
 	be_node_set_reg_class_out(res, 0, cls);
 
 	be_node_set_reg_class_in(res, n_be_Reload_frame, cls_frame);
-	arch_irn_set_flags(res, arch_irn_flags_rematerializable);
+	arch_set_irn_flags(res, arch_irn_flags_rematerializable);
 
 	a         = (be_frame_attr_t*) get_irn_generic_attr(res);
 	a->ent    = NULL;
@@ -422,13 +421,15 @@ ir_node *be_new_MemPerm(ir_node *block, int n, ir_node *in[])
 	return irn;
 }
 
-ir_node *be_new_Copy(const arch_register_class_t *cls, ir_node *bl, ir_node *op)
+ir_node *be_new_Copy(ir_node *bl, ir_node *op)
 {
 	ir_node *in[1];
 	ir_node *res;
 	arch_register_req_t *req;
 	be_node_attr_t *attr;
 	ir_graph *irg = get_Block_irg(bl);
+	const arch_register_req_t   *in_req = arch_get_irn_register_req(op);
+	const arch_register_class_t *cls    = in_req->cls;
 
 	in[0] = op;
 	res   = new_ir_node(NULL, irg, bl, op_be_Copy, get_irn_mode(op), 1, in);
@@ -440,9 +441,10 @@ ir_node *be_new_Copy(const arch_register_class_t *cls, ir_node *bl, ir_node *op)
 
 	req = allocate_reg_req(res);
 	req->cls        = cls;
-	req->type       = arch_register_req_type_should_be_same;
+	req->type       = arch_register_req_type_should_be_same
+		| (in_req->type & arch_register_req_type_aligned);
 	req->other_same = 1U << 0;
-	req->width      = 1;
+	req->width      = in_req->width;
 	be_set_constr_out(res, 0, req);
 
 	return res;
@@ -656,7 +658,7 @@ ir_node *be_new_AddSP(const arch_register_t *sp, ir_node *bl, ir_node *old_sp,
 	/* Set output constraint to stack register. */
 	be_set_constr_single_reg_in(irn, n_be_AddSP_old_sp, sp,
 	                            arch_register_req_type_none);
-	be_node_set_reg_class_in(irn, n_be_AddSP_size, arch_register_get_class(sp));
+	be_node_set_reg_class_in(irn, n_be_AddSP_size, sp->reg_class);
 	be_set_constr_single_reg_out(irn, pn_be_AddSP_sp, sp,
 	                             arch_register_req_type_produces_sp);
 
@@ -682,7 +684,7 @@ ir_node *be_new_SubSP(const arch_register_t *sp, ir_node *bl, ir_node *old_sp, i
 	/* Set output constraint to stack register. */
 	be_set_constr_single_reg_in(irn, n_be_SubSP_old_sp, sp,
 	                            arch_register_req_type_none);
-	be_node_set_reg_class_in(irn, n_be_SubSP_size, arch_register_get_class(sp));
+	be_node_set_reg_class_in(irn, n_be_SubSP_size, sp->reg_class);
 	be_set_constr_single_reg_out(irn, pn_be_SubSP_sp, sp, arch_register_req_type_produces_sp);
 
 	return irn;
@@ -738,11 +740,14 @@ ir_entity *be_get_FrameAddr_entity(const ir_node *node)
 	return attr->ent;
 }
 
-ir_node *be_new_CopyKeep(const arch_register_class_t *cls, ir_node *bl, ir_node *src, int n, ir_node *in_keep[], ir_mode *mode)
+ir_node *be_new_CopyKeep(ir_node *bl, ir_node *src, int n, ir_node *in_keep[])
 {
 	ir_node  *irn;
 	ir_node **in = ALLOCAN(ir_node*, n + 1);
 	ir_graph *irg = get_Block_irg(bl);
+	const arch_register_req_t   *req  = arch_get_irn_register_req(src);
+	const arch_register_class_t *cls  = req->cls;
+	ir_mode                     *mode = get_irn_mode(src);
 	be_node_attr_t *attr;
 
 	in[0] = src;
@@ -757,9 +762,9 @@ ir_node *be_new_CopyKeep(const arch_register_class_t *cls, ir_node *bl, ir_node
 	return irn;
 }
 
-ir_node *be_new_CopyKeep_single(const arch_register_class_t *cls, ir_node *bl, ir_node *src, ir_node *keep, ir_mode *mode)
+ir_node *be_new_CopyKeep_single(ir_node *bl, ir_node *src, ir_node *keep)
 {
-	return be_new_CopyKeep(cls, bl, src, 1, &keep, mode);
+	return be_new_CopyKeep(bl, src, 1, &keep);
 }
 
 ir_node *be_get_CopyKeep_op(const ir_node *cpy)
@@ -899,7 +904,7 @@ void be_set_constr_single_reg_out(ir_node *node, int pos,
 		req = be_create_reg_req(obst, reg, additional_types);
 	}
 
-	arch_irn_set_register(node, pos, reg);
+	arch_set_irn_register_out(node, pos, reg);
 	be_set_constr_out(node, pos, req);
 }
 
@@ -948,54 +953,6 @@ int be_get_IncSP_align(const ir_node *irn)
 	return a->align;
 }
 
-ir_node *be_spill(ir_node *block, ir_node *irn)
-{
-	ir_graph                    *irg       = get_Block_irg(block);
-	ir_node                     *frame     = get_irg_frame(irg);
-	const arch_register_class_t *cls       = arch_get_irn_reg_class_out(irn);
-	const arch_register_class_t *cls_frame = arch_get_irn_reg_class_out(frame);
-	ir_node                     *spill;
-
-	spill = be_new_Spill(cls, cls_frame, block, frame, irn);
-	return spill;
-}
-
-ir_node *be_reload(const arch_register_class_t *cls, ir_node *insert, ir_mode *mode, ir_node *spill)
-{
-	ir_node  *reload;
-	ir_node  *bl    = is_Block(insert) ? insert : get_nodes_block(insert);
-	ir_graph *irg   = get_Block_irg(bl);
-	ir_node  *frame = get_irg_frame(irg);
-	const arch_register_class_t *cls_frame = arch_get_irn_reg_class_out(frame);
-
-	assert(be_is_Spill(spill) || (is_Phi(spill) && get_irn_mode(spill) == mode_M));
-
-	reload = be_new_Reload(cls, cls_frame, bl, frame, spill, mode);
-
-	if (is_Block(insert)) {
-		do {
-			insert = sched_prev(insert);
-		} while (is_cfop(insert));
-		sched_add_after(insert, reload);
-	} else {
-		sched_add_before(insert, reload);
-	}
-
-	return reload;
-}
-
-
-static arch_irn_class_t be_node_classify(const ir_node *irn)
-{
-	switch (get_irn_opcode(irn)) {
-		case beo_Spill:  return arch_irn_class_spill;
-		case beo_Reload: return arch_irn_class_reload;
-		case beo_Perm:   return arch_irn_class_perm;
-		case beo_Copy:   return arch_irn_class_copy;
-		default:         return arch_irn_class_none;
-	}
-}
-
 static ir_entity *be_node_get_frame_entity(const ir_node *irn)
 {
 	return be_get_frame_entity(irn);
@@ -1036,7 +993,6 @@ static int be_node_get_sp_bias(const ir_node *irn)
 
 /* for be nodes */
 static const arch_irn_ops_t be_node_irn_ops = {
-	be_node_classify,
 	be_node_get_frame_entity,
 	be_node_set_frame_offset,
 	be_node_get_sp_bias,
@@ -1049,13 +1005,13 @@ static const arch_irn_ops_t be_node_irn_ops = {
 static int get_start_reg_index(ir_graph *irg, const arch_register_t *reg)
 {
 	ir_node *start  = get_irg_start(irg);
-	unsigned n_outs = arch_irn_get_n_outs(start);
+	unsigned n_outs = arch_get_irn_n_outs(start);
 	int      i;
 
 	/* do a naive linear search... */
 	for (i = 0; i < (int)n_outs; ++i) {
 		const arch_register_req_t *out_req
-			= arch_get_out_register_req(start, i);
+			= arch_get_irn_register_req_out(start, i);
 		if (! (out_req->type & arch_register_req_type_limited))
 			continue;
 		if (out_req->cls != arch_register_get_class(reg))
@@ -1091,7 +1047,7 @@ int be_find_return_reg_input(ir_node *ret, const arch_register_t *reg)
 	int i;
 	/* do a naive linear search... */
 	for (i = 0; i < arity; ++i) {
-		const arch_register_req_t *req = arch_get_in_register_req(ret, i);
+		const arch_register_req_t *req = arch_get_irn_register_req_in(ret, i);
 		if (! (req->type & arch_register_req_type_limited))
 			continue;
 		if (req->cls != arch_register_get_class(reg))
@@ -1103,12 +1059,6 @@ int be_find_return_reg_input(ir_node *ret, const arch_register_t *reg)
 	panic("Tried querying undefined register '%s' at Return", reg->name);
 }
 
-static arch_irn_class_t dummy_classify(const ir_node *node)
-{
-	(void) node;
-	return arch_irn_class_none;
-}
-
 static ir_entity* dummy_get_frame_entity(const ir_node *node)
 {
 	(void) node;
@@ -1130,7 +1080,6 @@ static int dummy_get_sp_bias(const ir_node *node)
 
 /* for "middleend" nodes */
 static const arch_irn_ops_t dummy_be_irn_ops = {
-	dummy_classify,
 	dummy_get_frame_entity,
 	dummy_set_frame_offset,
 	dummy_get_sp_bias,
@@ -1184,7 +1133,7 @@ void be_set_phi_reg_req(ir_node *node, const arch_register_req_t *req)
 	assert(mode_is_datab(get_irn_mode(node)));
 }
 
-void be_dump_phi_reg_reqs(FILE *F, ir_node *node, dump_reason_t reason)
+void be_dump_phi_reg_reqs(FILE *F, const ir_node *node, dump_reason_t reason)
 {
 	switch (reason) {
 	case dump_node_opcode_txt:
@@ -1210,7 +1159,6 @@ void be_dump_phi_reg_reqs(FILE *F, ir_node *node, dump_reason_t reason)
 }
 
 static const arch_irn_ops_t phi_irn_ops = {
-	dummy_classify,
 	dummy_get_frame_entity,
 	dummy_set_frame_offset,
 	dummy_get_sp_bias,
@@ -1225,7 +1173,7 @@ static const arch_irn_ops_t phi_irn_ops = {
 /**
  * ir_op-Operation: dump a be node to file
  */
-static void dump_node(FILE *f, ir_node *irn, dump_reason_t reason)
+static void dump_node(FILE *f, const ir_node *irn, dump_reason_t reason)
 {
 	assert(is_be_node(irn));