X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbestate.c;h=1e3bf3effedb3086da0544c9e28db81165fcaf3d;hb=5474a1c188c9d59eea2c915515980cd9cbab58d8;hp=3daf4bdfd30eba8b2c9b820675fde596f61d6ab1;hpb=3bb47464dc990c9def630a208a12da1bdd035bbb;p=libfirm

diff --git a/ir/be/bestate.c b/ir/be/bestate.c
index 3daf4bdfd..1e3bf3eff 100644
--- a/ir/be/bestate.c
+++ b/ir/be/bestate.c
@@ -23,7 +23,6 @@
  *              algorithm optimized for the 1-register case.
  * @author      Matthias Braun
  * @date        26.03.2007
- * @version     $Id$
  */
 #include "config.h"
 
@@ -38,7 +37,7 @@
 #include "ircons_t.h"
 #include "irgmod.h"
 #include "irnodeset.h"
-#include "irnodemap.h"
+#include "irnodehashmap.h"
 #include "adt/cpset.h"
 
 #include "bearch.h"
@@ -67,7 +66,7 @@ typedef struct minibelady_env_t {
 	create_reload_func     create_reload;
 	create_spill_func      create_spill;
 	spill_info_t          *spills;
-	ir_nodemap_t           spill_infos;
+	ir_nodehashmap_t       spill_infos;
 
 	be_uses_t             *uses;           /**< env for the next-use magic */
 } minibelady_env_t;
@@ -100,7 +99,7 @@ static inline spill_info_t *create_spill_info(minibelady_env_t *env, ir_node *st
 	spill_info->value = state;
 	spill_info->reloads = NEW_ARR_F(ir_node*, 0);
 
-	ir_nodemap_insert(&env->spill_infos, state, spill_info);
+	ir_nodehashmap_insert(&env->spill_infos, state, spill_info);
 	//ir_fprintf(stderr, "Insert %+F -> %p\n", state, spill_info);
 
 	spill_info->next = env->spills;
@@ -112,7 +111,7 @@ static inline spill_info_t *create_spill_info(minibelady_env_t *env, ir_node *st
 static inline spill_info_t *get_spill_info(minibelady_env_t *env, const ir_node *node)
 {
 	spill_info_t *spill_info
-		= (spill_info_t*) ir_nodemap_get(&env->spill_infos, node);
+		= (spill_info_t*) ir_nodehashmap_get(&env->spill_infos, node);
 	//ir_fprintf(stderr, "Get %+F -> %p\n", node, spill_info);
 	return spill_info;
 }
@@ -526,9 +525,9 @@ void be_assure_state(ir_graph *irg, const arch_register_t *reg, void *func_env,
 {
 	minibelady_env_t env;
 	spill_info_t *info;
-	be_lv_t *lv = be_assure_liveness(irg);
+	be_lv_t *lv = be_get_irg_liveness(irg);
 
-	be_liveness_assure_sets(lv);
+	be_assure_live_sets(irg);
 	assure_loopinfo(irg);
 
 	obstack_init(&env.obst);
@@ -539,7 +538,7 @@ void be_assure_state(ir_graph *irg, const arch_register_t *reg, void *func_env,
 	env.lv            = be_get_irg_liveness(irg);
 	env.uses          = be_begin_uses(irg, env.lv);
 	env.spills        = NULL;
-	ir_nodemap_init(&env.spill_infos);
+	ir_nodehashmap_init(&env.spill_infos);
 
 	assure_doms(irg);
 	ir_reserve_resources(irg, IR_RESOURCE_IRN_VISITED | IR_RESOURCE_IRN_LINK);
@@ -594,7 +593,7 @@ void be_assure_state(ir_graph *irg, const arch_register_t *reg, void *func_env,
 	/* some nodes might be dead now. */
 	be_remove_dead_nodes_from_schedule(irg);
 
-	ir_nodemap_destroy(&env.spill_infos);
+	ir_nodehashmap_destroy(&env.spill_infos);
 	be_end_uses(env.uses);
 	obstack_free(&env.obst, NULL);
 }