X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbenode.c;h=ba54bd7709a5bb996024fb0b52047648c6bc565f;hb=26e4122270acb4d7644f91b08b088fe64a864611;hp=6139c348792f8db7a72347f71ac279b6dc5ed619;hpb=deec2b60bbd934f84b18df8ba9a2e7a4939e6044;p=libfirm

diff --git a/ir/be/benode.c b/ir/be/benode.c
index 6139c3487..ba54bd770 100644
--- a/ir/be/benode.c
+++ b/ir/be/benode.c
@@ -48,6 +48,8 @@
 #include "irprintf.h"
 #include "irgwalk.h"
 #include "iropt_t.h"
+#include "irbackedge_t.h"
+#include "irverify_t.h"
 
 #include "be_t.h"
 #include "belive_t.h"
@@ -239,10 +241,10 @@ static void init_node_attr(ir_node *node, int n_inputs, int n_outputs)
 	}
 }
 
-static void add_register_req_in(ir_node *node)
+static void add_register_req_in(ir_node *node, const arch_register_req_t *req)
 {
 	backend_info_t *info = be_get_info(node);
-	ARR_APP1(const arch_register_req_t*, info->in_reqs, arch_no_register_req);
+	ARR_APP1(const arch_register_req_t*, info->in_reqs, req);
 }
 
 ir_node *be_new_Spill(const arch_register_class_t *cls,
@@ -459,8 +461,11 @@ ir_node *be_new_Keep(ir_node *block, int n, ir_node *in[])
 	attr->exc.pin_state = op_pin_state_pinned;
 
 	for (i = 0; i < n; ++i) {
-		add_irn_n(res, in[i]);
-		add_register_req_in(res);
+		ir_node *pred = in[i];
+		add_irn_n(res, pred);
+		const arch_register_req_t *req = arch_get_irn_register_req(pred);
+		req = req->cls != NULL ? req->cls->class_req : arch_no_register_req;
+		add_register_req_in(res, req);
 	}
 	keep_alive(res);
 
@@ -469,17 +474,15 @@ ir_node *be_new_Keep(ir_node *block, int n, ir_node *in[])
 
 void be_Keep_add_node(ir_node *keep, const arch_register_class_t *cls, ir_node *node)
 {
-	int n;
-
 	assert(be_is_Keep(keep));
-	n = add_irn_n(keep, node);
-	add_register_req_in(keep);
-	be_node_set_reg_class_in(keep, n, cls);
+	add_irn_n(keep, node);
+	add_register_req_in(keep, cls->class_req);
 }
 
 ir_node *be_new_Call(dbg_info *dbg, ir_graph *irg, ir_node *bl, ir_node *mem,
-		ir_node *sp, ir_node *ptr, int n_outs, int n, ir_node *in[],
-		ir_type *call_tp)
+		const arch_register_req_t *sp_req, ir_node *sp,
+		const arch_register_req_t *ptr_req, ir_node *ptr,
+		int n_outs, int n, ir_node *in[], ir_type *call_tp)
 {
 	be_call_attr_t *a;
 	int real_n = n_be_Call_first_arg + n;
@@ -499,6 +502,8 @@ ir_node *be_new_Call(dbg_info *dbg, ir_graph *irg, ir_node *bl, ir_node *mem,
 	a->call_tp            = call_tp;
 	a->pop                = 0;
 	a->base.exc.pin_state = op_pin_state_pinned;
+	be_set_constr_in(irn, n_be_Call_sp, sp_req);
+	be_set_constr_in(irn, n_be_Call_ptr, ptr_req);
 	return irn;
 }
 
@@ -725,6 +730,12 @@ ir_node *be_new_CopyKeep(ir_node *bl, ir_node *src, int n, ir_node *in_keep[])
 	attr->exc.pin_state = op_pin_state_floats;
 	be_node_set_reg_class_in(irn, 0, cls);
 	be_node_set_reg_class_out(irn, 0, cls);
+	for (int i = 0; i < n; ++i) {
+		ir_node *pred = in_keep[i];
+		const arch_register_req_t *req = arch_get_irn_register_req(pred);
+		req = req->cls != NULL ? req->cls->class_req : arch_no_register_req;
+		be_set_constr_in(irn, i+1, req);
+	}
 
 	return irn;
 }
@@ -1065,7 +1076,8 @@ ir_node *be_new_Phi(ir_node *block, int n_ins, ir_node **ins, ir_mode *mode,
 	backend_info_t *info;
 	int             i;
 
-	ir_node *phi = new_r_Phi(block, n_ins, ins, mode);
+	ir_node *phi = new_ir_node(NULL, irg, block, op_Phi, mode, n_ins, ins);
+	phi->attr.phi.u.backedge = new_backedge_arr(irg->obst, n_ins);
 	info = be_get_info(phi);
 	info->out_infos = NEW_ARR_D(reg_out_info_t, obst, 1);
 	memset(info->out_infos, 0, 1 * sizeof(info->out_infos[0]));
@@ -1075,7 +1087,8 @@ ir_node *be_new_Phi(ir_node *block, int n_ins, ir_node **ins, ir_mode *mode,
 	for (i = 0; i < n_ins; ++i) {
 		info->in_reqs[i] = req;
 	}
-
+	irn_verify_irg(phi, irg);
+	phi = optimize_node(phi);
 	return phi;
 }