X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fia32%2Fia32_transform.c;h=e713960684e21ae95baaf7a389e386deb0ff2e8b;hb=37daf463b2879cf2ec3d5bc3aa6dccacc5c8dfde;hp=aa62be37f2700e367aeb5194f83f375510b1b1b1;hpb=e9c215cf4349b990b65b0cd9caf1978c3550ccaa;p=libfirm

diff --git a/ir/be/ia32/ia32_transform.c b/ir/be/ia32/ia32_transform.c
index aa62be37f..e71396068 100644
--- a/ir/be/ia32/ia32_transform.c
+++ b/ir/be/ia32/ia32_transform.c
@@ -2457,10 +2457,9 @@ static ir_node *gen_vfist(dbg_info *dbgi, ir_node *block, ir_node *base, ir_node
 	if (ia32_cg_config.use_fisttp) {
 		/* Note: fisttp ALWAYS pop the tos. We have to ensure here that the value is copied
 		if other users exists */
-		const arch_register_class_t *reg_class = &ia32_reg_classes[CLASS_ia32_vfp];
 		ir_node *vfisttp = new_bd_ia32_vfisttp(dbgi, block, base, index, mem, val);
 		ir_node *value   = new_r_Proj(block, vfisttp, mode_E, pn_ia32_vfisttp_res);
-		be_new_Keep(reg_class, block, 1, &value);
+		be_new_Keep(block, 1, &value);
 
 		new_node = new_r_Proj(block, vfisttp, mode_M, pn_ia32_vfisttp_M);
 		*fist    = vfisttp;
@@ -3775,6 +3774,7 @@ static ir_node *gen_be_SubSP(ir_node *node)
  */
 static ir_node *gen_Phi(ir_node *node)
 {
+	const arch_register_req_t *req;
 	ir_node  *block = be_transform_node(get_nodes_block(node));
 	ir_graph *irg   = current_ir_graph;
 	dbg_info *dbgi  = get_irn_dbg_info(node);
@@ -3786,12 +3786,17 @@ static ir_node *gen_Phi(ir_node *node)
 		assert(get_mode_size_bits(mode) <= 32);
 		/* all integer operations are on 32bit registers now */
 		mode = mode_Iu;
+		req  = ia32_reg_classes[CLASS_ia32_gp].class_req;
 	} else if (mode_is_float(mode)) {
 		if (ia32_cg_config.use_sse2) {
 			mode = mode_xmm;
+			req  = ia32_reg_classes[CLASS_ia32_xmm].class_req;
 		} else {
 			mode = mode_vfp;
+			req  = ia32_reg_classes[CLASS_ia32_vfp].class_req;
 		}
+	} else {
+		req = arch_no_register_req;
 	}
 
 	/* phi nodes allow loops, so we use the old arguments for now
@@ -3801,11 +3806,26 @@ static ir_node *gen_Phi(ir_node *node)
 	copy_node_attr(node, phi);
 	be_duplicate_deps(node, phi);
 
+	arch_set_out_register_req(phi, 0, req);
+
 	be_enqueue_preds(node);
 
 	return phi;
 }
 
+static ir_node *gen_Jmp(ir_node *node)
+{
+	ir_node  *block     = get_nodes_block(node);
+	ir_node  *new_block = be_transform_node(block);
+	dbg_info *dbgi      = get_irn_dbg_info(node);
+	ir_node  *new_node;
+
+	new_node = new_bd_ia32_Jmp(dbgi, new_block);
+	SET_IA32_ORIG_NODE(new_node, node);
+
+	return new_node;
+}
+
 /**
  * Transform IJmp
  */
@@ -5245,7 +5265,8 @@ static ir_node *gen_Proj_be_Call(ir_node *node)
 		assert(req->type & arch_register_req_type_limited);
 
 		for (i = 0; i < n_outs; ++i) {
-			arch_register_req_t const *const new_req = get_ia32_out_req(new_call, i);
+			arch_register_req_t const *const new_req
+				= arch_get_out_register_req(new_call, i);
 
 			if (!(new_req->type & arch_register_req_type_limited) ||
 			    new_req->cls      != req->cls                     ||
@@ -5456,6 +5477,7 @@ static void register_transformers(void)
 	GEN(Mux);
 	GEN(Proj);
 	GEN(Phi);
+	GEN(Jmp);
 	GEN(IJmp);
 	GEN(Bound);
 
@@ -5582,7 +5604,7 @@ static void add_missing_keep_walker(ir_node *node, void *data)
 			continue;
 		}
 
-		req = get_ia32_out_req(node, i);
+		req = arch_get_out_register_req(node, i);
 		cls = req->cls;
 		if (cls == NULL) {
 			continue;
@@ -5596,7 +5618,7 @@ static void add_missing_keep_walker(ir_node *node, void *data)
 		if (last_keep != NULL) {
 			be_Keep_add_node(last_keep, cls, in[0]);
 		} else {
-			last_keep = be_new_Keep(cls, block, 1, in);
+			last_keep = be_new_Keep(block, 1, in);
 			if (sched_is_scheduled(node)) {
 				sched_add_after(node, last_keep);
 			}