X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Fldstopt.c;h=15964a359d7f71fadb5461172c654f51fe78c706;hb=b42d141b27222454d6176f233327c594d71be554;hp=bb52a913176e333e8e56aeb9fe59f27f8921a9c2;hpb=b22d0d033af6290a88ca4f74f699b8be7bf50ef8;p=libfirm

diff --git a/ir/opt/ldstopt.c b/ir/opt/ldstopt.c
index bb52a9131..15964a359 100644
--- a/ir/opt/ldstopt.c
+++ b/ir/opt/ldstopt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2011 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -35,7 +35,6 @@
 #include "ircons_t.h"
 #include "irgmod.h"
 #include "irgwalk.h"
-#include "irvrfy.h"
 #include "tv_t.h"
 #include "dbginfo_t.h"
 #include "iropt_dbg.h"
@@ -43,7 +42,7 @@
 #include "array_t.h"
 #include "irhooks.h"
 #include "iredges.h"
-#include "irtools.h"
+#include "irpass.h"
 #include "opt_polymorphy.h"
 #include "irmemory.h"
 #include "irphase_t.h"
@@ -59,9 +58,9 @@ DEBUG_ONLY(static firm_dbg_module_t *dbg;)
 #endif
 
 #undef IMAX
-#define IMAX(a,b)	((a) > (b) ? (a) : (b))
+#define IMAX(a,b)   ((a) > (b) ? (a) : (b))
 
