X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Fgvn_pre.c;h=56229efeaf52b3269ff6758e753de29bf0455078;hb=8c9921a1fc166552f6e416434fd8394a4fc210a3;hp=f4407faa2746705596aea5bbeef60e98ec65cb0f;hpb=1a3b7d363474ab544c13093a2f0b578718d37c7a;p=libfirm

diff --git a/ir/opt/gvn_pre.c b/ir/opt/gvn_pre.c
index f4407faa2..56229efea 100644
--- a/ir/opt/gvn_pre.c
+++ b/ir/opt/gvn_pre.c
@@ -22,7 +22,6 @@
  * @brief   Global Value Numbering Partial Redundancy Elimination
  *          (VanDrunen Hosking 2004)
  * @author  Michael Beck
- * @version $Id$
  * @brief
  */
 #include "config.h"
@@ -36,7 +35,7 @@
 #include "ircons.h"
 #include "irgmod.h"
 #include "valueset.h"
-#include "irnodemap.h"
+#include "irnodehashmap.h"
 #include "irnodeset.h"
 #include "iredges.h"
 #include "iropt_dbg.h"
@@ -83,7 +82,7 @@ typedef struct pre_env {
 	char first_iter;        /**< non-zero for first iteration */
 } pre_env;
 
-static ir_nodemap_t value_map;
+static ir_nodehashmap_t value_map;
 
 /** The debug module handle. */
 DEBUG_ONLY(static firm_dbg_module_t *dbg;)
@@ -124,7 +123,7 @@ static ir_node *add(ir_node *e, ir_node *v)
 		}
 	}
 	v = identify_remember(v);
-	ir_nodemap_insert(&value_map, e, v);
+	ir_nodehashmap_insert(&value_map, e, v);
 	return v;
 }  /* add */
 
@@ -138,7 +137,7 @@ static ir_node *add(ir_node *e, ir_node *v)
  */
 static ir_node *lookup(ir_node *e)
 {
-	ir_node *value = (ir_node*)ir_nodemap_get(&value_map, e);
+	ir_node *value = (ir_node*)ir_nodehashmap_get(&value_map, e);
 	if (value != NULL)
 		return identify_remember(value);
 	return NULL;
@@ -193,7 +192,7 @@ static int is_nice_value(ir_node *n)
 	if (!mode_is_data(mode)) {
 		if (! is_Div(n) && ! is_Mod(n))
 			return 0;
-		if (! is_NoMem(get_fragile_op_mem(n)))
+		if (! is_NoMem(get_memop_mem(n)))
 			return 0;
 	}
 	return 1;
@@ -537,7 +536,7 @@ static void compute_antic(ir_node *block, void *ctx)
 static void insert_nodes(ir_node *block, void *ctx)
 {
 	pre_env    *env = (pre_env*)ctx;
-	ir_node    *value, *expr, *idom, *first_s, *worklist;
+	ir_node    *value, *expr, *idom, *first_s;
 	block_info *curr_info, *idom_info;
 	int        pos, arity = get_irn_arity(block);
 	int        all_same, by_some, updated;
@@ -571,7 +570,6 @@ static void insert_nodes(ir_node *block, void *ctx)
 
 	/* convert the set into a list. This allows the removal of
 	 * elements from the set */
-	worklist = NULL;
 	foreach_valueset(curr_info->antic_in, value, expr, iter) {
 		ir_mode *mode;
 
@@ -640,7 +638,7 @@ static void insert_nodes(ir_node *block, void *ctx)
 				/* ignore bad blocks. */
 				if (is_Bad(pred_blk)) {
 					ir_graph *irg = get_irn_irg(pred_blk);
-					in[pos] = new_r_Bad(irg);
+					in[pos] = new_r_Bad(irg, mode_X);
 					continue;
 				}
 
@@ -807,7 +805,7 @@ void do_gvn_pre(ir_graph *irg)
 	edges_deactivate(irg);
 
 	new_identities(irg);
-	ir_nodemap_init(&value_map);
+	ir_nodehashmap_init(&value_map);
 
 	obstack_init(&obst);
 	a_env.obst        = &obst;
@@ -886,17 +884,12 @@ void do_gvn_pre(ir_graph *irg)
 		if (bl_info->new_set)
 			ir_valueset_del(bl_info->new_set);
 	}
-	ir_nodemap_destroy(&value_map);
+	ir_nodehashmap_destroy(&value_map);
 	obstack_free(&obst, NULL);
 
 	/* pin the graph again: This is needed due to the use of set_opt_global_cse(1) */
 	set_irg_pinned(irg, op_pin_state_pinned);
 	restore_optimization_state(&state);
-
-	if (a_env.pairs) {
-		set_irg_outs_inconsistent(irg);
-		set_irg_loopinfo_inconsistent(irg);
-	}
 }  /* do_gvn_pre */
 
 /* Creates an ir_graph pass for do_gvn_pre. */