X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fia32%2Fia32_finish.c;h=ac361ad3aaef825e6520776bebad4280892c1c9b;hb=217290f085a982f29062ff1d7613ca48a88bfbf4;hp=c3abc71ca786334ad399bbc86b897245d210f411;hpb=78f119aff4c7d4fa717e9886e8e9b9303692c50f;p=libfirm

diff --git a/ir/be/ia32/ia32_finish.c b/ir/be/ia32/ia32_finish.c
index c3abc71ca..ac361ad3a 100644
--- a/ir/be/ia32/ia32_finish.c
+++ b/ir/be/ia32/ia32_finish.c
@@ -44,6 +44,7 @@
 #include "ia32_finish.h"
 #include "ia32_new_nodes.h"
 #include "ia32_map_regs.h"
+#include "ia32_common_transform.h"
 #include "ia32_transform.h"
 #include "ia32_dbg_stat.h"
 #include "ia32_optimize.h"
@@ -63,7 +64,7 @@ static void ia32_transform_sub_to_neg_add(ir_node *irn, ia32_code_gen_t *cg) {
 	const arch_register_t *in1_reg, *in2_reg, *out_reg;
 
 	/* fix_am will solve this for AddressMode variants */
-	if(get_ia32_op_type(irn) != ia32_Normal)
+	if (get_ia32_op_type(irn) != ia32_Normal)
 		return;
 
 	noreg    = ia32_new_NoReg_gp(cg);
@@ -85,7 +86,7 @@ static void ia32_transform_sub_to_neg_add(ir_node *irn, ia32_code_gen_t *cg) {
 	dbg = get_irn_dbg_info(irn);
 
 	/* generate the neg src2 */
-	if(is_ia32_xSub(irn)) {
+	if (is_ia32_xSub(irn)) {
 		int size;
 		ir_entity *entity;
 		ir_mode *op_mode = get_ia32_ls_mode(irn);
@@ -118,7 +119,7 @@ static void ia32_transform_sub_to_neg_add(ir_node *irn, ia32_code_gen_t *cg) {
 		ir_node         *flags_proj = NULL;
 		const ir_edge_t *edge;
 
-		if(get_irn_mode(irn) == mode_T) {
+		if (get_irn_mode(irn) == mode_T) {
 			/* collect the Proj uses */
 			foreach_out_edge(irn, edge) {
 				ir_node *proj = get_edge_src_irn(edge);
@@ -162,7 +163,7 @@ static void ia32_transform_sub_to_neg_add(ir_node *irn, ia32_code_gen_t *cg) {
 			 * t2 = a + ~b + Carry
 			 * Complement Carry
 			 *
-			 * a + -b = a + (~b + 1)  would sat the carry flag IF a == b ...
+			 * a + -b = a + (~b + 1)  would set the carry flag IF a == b ...
 			 */
 			not = new_rd_ia32_Not(dbg, irg, block, in2);
 			arch_set_irn_register(cg->arch_env, not, in2_reg);
@@ -171,19 +172,25 @@ static void ia32_transform_sub_to_neg_add(ir_node *irn, ia32_code_gen_t *cg) {
 			stc = new_rd_ia32_Stc(dbg, irg, block);
 			arch_set_irn_register(cg->arch_env, stc,
 			                      &ia32_flags_regs[REG_EFLAGS]);
+			sched_add_before(irn, stc);
 
 			adc = new_rd_ia32_Adc(dbg, irg, block, noreg, noreg, nomem, not,
 			                      in1, stc);
 			arch_set_irn_register(cg->arch_env, adc, out_reg);
 			sched_add_before(irn, adc);
 
+			set_irn_mode(adc, mode_T);
 			adc_flags = new_r_Proj(irg, block, adc, mode_Iu, pn_ia32_Adc_flags);
+			arch_set_irn_register(cg->arch_env, adc_flags,
+			                      &ia32_flags_regs[REG_EFLAGS]);
 
 			cmc = new_rd_ia32_Cmc(dbg, irg, block, adc_flags);
+			arch_set_irn_register(cg->arch_env, cmc,
+			                      &ia32_flags_regs[REG_EFLAGS]);
 			sched_add_before(irn, cmc);
 
 			exchange(flags_proj, cmc);
-			if(res_proj != NULL) {
+			if (res_proj != NULL) {
 				set_Proj_pred(res_proj, adc);
 				set_Proj_proj(res_proj, pn_ia32_Adc_res);
 			}
@@ -196,7 +203,7 @@ static void ia32_transform_sub_to_neg_add(ir_node *irn, ia32_code_gen_t *cg) {
 
 	/* remove the old sub */
 	sched_remove(irn);
-	be_kill_node(irn);
+	kill_node(irn);
 
 	DBG_OPT_SUB2NEGADD(irn, res);
 }