-#define MAX_PROJ	IMAX(IMAX(pn_Load_max, pn_Store_max), pn_Call_max)
+#define MAX_PROJ    IMAX(IMAX((long)pn_Load_max, (long)pn_Store_max), (long)pn_Call_max)
 
 enum changes_t {
 	DF_CHANGED = 1,       /**< data flow changed */
@@ -71,13 +70,13 @@ enum changes_t {
 /**
  * walker environment
  */
-typedef struct _walk_env_t {
+typedef struct walk_env_t {
 	struct obstack obst;          /**< list of all stores */
 	unsigned changes;             /**< a bitmask of graph changes */
 } walk_env_t;
 
 /** A Load/Store info. */
-typedef struct _ldst_info_t {
+typedef struct ldst_info_t {
 	ir_node  *projs[MAX_PROJ];    /**< list of Proj's of this node */
 	ir_node  *exc_block;          /**< the exception block if available */
 	int      exc_idx;             /**< predecessor index in the exception block */
@@ -95,7 +94,7 @@ enum block_flags_t {
 /**
  * a Block info.
  */
-typedef struct _block_info_t {
+typedef struct block_info_t {
 	unsigned flags;               /**< flags for the block */
 } block_info_t;
 
@@ -109,12 +108,12 @@ static unsigned master_visited = 0;
 /**
  * get the Load/Store info of a node
  */
-static ldst_info_t *get_ldst_info(ir_node *node, struct obstack *obst) {
-	ldst_info_t *info = get_irn_link(node);
+static ldst_info_t *get_ldst_info(ir_node *node, struct obstack *obst)
+{
+	ldst_info_t *info = (ldst_info_t*)get_irn_link(node);
 
 	if (! info) {
-		info = obstack_alloc(obst, sizeof(*info));
-		memset(info, 0, sizeof(*info));
+		info = OALLOCZ(obst, ldst_info_t);
 		set_irn_link(node, info);
 	}
 	return info;
@@ -123,12 +122,12 @@ static ldst_info_t *get_ldst_info(ir_node *node, struct obstack *obst) {
 /**
  * get the Block info of a node
  */
-static block_info_t *get_block_info(ir_node *node, struct obstack *obst) {
-	block_info_t *info = get_irn_link(node);
+static block_info_t *get_block_info(ir_node *node, struct obstack *obst)
+{
+	block_info_t *info = (block_info_t*)get_irn_link(node);
 
 	if (! info) {
-		info = obstack_alloc(obst, sizeof(*info));
-		memset(info, 0, sizeof(*info));
+		info = OALLOCZ(obst, block_info_t);
 		set_irn_link(node, info);
 	}
 	return info;
@@ -180,10 +179,10 @@ static unsigned update_exc(ldst_info_t *info, ir_node *block, int pos)
  */
 static void collect_nodes(ir_node *node, void *env)
 {
-	ir_opcode   opcode = get_irn_opcode(node);
+	walk_env_t  *wenv   = (walk_env_t *)env;
+	unsigned     opcode = get_irn_opcode(node);
 	ir_node     *pred, *blk, *pred_blk;
 	ldst_info_t *ldst_info;
-	walk_env_t  *wenv = env;
 
 	if (opcode == iro_Proj) {
 		pred   = get_Proj_pred(node);
@@ -271,10 +270,10 @@ static ir_entity *find_constant_entity(ir_node *ptr)
 				int i, n;
 
 				for (i = 0, n = get_Sel_n_indexs(ptr); i < n; ++i) {
-					ir_node *bound;
-					tarval *tlower, *tupper;
-					ir_node *index = get_Sel_index(ptr, i);
-					tarval *tv     = computed_value(index);
+					ir_node   *bound;
+					ir_tarval *tlower, *tupper;
+					ir_node   *index = get_Sel_index(ptr, i);
+					ir_tarval *tv    = computed_value(index);
 
 					/* check if the index is constant */
 					if (tv == tarval_bad)
@@ -297,7 +296,7 @@ static ir_entity *find_constant_entity(ir_node *ptr)
 				}
 			}
 
-			if (variability_constant == get_entity_variability(ent))
+			if (get_entity_linkage(ent) & IR_LINKAGE_CONSTANT)
 				return ent;
 
 			/* try next */
@@ -320,7 +319,7 @@ static ir_entity *find_constant_entity(ir_node *ptr)
 			ir_node *l = get_Sub_left(ptr);
 			ir_node *r = get_Sub_right(ptr);
 
-			if (get_irn_mode(l) == get_irn_mode(ptr) &&	is_Const(r))
+			if (get_irn_mode(l) == get_irn_mode(ptr) && is_Const(r))
 				ptr = l;
 			else
 				return NULL;
@@ -335,7 +334,8 @@ static ir_entity *find_constant_entity(ir_node *ptr)
 /**
  * Return the Selection index of a Sel node from dimension n
  */
-static long get_Sel_array_index_long(ir_node *n, int dim) {
+static long get_Sel_array_index_long(ir_node *n, int dim)
+{
 	ir_node *index = get_Sel_index(n, dim);
 	assert(is_Const(index));
 	return get_tarval_long(get_Const_tarval(index));
@@ -349,11 +349,12 @@ static long get_Sel_array_index_long(ir_node *n, int dim) {
  * @param depth  current depth in steps upward from the root
  *               of the address
  */
-static compound_graph_path *rec_get_accessed_path(ir_node *ptr, int depth) {
+static compound_graph_path *rec_get_accessed_path(ir_node *ptr, int depth)
+{
 	compound_graph_path *res = NULL;
 	ir_entity           *root, *field, *ent;
 	int                 path_len, pos, idx;
-	tarval              *tv;
+	ir_tarval           *tv;
 	ir_type             *tp;
 
 	if (is_SymConst(ptr)) {
@@ -381,17 +382,19 @@ static compound_graph_path *rec_get_accessed_path(ir_node *ptr, int depth) {
 			set_compound_graph_path_array_index(res, pos, get_Sel_array_index_long(ptr, 0));
 		}
 	} else if (is_Add(ptr)) {
-		ir_node *l    = get_Add_left(ptr);
-		ir_node *r    = get_Add_right(ptr);
-		ir_mode *mode = get_irn_mode(ptr);
-		tarval  *tmp;
-
-		if (is_Const(r) && get_irn_mode(l) == mode) {
-			ptr = l;
-			tv  = get_Const_tarval(r);
-		} else {
-			ptr = r;
-			tv  = get_Const_tarval(l);
+		ir_mode   *mode;
+		ir_tarval *tmp;
+
+		{
+			ir_node   *l    = get_Add_left(ptr);
+			ir_node   *r    = get_Add_right(ptr);
+			if (is_Const(r) && get_irn_mode(l) == get_irn_mode(ptr)) {
+				ptr = l;
+				tv  = get_Const_tarval(r);
+			} else {
+				ptr = r;
+				tv  = get_Const_tarval(l);
+			}
 		}
 ptr_arith:
 		mode = get_tarval_mode(tv);
@@ -405,9 +408,9 @@ ptr_arith:
 		}
 		idx = 0;
 		for (ent = field;;) {
-			unsigned size;
-			tarval   *sz, *tv_index, *tlower, *tupper;
-			ir_node  *bound;
+			unsigned   size;
+			ir_tarval *sz, *tv_index, *tlower, *tupper;
+			ir_node   *bound;
 
 			tp = get_entity_type(ent);
 			if (! is_Array_type(tp))
@@ -456,9 +459,9 @@ ptr_arith:
 		pos      = path_len - depth - idx;
 
 		for (ent = field;;) {
-			unsigned size;
-			tarval   *sz, *tv_index;
-			long     index;
+			unsigned   size;
+			ir_tarval *sz, *tv_index;
+			long       index;
 
 			tp = get_entity_type(ent);
 			if (! is_Array_type(tp))
@@ -496,7 +499,8 @@ ptr_arith:
  * Returns an access path or NULL.  The access path is only
  * valid, if the graph is in phase_high and _no_ address computation is used.
  */
-static compound_graph_path *get_accessed_path(ir_node *ptr) {
+static compound_graph_path *get_accessed_path(ir_node *ptr)
+{
 	compound_graph_path *gr = rec_get_accessed_path(ptr, 0);
 	return gr;
 }  /* get_accessed_path */
@@ -507,11 +511,12 @@ typedef struct path_entry {
 	long              index;
 } path_entry;
 
-static ir_node *rec_find_compound_ent_value(ir_node *ptr, path_entry *next) {
+static ir_node *rec_find_compound_ent_value(ir_node *ptr, path_entry *next)
+{
 	path_entry       entry, *p;
 	ir_entity        *ent, *field;
 	ir_initializer_t *initializer;
-	tarval           *tv;
+	ir_tarval        *tv;
 	ir_type          *tp;
 	unsigned         n;
 
@@ -582,17 +587,19 @@ static ir_node *rec_find_compound_ent_value(ir_node *ptr, path_entry *next) {
 		}
 		return rec_find_compound_ent_value(get_Sel_ptr(ptr), &entry);
 	}  else if (is_Add(ptr)) {
-		ir_node  *l = get_Add_left(ptr);
-		ir_node  *r = get_Add_right(ptr);
 		ir_mode  *mode;
 		unsigned pos;
 
-		if (is_Const(r)) {
-			ptr = l;
-			tv  = get_Const_tarval(r);
-		} else {
-			ptr = r;
-			tv  = get_Const_tarval(l);
+		{
+			ir_node *l = get_Add_left(ptr);
+			ir_node *r = get_Add_right(ptr);
+			if (is_Const(r)) {
+				ptr = l;
+				tv  = get_Const_tarval(r);
+			} else {
+				ptr = r;
+				tv  = get_Const_tarval(l);
+			}
 		}
 ptr_arith:
 		mode = get_tarval_mode(tv);
@@ -623,10 +630,10 @@ ptr_arith:
 		/* fill them up */
 		pos = 0;
 		for (ent = field;;) {
-			unsigned size;
-			tarval   *sz, *tv_index, *tlower, *tupper;
-			long     index;
-			ir_node  *bound;
+			unsigned   size;
+			ir_tarval *sz, *tv_index, *tlower, *tupper;
+			long       index;
+			ir_node   *bound;
 
 			tp = get_entity_type(ent);
 			if (! is_Array_type(tp))
@@ -681,7 +688,8 @@ ptr_arith:
 	return NULL;
 }
 
-static ir_node *find_compound_ent_value(ir_node *ptr) {
+static ir_node *find_compound_ent_value(ir_node *ptr)
+{
 	return rec_find_compound_ent_value(ptr, NULL);
 }
 
@@ -691,8 +699,9 @@ static void reduce_adr_usage(ir_node *ptr);
 /**
  * Update a Load that may have lost its users.
  */
-static void handle_load_update(ir_node *load) {
-	ldst_info_t *info = get_irn_link(load);
+static void handle_load_update(ir_node *load)
+{
+	ldst_info_t *info = (ldst_info_t*)get_irn_link(load);
 
 	/* do NOT touch volatile loads for now */
 	if (get_Load_volatility(load) == volatility_is_volatile)
@@ -705,7 +714,7 @@ static void handle_load_update(ir_node *load) {
 		/* a Load whose value is neither used nor exception checked, remove it */
 		exchange(info->projs[pn_Load_M], mem);
 		if (info->projs[pn_Load_X_regular])
-			exchange(info->projs[pn_Load_X_regular], new_r_Jmp(current_ir_graph, get_nodes_block(load)));
+			exchange(info->projs[pn_Load_X_regular], new_r_Jmp(get_nodes_block(load)));
 		kill_node(load);
 		reduce_adr_usage(ptr);
 	}
@@ -715,20 +724,22 @@ static void handle_load_update(ir_node *load) {
  * A use of an address node has vanished. Check if this was a Proj
  * node and update the counters.
  */
-static void reduce_adr_usage(ir_node *ptr) {
-	if (is_Proj(ptr)) {
-		if (get_irn_n_edges(ptr) <= 0) {
-			/* this Proj is dead now */
-			ir_node *pred = get_Proj_pred(ptr);
-
-			if (is_Load(pred)) {
-				ldst_info_t *info = get_irn_link(pred);
-				info->projs[get_Proj_proj(ptr)] = NULL;
-
-				/* this node lost its result proj, handle that */
-				handle_load_update(pred);
-			}
-		}
+static void reduce_adr_usage(ir_node *ptr)
+{
+	ir_node *pred;
+	if (!is_Proj(ptr))
+		return;
+	if (get_irn_n_edges(ptr) > 0)
+		return;
+
+	/* this Proj is dead now */
+	pred = get_Proj_pred(ptr);
+	if (is_Load(pred)) {
+		ldst_info_t *info = (ldst_info_t*)get_irn_link(pred);
+		info->projs[get_Proj_proj(ptr)] = NULL;
+
+		/* this node lost its result proj, handle that */
+		handle_load_update(pred);
 	}
 }  /* reduce_adr_usage */
 
@@ -736,7 +747,8 @@ static void reduce_adr_usage(ir_node *ptr) {
  * Check, if an already existing value of mode old_mode can be converted
  * into the needed one new_mode without loss.
  */
-static int can_use_stored_value(ir_mode *old_mode, ir_mode *new_mode) {
+static int can_use_stored_value(ir_mode *old_mode, ir_mode *new_mode)
+{
 	if (old_mode == new_mode)
 		return 1;
 
@@ -752,7 +764,8 @@ static int can_use_stored_value(ir_mode *old_mode, ir_mode *new_mode) {
 /**
  * Check whether a Call is at least pure, ie. does only read memory.
  */
-static unsigned is_Call_pure(ir_node *call) {
+static unsigned is_Call_pure(ir_node *call)
+{
 	ir_type *call_tp = get_Call_type(call);
 	unsigned prop = get_method_additional_properties(call_tp);
 
@@ -868,34 +881,35 @@ static int try_load_after_store(ir_node *load,
 		/* produce a shift to adjust offset delta */
 		if (delta > 0) {
 			ir_node *cnst;
+			ir_graph *irg = get_irn_irg(load);
 
 			/* FIXME: only true for little endian */
-			cnst        = new_Const_long(mode_Iu, delta * 8);
-			store_value = new_r_Shr(current_ir_graph, get_nodes_block(load),
+			cnst        = new_r_Const_long(irg, mode_Iu, delta * 8);
+			store_value = new_r_Shr(get_nodes_block(load),
 									store_value, cnst, store_mode);
 		}
 
 		/* add an convert if needed */
 		if (store_mode != load_mode) {
-			store_value = new_r_Conv(current_ir_graph, get_nodes_block(load),
-									 store_value, load_mode);
+			store_value = new_r_Conv(get_nodes_block(load), store_value, load_mode);
 		}
 	}
 
 	DBG_OPT_RAW(load, store_value);
 
-	info = get_irn_link(load);
+	info = (ldst_info_t*)get_irn_link(load);
 	if (info->projs[pn_Load_M])
 		exchange(info->projs[pn_Load_M], get_Load_mem(load));
 
 	res = 0;
 	/* no exception */
 	if (info->projs[pn_Load_X_except]) {
-		exchange( info->projs[pn_Load_X_except], new_Bad());
+		ir_graph *irg = get_irn_irg(load);
+		exchange( info->projs[pn_Load_X_except], new_r_Bad(irg));
 		res |= CF_CHANGED;
 	}
 	if (info->projs[pn_Load_X_regular]) {
-		exchange( info->projs[pn_Load_X_regular], new_r_Jmp(current_ir_graph, get_nodes_block(load)));
+		exchange( info->projs[pn_Load_X_regular], new_r_Jmp(get_nodes_block(load)));
 		res |= CF_CHANGED;
 	}
 
@@ -918,33 +932,34 @@ static int try_load_after_store(ir_node *load,
  *
  * INC_MASTER() must be called before dive into
  */
-static unsigned follow_Mem_chain(ir_node *load, ir_node *curr) {
+static unsigned follow_Mem_chain(ir_node *load, ir_node *curr)
+{
 	unsigned    res = 0;
-	ldst_info_t *info = get_irn_link(load);
+	ldst_info_t *info = (ldst_info_t*)get_irn_link(load);
 	ir_node     *pred;
 	ir_node     *ptr       = get_Load_ptr(load);
 	ir_node     *mem       = get_Load_mem(load);
 	ir_mode     *load_mode = get_Load_mode(load);
 
 	for (pred = curr; load != pred; ) {
-		ldst_info_t *pred_info = get_irn_link(pred);
+		ldst_info_t *pred_info = (ldst_info_t*)get_irn_link(pred);
 
 		/*
 		 * a Load immediately after a Store -- a read after write.
 		 * We may remove the Load, if both Load & Store does not have an
-		 * exception handler OR they are in the same MacroBlock. In the latter
+		 * exception handler OR they are in the same Block. In the latter
 		 * case the Load cannot throw an exception when the previous Store was
 		 * quiet.
 		 *
 		 * Why we need to check for Store Exception? If the Store cannot
 		 * be executed (ROM) the exception handler might simply jump into
-		 * the load MacroBlock :-(
+		 * the load Block :-(
 		 * We could make it a little bit better if we would know that the
 		 * exception handler of the Store jumps directly to the end...
 		 */
 		if (is_Store(pred) && ((pred_info->projs[pn_Store_X_except] == NULL
 				&& info->projs[pn_Load_X_except] == NULL)
-				|| get_nodes_MacroBlock(load) == get_nodes_MacroBlock(pred)))
+				|| get_nodes_block(load) == get_nodes_block(pred)))
 		{
 			long    load_offset;
 			ir_node *base_ptr = get_base_and_offset(ptr, &load_offset);
@@ -956,14 +971,17 @@ static unsigned follow_Mem_chain(ir_node *load, ir_node *curr) {
 		           can_use_stored_value(get_Load_mode(pred), load_mode)) {
 			/*
 			 * a Load after a Load -- a read after read.
-			 * We may remove the second Load, if it does not have an exception handler
-			 * OR they are in the same MacroBlock. In the later case the Load cannot
-			 * throw an exception when the previous Load was quiet.
+			 * We may remove the second Load, if it does not have an exception
+			 * handler OR they are in the same Block. In the later case
+			 * the Load cannot throw an exception when the previous Load was
+			 * quiet.
 			 *
-			 * Here, there is no need to check if the previous Load has an exception
-			 * hander because they would have exact the same exception...
+			 * Here, there is no need to check if the previous Load has an
+			 * exception hander because they would have exact the same
+			 * exception...
 			 */
-			if (info->projs[pn_Load_X_except] == NULL || get_nodes_MacroBlock(load) == get_nodes_MacroBlock(pred)) {
+			if (info->projs[pn_Load_X_except] == NULL
+					|| get_nodes_block(load) == get_nodes_block(pred)) {
 				ir_node *value;
 
 				DBG_OPT_RAR(load, pred);
@@ -972,13 +990,13 @@ static unsigned follow_Mem_chain(ir_node *load, ir_node *curr) {
 				if (info->projs[pn_Load_res]) {
 					if (pred_info->projs[pn_Load_res] == NULL) {
 						/* create a new Proj again */
-						pred_info->projs[pn_Load_res] = new_r_Proj(current_ir_graph, get_nodes_block(pred), pred, get_Load_mode(pred), pn_Load_res);
+						pred_info->projs[pn_Load_res] = new_r_Proj(pred, get_Load_mode(pred), pn_Load_res);
 					}
 					value = pred_info->projs[pn_Load_res];
 
 					/* add an convert if needed */
 					if (get_Load_mode(pred) != load_mode) {
-						value = new_r_Conv(current_ir_graph, get_nodes_block(load), value, load_mode);
+						value = new_r_Conv(get_nodes_block(load), value, load_mode);
 					}
 
 					exchange(info->projs[pn_Load_res], value);
@@ -989,11 +1007,12 @@ static unsigned follow_Mem_chain(ir_node *load, ir_node *curr) {
 
 				/* no exception */
 				if (info->projs[pn_Load_X_except]) {
-					exchange(info->projs[pn_Load_X_except], new_Bad());
+					ir_graph *irg = get_irn_irg(load);
+					exchange(info->projs[pn_Load_X_except], new_r_Bad(irg));
 					res |= CF_CHANGED;
 				}
 				if (info->projs[pn_Load_X_regular]) {
-					exchange( info->projs[pn_Load_X_regular], new_r_Jmp(current_ir_graph, get_nodes_block(load)));
+					exchange( info->projs[pn_Load_X_regular], new_r_Jmp(get_nodes_block(load)));
 					res |= CF_CHANGED;
 				}
 
@@ -1006,7 +1025,6 @@ static unsigned follow_Mem_chain(ir_node *load, ir_node *curr) {
 		if (is_Store(pred)) {
 			/* check if we can pass through this store */
 			ir_alias_relation rel = get_alias_relation(
-				current_ir_graph,
 				get_Store_ptr(pred),
 				get_irn_mode(get_Store_value(pred)),
 				ptr, load_mode);
@@ -1054,28 +1072,24 @@ static unsigned follow_Mem_chain(ir_node *load, ir_node *curr) {
  * Check if we can replace the load by a given const from
  * the const code irg.
  */
-ir_node *can_replace_load_by_const(const ir_node *load, ir_node *c) {
-	ir_mode *c_mode = get_irn_mode(c);
-	ir_mode *l_mode = get_Load_mode(load);
-	ir_node *res    = NULL;
+ir_node *can_replace_load_by_const(const ir_node *load, ir_node *c)
+{
+	ir_mode  *c_mode = get_irn_mode(c);
+	ir_mode  *l_mode = get_Load_mode(load);
+	ir_node  *block  = get_nodes_block(load);
+	dbg_info *dbgi   = get_irn_dbg_info(load);
+	ir_node  *res    = copy_const_value(dbgi, c, block);
 
 	if (c_mode != l_mode) {
 		/* check, if the mode matches OR can be easily converted info */
 		if (is_reinterpret_cast(c_mode, l_mode)) {
-			/* we can safely cast */
-			dbg_info *dbg   = get_irn_dbg_info(load);
-			ir_node  *block = get_nodes_block(load);
-
 			/* copy the value from the const code irg and cast it */
-			res = copy_const_value(dbg, c);
-			res = new_rd_Conv(dbg, current_ir_graph, block, res, l_mode);
+			res = new_rd_Conv(dbgi, block, res, l_mode);
 		}
-	} else {
-		/* copy the value from the const code irg */
-		res = copy_const_value(get_irn_dbg_info(load), c);
+		return NULL;
 	}
 	return res;
-}  /* can_replace_load_by_const */
+}
 
 /**
  * optimize a Load
@@ -1084,7 +1098,7 @@ ir_node *can_replace_load_by_const(const ir_node *load, ir_node *c) {
  */
 static unsigned optimize_load(ir_node *load)
 {
-	ldst_info_t *info = get_irn_link(load);
+	ldst_info_t *info = (ldst_info_t*)get_irn_link(load);
 	ir_node     *mem, *ptr, *value;
 	ir_entity   *ent;
 	long        dummy;
@@ -1097,44 +1111,17 @@ static unsigned optimize_load(ir_node *load)
 	/* the address of the load to be optimized */
 	ptr = get_Load_ptr(load);
 
-	/*
-	 * Check if we can remove the exception from a Load:
-	 * This can be done, if the address is from an Sel(Alloc) and
-	 * the Sel type is a subtype of the allocated type.
-	 *
-	 * This optimizes some often used OO constructs,
-	 * like x = new O; x->t;
-	 */
-	if (info->projs[pn_Load_X_except]) {
-		ir_node *addr = ptr;
-
-		/* find base address */
-		while (is_Sel(addr))
-			addr = get_Sel_ptr(addr);
-		if (is_Alloc(skip_Proj(skip_Cast(addr)))) {
-			/* simple case: a direct load after an Alloc. Firm Alloc throw
-			 * an exception in case of out-of-memory. So, there is no way for an
-			 * exception in this load.
-			 * This code is constructed by the "exception lowering" in the Jack compiler.
-			 */
-			exchange(info->projs[pn_Load_X_except], new_Bad());
-			info->projs[pn_Load_X_except] = NULL;
-			exchange(info->projs[pn_Load_X_regular], new_r_Jmp(current_ir_graph, get_nodes_block(load)));
-			info->projs[pn_Load_X_regular] = NULL;
-			res |= CF_CHANGED;
-		}
-	}
-
 	/* The mem of the Load. Must still be returned after optimization. */
 	mem = get_Load_mem(load);
 
-	if (! info->projs[pn_Load_res] && ! info->projs[pn_Load_X_except]) {
-		/* a Load which value is neither used nor exception checked, remove it */
+	if (info->projs[pn_Load_res] == NULL
+			&& info->projs[pn_Load_X_except] == NULL) {
+		/* the value is never used and we don't care about exceptions, remove */
 		exchange(info->projs[pn_Load_M], mem);
 
 		if (info->projs[pn_Load_X_regular]) {
 			/* should not happen, but if it does, remove it */
-			exchange(info->projs[pn_Load_X_regular], new_r_Jmp(current_ir_graph, get_nodes_block(load)));
+			exchange(info->projs[pn_Load_X_regular], new_r_Jmp(get_nodes_block(load)));
 			res |= CF_CHANGED;
 		}
 		kill_node(load);
@@ -1149,35 +1136,30 @@ static unsigned optimize_load(ir_node *load)
 		value = NULL;
 		/* check if we can determine the entity that will be loaded */
 		ent = find_constant_entity(ptr);
-		if (ent != NULL                                     &&
-		    allocation_static == get_entity_allocation(ent) &&
-		    visibility_external_allocated != get_entity_visibility(ent)) {
-			/* a static allocation that is not external: there should be NO exception
-			 * when loading even if we cannot replace the load itself. */
+		if (ent != NULL
+				&& get_entity_visibility(ent) != ir_visibility_external) {
+			/* a static allocation that is not external: there should be NO
+			 * exception when loading even if we cannot replace the load itself.
+			 */
 
 			/* no exception, clear the info field as it might be checked later again */
 			if (info->projs[pn_Load_X_except]) {
-				exchange(info->projs[pn_Load_X_except], new_Bad());
+				ir_graph *irg = get_irn_irg(load);
+				exchange(info->projs[pn_Load_X_except], new_r_Bad(irg));
 				info->projs[pn_Load_X_except] = NULL;
 				res |= CF_CHANGED;
 			}
 			if (info->projs[pn_Load_X_regular]) {
-				exchange(info->projs[pn_Load_X_regular], new_r_Jmp(current_ir_graph, get_nodes_block(load)));
+				exchange(info->projs[pn_Load_X_regular], new_r_Jmp(get_nodes_block(load)));
 				info->projs[pn_Load_X_regular] = NULL;
 				res |= CF_CHANGED;
 			}
 
-			if (variability_constant == get_entity_variability(ent)) {
-				if (is_atomic_entity(ent)) {
-					/* Might not be atomic after lowering of Sels.  In this case we
-					 * could also load, but it's more complicated. */
-					/* more simpler case: we load the content of a constant value:
-					 * replace it by the constant itself */
-					value = get_atomic_ent_value(ent);
-				} else if (ent->has_initializer) {
+			if (get_entity_linkage(ent) & IR_LINKAGE_CONSTANT) {
+				if (ent->initializer != NULL) {
 					/* new style initializer */
 					value = find_compound_ent_value(ptr);
-				} else {
+				} else if (entity_has_compound_ent_values(ent)) {
 					/* old style initializer */
 					compound_graph_path *path = get_accessed_path(ptr);
 
@@ -1197,12 +1179,13 @@ static unsigned optimize_load(ir_node *load)
 	if (value != NULL) {
 		/* we completely replace the load by this value */
 		if (info->projs[pn_Load_X_except]) {
-			exchange(info->projs[pn_Load_X_except], new_Bad());
+			ir_graph *irg = get_irn_irg(load);
+			exchange(info->projs[pn_Load_X_except], new_r_Bad(irg));
 			info->projs[pn_Load_X_except] = NULL;
 			res |= CF_CHANGED;
 		}
 		if (info->projs[pn_Load_X_regular]) {
-			exchange(info->projs[pn_Load_X_regular], new_r_Jmp(current_ir_graph, get_nodes_block(load)));
+			exchange(info->projs[pn_Load_X_regular], new_r_Jmp(get_nodes_block(load)));
 			info->projs[pn_Load_X_regular] = NULL;
 			res |= CF_CHANGED;
 		}
@@ -1265,19 +1248,19 @@ static int is_partially_same(ir_node *small, ir_node *large)
  *
  * INC_MASTER() must be called before dive into
  */
-static unsigned follow_Mem_chain_for_Store(ir_node *store, ir_node *curr) {
+static unsigned follow_Mem_chain_for_Store(ir_node *store, ir_node *curr)
+{
 	unsigned res = 0;
-	ldst_info_t *info = get_irn_link(store);
+	ldst_info_t *info = (ldst_info_t*)get_irn_link(store);
 	ir_node *pred;
 	ir_node *ptr = get_Store_ptr(store);
 	ir_node *mem = get_Store_mem(store);
 	ir_node *value = get_Store_value(store);
 	ir_mode *mode  = get_irn_mode(value);
 	ir_node *block = get_nodes_block(store);
-	ir_node *mblk  = get_Block_MacroBlock(block);
 
 	for (pred = curr; pred != store;) {
-		ldst_info_t *pred_info = get_irn_link(pred);
+		ldst_info_t *pred_info = (ldst_info_t*)get_irn_link(pred);
 
 		/*
 		 * BEWARE: one might think that checking the modes is useless, because
@@ -1289,9 +1272,9 @@ static unsigned follow_Mem_chain_for_Store(ir_node *store, ir_node *curr) {
 		 * killed ...
 		 */
 		if (is_Store(pred) && get_Store_ptr(pred) == ptr &&
-            get_nodes_MacroBlock(pred) == mblk) {
+            get_nodes_block(pred) == block) {
 			/*
-			 * a Store after a Store in the same MacroBlock -- a write after write.
+			 * a Store after a Store in the same Block -- a write after write.
 			 */
 
 			/*
@@ -1306,7 +1289,7 @@ static unsigned follow_Mem_chain_for_Store(ir_node *store, ir_node *curr) {
 				ir_node *predvalue = get_Store_value(pred);
 				ir_mode *predmode  = get_irn_mode(predvalue);
 
-				if(is_completely_overwritten(predmode, mode)
+				if (is_completely_overwritten(predmode, mode)
 				        || is_partially_same(predvalue, value)) {
 					DBG_OPT_WAW(pred, store);
 					exchange(pred_info->projs[pn_Store_M], get_Store_mem(pred));
@@ -1326,7 +1309,7 @@ static unsigned follow_Mem_chain_for_Store(ir_node *store, ir_node *curr) {
 			        && !info->projs[pn_Store_X_except]) {
 				ir_node *predvalue = get_Store_value(pred);
 
-				if(is_partially_same(value, predvalue)) {
+				if (is_partially_same(value, predvalue)) {
 					DBG_OPT_WAW(pred, store);
 					exchange(info->projs[pn_Store_M], mem);
 					kill_node(store);
@@ -1354,7 +1337,6 @@ static unsigned follow_Mem_chain_for_Store(ir_node *store, ir_node *curr) {
 		if (is_Store(pred)) {
 			/* check if we can pass through this store */
 			ir_alias_relation rel = get_alias_relation(
-				current_ir_graph,
 				get_Store_ptr(pred),
 				get_irn_mode(get_Store_value(pred)),
 				ptr, mode);
@@ -1364,7 +1346,7 @@ static unsigned follow_Mem_chain_for_Store(ir_node *store, ir_node *curr) {
 			pred = skip_Proj(get_Store_mem(pred));
 		} else if (is_Load(pred)) {
 			ir_alias_relation rel = get_alias_relation(
-				current_ir_graph, get_Load_ptr(pred), get_Load_mode(pred),
+				get_Load_ptr(pred), get_Load_mode(pred),
 				ptr, mode);
 			if (rel != ir_no_alias)
 				break;
@@ -1397,7 +1379,7 @@ static unsigned follow_Mem_chain_for_Store(ir_node *store, ir_node *curr) {
 /** find entity used as base for an address calculation */
 static ir_entity *find_entity(ir_node *ptr)
 {
-	switch(get_irn_opcode(ptr)) {
+	switch (get_irn_opcode(ptr)) {
 	case iro_SymConst:
 		return get_SymConst_entity(ptr);
 	case iro_Sel: {
@@ -1428,7 +1410,8 @@ static ir_entity *find_entity(ir_node *ptr)
  *
  * @param store  the Store node
  */
-static unsigned optimize_store(ir_node *store) {
+static unsigned optimize_store(ir_node *store)
+{
 	ir_node   *ptr;
 	ir_node   *mem;
 	ir_entity *entity;
@@ -1441,7 +1424,7 @@ static unsigned optimize_store(ir_node *store) {
 
 	/* a store to an entity which is never read is unnecessary */
 	if (entity != NULL && !(get_entity_usage(entity) & ir_usage_read)) {
-		ldst_info_t *info = get_irn_link(store);
+		ldst_info_t *info = (ldst_info_t*)get_irn_link(store);
 		if (info->projs[pn_Store_X_except] == NULL) {
 			DB((dbg, LEVEL_1, "  Killing useless %+F to never read entity %+F\n", store, entity));
 			exchange(info->projs[pn_Store_M], get_Store_mem(store));
@@ -1521,7 +1504,7 @@ static unsigned optimize_phi(ir_node *phi, walk_env_t *wenv)
 
 	/* check if the block is post dominated by Phi-block
 	   and has no exception exit */
-	bl_info = get_irn_link(block);
+	bl_info = (block_info_t*)get_irn_link(block);
 	if (bl_info->flags & BLOCK_HAS_EXC)
 		return 0;
 
@@ -1532,7 +1515,7 @@ static unsigned optimize_phi(ir_node *phi, walk_env_t *wenv)
 	/* this is the address of the store */
 	ptr  = get_Store_ptr(store);
 	mode = get_irn_mode(get_Store_value(store));
-	info = get_irn_link(store);
+	info = (ldst_info_t*)get_irn_link(store);
 	exc  = info->exc_block;
 
 	for (i = 1; i < n; ++i) {
@@ -1548,7 +1531,7 @@ static unsigned optimize_phi(ir_node *phi, walk_env_t *wenv)
 		if (ptr != get_Store_ptr(pred) || mode != get_irn_mode(get_Store_value(pred)))
 			return 0;
 
-		info = get_irn_link(pred);
+		info = (ldst_info_t*)get_irn_link(pred);
 
 		/* check, if all stores have the same exception flow */
 		if (exc != info->exc_block)
@@ -1563,7 +1546,7 @@ static unsigned optimize_phi(ir_node *phi, walk_env_t *wenv)
 		   and has no exception exit. Note that block must be different from
 		   Phi-block, else we would move a Store from end End of a block to its
 		   Start... */
-		bl_info = get_irn_link(block);
+		bl_info = (block_info_t*)get_irn_link(block);
 		if (bl_info->flags & BLOCK_HAS_EXC)
 			return 0;
 		if (block == phi_block || ! block_postdominates(phi_block, block))
@@ -1603,7 +1586,7 @@ static unsigned optimize_phi(ir_node *phi, walk_env_t *wenv)
 		assert(is_Proj(projMs[i]));
 
 		store = get_Proj_pred(projMs[i]);
-		info  = get_irn_link(store);
+		info  = (ldst_info_t*)get_irn_link(store);
 
 		inM[i] = get_Store_mem(store);
 		inD[i] = get_Store_value(store);
@@ -1612,16 +1595,16 @@ static unsigned optimize_phi(ir_node *phi, walk_env_t *wenv)
 	block = get_nodes_block(phi);
 
 	/* second step: create a new memory Phi */
-	phiM = new_rd_Phi(get_irn_dbg_info(phi), current_ir_graph, block, n, inM, mode_M);
+	phiM = new_rd_Phi(get_irn_dbg_info(phi), block, n, inM, mode_M);
 
 	/* third step: create a new data Phi */
-	phiD = new_rd_Phi(get_irn_dbg_info(phi), current_ir_graph, block, n, inD, mode);
+	phiD = new_rd_Phi(get_irn_dbg_info(phi), block, n, inD, mode);
 
 	/* rewire memory and kill the node */
 	for (i = n - 1; i >= 0; --i) {
 		ir_node *proj  = projMs[i];
 
-		if(is_Proj(proj)) {
+		if (is_Proj(proj)) {
 			ir_node *store = get_Proj_pred(proj);
 			exchange(proj, inM[i]);
 			kill_node(store);
@@ -1629,19 +1612,19 @@ static unsigned optimize_phi(ir_node *phi, walk_env_t *wenv)
 	}
 
 	/* fourth step: create the Store */
-	store = new_rd_Store(db, current_ir_graph, block, phiM, ptr, phiD, 0);
+	store = new_rd_Store(db, block, phiM, ptr, phiD, cons_none);
 #ifdef DO_CACHEOPT
 	co_set_irn_name(store, co_get_irn_ident(old_store));
 #endif
 
-	projM = new_rd_Proj(NULL, current_ir_graph, block, store, mode_M, pn_Store_M);
+	projM = new_rd_Proj(NULL, store, mode_M, pn_Store_M);
 
 	info = get_ldst_info(store, &wenv->obst);
 	info->projs[pn_Store_M] = projM;
 
 	/* fifths step: repair exception flow */
 	if (exc) {
-		ir_node *projX = new_rd_Proj(NULL, current_ir_graph, block, store, mode_X, pn_Store_X_except);
+		ir_node *projX = new_rd_Proj(NULL, store, mode_X, pn_Store_X_except);
 
 		info->projs[pn_Store_X_except] = projX;
 		info->exc_block                = exc;
@@ -1667,8 +1650,9 @@ static unsigned optimize_phi(ir_node *phi, walk_env_t *wenv)
 /**
  * walker, do the optimizations
  */
-static void do_load_store_optimize(ir_node *n, void *env) {
-	walk_env_t *wenv = env;
+static void do_load_store_optimize(ir_node *n, void *env)
+{
+	walk_env_t *wenv = (walk_env_t*)env;
 
 	switch (get_irn_opcode(n)) {
 
@@ -1691,7 +1675,7 @@ static void do_load_store_optimize(ir_node *n, void *env) {
 
 /** A scc. */
 typedef struct scc {
-	ir_node *head;		/**< the head of the list */
+	ir_node *head;      /**< the head of the list */
 } scc;
 
 /** A node entry. */
@@ -1708,7 +1692,7 @@ typedef struct node_entry {
 typedef struct loop_env {
 	ir_phase ph;           /**< the phase object */
 	ir_node  **stack;      /**< the node stack */
-	int      tos;          /**< tos index */
+	size_t   tos;          /**< tos index */
 	unsigned nextDFSnum;   /**< the current DFS number */
 	unsigned POnum;        /**< current post order number */
 
@@ -1718,12 +1702,13 @@ typedef struct loop_env {
 /**
 * Gets the node_entry of a node
 */
-static node_entry *get_irn_ne(ir_node *irn, loop_env *env) {
+static node_entry *get_irn_ne(ir_node *irn, loop_env *env)
+{
 	ir_phase   *ph = &env->ph;
-	node_entry *e  = phase_get_irn_data(&env->ph, irn);
+	node_entry *e  = (node_entry*)phase_get_irn_data(&env->ph, irn);
 
 	if (! e) {
-		e = phase_alloc(ph, sizeof(*e));
+		e = (node_entry*)phase_alloc(ph, sizeof(*e));
 		memset(e, 0, sizeof(*e));
 		phase_set_irn_data(ph, irn, e);
 	}
@@ -1736,11 +1721,12 @@ static node_entry *get_irn_ne(ir_node *irn, loop_env *env) {
  * @param env   the loop environment
  * @param n     the node to push
  */
-static void push(loop_env *env, ir_node *n) {
+static void push(loop_env *env, ir_node *n)
+{
 	node_entry *e;
 
 	if (env->tos == ARR_LEN(env->stack)) {
-		int nlen = ARR_LEN(env->stack) * 2;
+		size_t nlen = ARR_LEN(env->stack) * 2;
 		ARR_RESIZE(ir_node *, env->stack, nlen);
 	}
 	env->stack[env->tos++] = n;
@@ -1755,7 +1741,8 @@ static void push(loop_env *env, ir_node *n) {
  *
  * @return  The topmost node
  */
-static ir_node *pop(loop_env *env) {
+static ir_node *pop(loop_env *env)
+{
 	ir_node *n = env->stack[--env->tos];
 	node_entry *e = get_irn_ne(n, env);
 
@@ -1770,7 +1757,8 @@ static ir_node *pop(loop_env *env) {
  * @param irn           the node to check
  * @param header_block  the header block of the induction variable
  */
-static int is_rc(ir_node *irn, ir_node *header_block) {
+static int is_rc(ir_node *irn, ir_node *header_block)
+{
 	ir_node *block = get_nodes_block(irn);
 
 	return (block != header_block) && block_dominates(block, header_block);
@@ -1796,19 +1784,20 @@ typedef struct avail_entry_t {
 /**
  * Compare two avail entries.
  */
-static int cmp_avail_entry(const void *elt, const void *key, size_t size) {
+static int cmp_avail_entry(const void *elt, const void *key, size_t size)
+{
+	const avail_entry_t *a = (const avail_entry_t*)elt;
+	const avail_entry_t *b = (const avail_entry_t*)key;
 	(void) size;
 
-	const avail_entry_t *a = elt;
-	const avail_entry_t *b = key;
-
 	return a->ptr != b->ptr || a->mode != b->mode;
 }  /* cmp_avail_entry */
 
 /**
  * Calculate the hash value of an avail entry.
  */
-static unsigned hash_cache_entry(const avail_entry_t *entry) {
+static unsigned hash_cache_entry(const avail_entry_t *entry)
+{
 	return get_irn_idx(entry->ptr) * 9 + HASH_PTR(entry->mode);
 }  /* hash_cache_entry */
 
@@ -1818,7 +1807,8 @@ static unsigned hash_cache_entry(const avail_entry_t *entry) {
  * @param pscc   the loop described by an SCC
  * @param env    the loop environment
  */
-static void move_loads_out_of_loops(scc *pscc, loop_env *env) {
+static void move_loads_out_of_loops(scc *pscc, loop_env *env)
+{
 	ir_node   *phi, *load, *next, *other, *next_other;
 	ir_entity *ent;
 	int       j;
@@ -1844,7 +1834,7 @@ static void move_loads_out_of_loops(scc *pscc, loop_env *env) {
 
 			if (pe->pscc != ne->pscc) {
 				/* not in the same SCC, is region const */
-				phi_entry *pe = phase_alloc(&env->ph, sizeof(*pe));
+				phi_entry *pe = (phi_entry*)phase_alloc(&env->ph, sizeof(*pe));
 
 				pe->phi  = phi;
 				pe->pos  = j;
@@ -1866,7 +1856,7 @@ static void move_loads_out_of_loops(scc *pscc, loop_env *env) {
 		next = ne->next;
 
 		if (is_Load(load)) {
-			ldst_info_t *info = get_irn_link(load);
+			ldst_info_t *info = (ldst_info_t*)get_irn_link(load);
 			ir_node     *ptr = get_Load_ptr(load);
 
 			/* for now, we cannot handle Loads with exceptions */
@@ -1884,7 +1874,6 @@ static void move_loads_out_of_loops(scc *pscc, loop_env *env) {
 
 				if (is_Store(other)) {
 					ir_alias_relation rel = get_alias_relation(
-						current_ir_graph,
 						get_Store_ptr(other),
 						get_irn_mode(get_Store_value(other)),
 						ptr, load_mode);
@@ -1895,7 +1884,7 @@ static void move_loads_out_of_loops(scc *pscc, loop_env *env) {
 				/* only Phis and pure Calls are allowed here, so ignore them */
 			}
 			if (other == NULL) {
-				ldst_info_t *ninfo;
+				ldst_info_t *ninfo = NULL;
 				phi_entry   *pe;
 				dbg_info    *db;
 
@@ -1913,11 +1902,11 @@ static void move_loads_out_of_loops(scc *pscc, loop_env *env) {
 
 					entry.ptr  = ptr;
 					entry.mode = load_mode;
-					res = set_find(avail, &entry, sizeof(entry), hash_cache_entry(&entry));
+					res = (avail_entry_t*)set_find(avail, &entry, sizeof(entry), hash_cache_entry(&entry));
 					if (res != NULL) {
 						irn = res->load;
 					} else {
-						irn = new_rd_Load(db, current_ir_graph, pred, get_Phi_pred(phi, pos), ptr, load_mode, 0);
+						irn = new_rd_Load(db, pred, get_Phi_pred(phi, pos), ptr, load_mode, cons_none);
 						entry.load = irn;
 						set_insert(avail, &entry, sizeof(entry), hash_cache_entry(&entry));
 						DB((dbg, LEVEL_1, "  Created %+F in %+F\n", irn, pred));
@@ -1925,10 +1914,10 @@ static void move_loads_out_of_loops(scc *pscc, loop_env *env) {
 					pe->load = irn;
 					ninfo = get_ldst_info(irn, phase_obst(&env->ph));
 
-					ninfo->projs[pn_Load_M] = mem = new_r_Proj(current_ir_graph, pred, irn, mode_M, pn_Load_M);
+					ninfo->projs[pn_Load_M] = mem = new_r_Proj(irn, mode_M, pn_Load_M);
 					set_Phi_pred(phi, pos, mem);
 
-					ninfo->projs[pn_Load_res] = new_r_Proj(current_ir_graph, pred, irn, load_mode, pn_Load_res);
+					ninfo->projs[pn_Load_res] = new_r_Proj(irn, load_mode, pn_Load_res);
 				}
 
 				/* now kill the old Load */
@@ -1948,7 +1937,8 @@ static void move_loads_out_of_loops(scc *pscc, loop_env *env) {
  * @param pscc  the SCC
  * @param env   the loop environment
  */
-static void process_loop(scc *pscc, loop_env *env) {
+static void process_loop(scc *pscc, loop_env *env)
+{
 	ir_node *irn, *next, *header = NULL;
 	node_entry *b, *h = NULL;
 	int j, only_phi, num_outside, process = 0;
@@ -2073,7 +2063,8 @@ fail:
  * @param pscc  the SCC
  * @param env   the loop environment
  */
-static void process_scc(scc *pscc, loop_env *env) {
+static void process_scc(scc *pscc, loop_env *env)
+{
 	ir_node *head = pscc->head;
 	node_entry *e = get_irn_ne(head, env);
 
@@ -2156,7 +2147,7 @@ static void dfs(ir_node *irn, loop_env *env)
 	}
 
 	if (node->low == node->DFSnum) {
-		scc *pscc = phase_alloc(&env->ph, sizeof(*pscc));
+		scc *pscc = (scc*)phase_alloc(&env->ph, sizeof(*pscc));
 		ir_node *x;
 
 		pscc->head = NULL;
@@ -2180,12 +2171,11 @@ static void dfs(ir_node *irn, loop_env *env)
  * @param irg  the graph to process
  * @param env  the loop environment
  */
-static void do_dfs(ir_graph *irg, loop_env *env) {
-	ir_graph *rem = current_ir_graph;
+static void do_dfs(ir_graph *irg, loop_env *env)
+{
 	ir_node  *endblk, *end;
 	int      i;
 
-	current_ir_graph = irg;
 	inc_irg_visited(irg);
 
 	/* visit all memory nodes */
@@ -2213,25 +2203,15 @@ static void do_dfs(ir_graph *irg, loop_env *env) {
 		if (is_Phi(ka) && !irn_visited(ka))
 			dfs(ka, env);
 	}
-	current_ir_graph = rem;
 }  /* do_dfs */
 
-/**
- * Initialize new phase data. We do this always explicit, so return NULL here
- */
-static void *init_loop_data(ir_phase *ph, const ir_node *irn, void *data) {
-	(void)ph;
-	(void)irn;
-	(void)data;
-	return NULL;
-}  /* init_loop_data */
-
 /**
  * Optimize Loads/Stores in loops.
  *
  * @param irg  the graph
  */
-static int optimize_loops(ir_graph *irg) {
+static int optimize_loops(ir_graph *irg)
+{
 	loop_env env;
 
 	env.stack         = NEW_ARR_F(ir_node *, 128);
@@ -2239,13 +2219,13 @@ static int optimize_loops(ir_graph *irg) {
 	env.nextDFSnum    = 0;
 	env.POnum         = 0;
 	env.changes       = 0;
-	phase_init(&env.ph, "ldstopt", irg, PHASE_DEFAULT_GROWTH, init_loop_data, NULL);
+	phase_init(&env.ph, irg, phase_irn_init_default);
 
 	/* calculate the SCC's and drive loop optimization. */
 	do_dfs(irg, &env);
 
 	DEL_ARR_F(env.stack);
-	phase_free(&env.ph);
+	phase_deinit(&env.ph);
 
 	return env.changes;
 }  /* optimize_loops */
@@ -2253,7 +2233,8 @@ static int optimize_loops(ir_graph *irg) {
 /*
  * do the load store optimization
  */
-int optimize_load_store(ir_graph *irg) {
+int optimize_load_store(ir_graph *irg)
+{
 	walk_env_t env;
 
 	FIRM_DBG_REGISTER(dbg, "firm.opt.ldstopt");
@@ -2302,3 +2283,8 @@ int optimize_load_store(ir_graph *irg) {
 	}
 	return env.changes != 0;
 }  /* optimize_load_store */
+
+ir_graph_pass_t *optimize_load_store_pass(const char *name)
+{
+	return def_graph_pass_ret(name ? name : "ldst", optimize_load_store);
+}  /* optimize_load_store_pass */