X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Fboolopt.c;h=08168a827d193ba7d18a63a8b1a1b05a1dd57434;hb=4cef2a70fbdc26498af3540fb1d07d96fbd56d56;hp=ca97dc47bfeaa7d58d791da72fcfc5fadfdbd7f5;hpb=d5ad877ada2809b07ddb33f4d27d97ddb893d352;p=libfirm

diff --git a/ir/opt/boolopt.c b/ir/opt/boolopt.c
index ca97dc47b..08168a827 100644
--- a/ir/opt/boolopt.c
+++ b/ir/opt/boolopt.c
@@ -1,3 +1,30 @@
+/*
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
+ *
+ * This file is part of libFirm.
+ *
+ * This file may be distributed and/or modified under the terms of the
+ * GNU General Public License version 2 as published by the Free Software
+ * Foundation and appearing in the file LICENSE.GPL included in the
+ * packaging of this file.
+ *
+ * Licensees holding valid libFirm Professional Edition licenses may use
+ * this file in accordance with the libFirm Commercial License.
+ * Agreement provided with the Software.
+ *
+ * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+ * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE.
+ */
+
+/**
+ * @file
+ * @brief   boolean condition/controlflow optimisations
+ * @author  Matthias Braun, Christoph Mallon
+ * @version $Id: cfopt.c 22579 2008-10-07 14:54:04Z beck $
+ */
+#include "config.h"
+
 #include <assert.h>
 #include <string.h>
 
@@ -90,7 +117,7 @@ static ir_node *bool_and(cond_pair* const cpair)
 	if ((pnc_lo == pn_Cmp_Lt || pnc_lo == pn_Cmp_Le || pnc_lo == pn_Cmp_Eq) &&
 			(pnc_hi == pn_Cmp_Eq || pnc_hi == pn_Cmp_Ge || pnc_hi == pn_Cmp_Gt)) {
 		/* x <|<=|== lo | x ==|>=|> hi -> false */
-		ir_node *const t = new_Const(mode_b, tarval_b_false);
+		ir_node *const t = new_Const(tarval_b_false);
 		return t;
 	} else if ((pnc_lo == pn_Cmp_Lt || pnc_lo == pn_Cmp_Le || pnc_lo == pn_Cmp_Eq) &&
 						 (pnc_hi == pn_Cmp_Lt || pnc_hi == pn_Cmp_Le || pnc_hi == pn_Cmp_Lg)) {
@@ -100,7 +127,7 @@ static ir_node *bool_and(cond_pair* const cpair)
 						 (pnc_hi == pn_Cmp_Eq || pnc_hi == pn_Cmp_Ge || pnc_hi == pn_Cmp_Gt)) {
 		/* x >=|>|!= lo || x ==|>=|> hi -> x ==|>=|> hi */
 		return proj_hi;
-	} else if (tarval_is_one(tarval_sub(tv_hi, tv_lo))) { /* lo + 1 == hi */
+	} else if (tarval_is_one(tarval_sub(tv_hi, tv_lo, NULL))) { /* lo + 1 == hi */
 		if (pnc_lo == pn_Cmp_Ge && pnc_hi == pn_Cmp_Lt) {
 			/* x >= c || x < c + 1 -> x == c */
 			ir_graph *const irg   = current_ir_graph;
@@ -116,7 +143,7 @@ static ir_node *bool_and(cond_pair* const cpair)
 				return p;
 			} else if (pnc_hi == pn_Cmp_Lt) {
 				/* x > c || x < c + 1 -> false */
-				ir_node *const t = new_Const(mode_b, tarval_b_false);
+				ir_node *const t = new_Const(tarval_b_false);
 				return t;
 			} else if (pnc_hi == pn_Cmp_Le) {
 				/* x > c || x <= c + 1 -> x != c + 1 */
@@ -151,7 +178,7 @@ static ir_node *bool_or(cond_pair *const cpair)
 	if ((pnc_lo == pn_Cmp_Ge || pnc_lo == pn_Cmp_Gt || pnc_lo == pn_Cmp_Lg) &&
 			(pnc_hi == pn_Cmp_Lt || pnc_hi == pn_Cmp_Le || pnc_hi == pn_Cmp_Lg)) {
 		/* x >=|>|!= lo | x <|<=|!= hi -> true */
-		ir_node *const t = new_Const(mode_b, tarval_b_true);
+		ir_node *const t = new_Const(tarval_b_true);
 		return t;
 	} else if ((pnc_lo == pn_Cmp_Lt || pnc_lo == pn_Cmp_Le || pnc_lo == pn_Cmp_Eq) &&
 						 (pnc_hi == pn_Cmp_Lt || pnc_hi == pn_Cmp_Le || pnc_hi == pn_Cmp_Lg)) {
@@ -161,7 +188,7 @@ static ir_node *bool_or(cond_pair *const cpair)
 						 (pnc_hi == pn_Cmp_Eq || pnc_hi == pn_Cmp_Ge || pnc_hi == pn_Cmp_Gt)) {
 		/* x >=|>|!= lo || x ==|>=|> hi -> x >=|>|!= lo */
 		return proj_lo;
-	} else if (tarval_is_one(tarval_sub(tv_hi, tv_lo))) { /* lo + 1 == hi */
+	} else if (tarval_is_one(tarval_sub(tv_hi, tv_lo, NULL))) { /* lo + 1 == hi */
 		if (pnc_lo == pn_Cmp_Lt && pnc_hi == pn_Cmp_Ge) {
 			/* x < c || x >= c + 1 -> x != c */
 			ir_graph *const irg   = current_ir_graph;
@@ -177,7 +204,7 @@ static ir_node *bool_or(cond_pair *const cpair)
 				return p;
 			} else if (pnc_hi == pn_Cmp_Ge) {
 				/* x <= c || x >= c + 1 -> true */
-				ir_node *const t = new_Const(mode_b, tarval_b_true);
+				ir_node *const t = new_Const(tarval_b_true);
 				return t;
 			} else if (pnc_hi == pn_Cmp_Gt) {
 				/* x <= c || x > c + 1 -> x != c + 1 */
@@ -187,7 +214,7 @@ static ir_node *bool_or(cond_pair *const cpair)
 				return p;
 			}
 		} else if (pnc_lo == pn_Cmp_Eq && pnc_hi == pn_Cmp_Ge) {
-			/* x == c || c >= c + 1 -> x >= c */
+			/* x == c || x >= c + 1 -> x >= c */
 			ir_graph *const irg   = current_ir_graph;
 			ir_node  *const block = get_nodes_block(cmp_lo);
 			ir_node  *const p     = new_r_Proj(irg, block, cmp_lo, mode_b, pn_Cmp_Ge);
@@ -426,7 +453,7 @@ void opt_bool(ir_graph *const irg)
 {
 	irg_walk_graph(irg, NULL, bool_walk, NULL);
 
-	set_using_block_mark(irg);
+	ir_reserve_resources(irg, IR_RESOURCE_BLOCK_MARK | IR_RESOURCE_PHI_LIST);
 
 	irg_walk_graph(irg, clear_block_infos, collect_phis, NULL);
 
@@ -437,5 +464,5 @@ void opt_bool(ir_graph *const irg)
 	set_irg_extblk_inconsistent(irg);
 	set_irg_loopinfo_inconsistent(irg);
 
-	clear_using_block_mark(irg);
+	ir_free_resources(irg, IR_RESOURCE_BLOCK_MARK | IR_RESOURCE_PHI_LIST);
 }