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

diff --git a/ir/opt/ldstopt.c b/ir/opt/ldstopt.c
index bb52a9131..dd0231e2d 100644
--- a/ir/opt/ldstopt.c
+++ b/ir/opt/ldstopt.c
@@ -43,7 +43,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"
@@ -113,8 +113,7 @@ static ldst_info_t *get_ldst_info(ir_node *node, struct obstack *obst) {
 	ldst_info_t *info = 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;
@@ -127,8 +126,7 @@ static block_info_t *get_block_info(ir_node *node, struct obstack *obst) {
 	block_info_t *info = 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;
@@ -705,7 +703,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);
 	}
@@ -871,14 +869,13 @@ static int try_load_after_store(ir_node *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),
+			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);
 		}
 	}
 
@@ -895,7 +892,7 @@ static int try_load_after_store(ir_node *load,
 		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;
 	}
 
@@ -972,13 +969,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(get_nodes_block(pred), 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);
@@ -993,7 +990,7 @@ static unsigned follow_Mem_chain(ir_node *load, ir_node *curr) {
 					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;
 				}
 
@@ -1068,7 +1065,7 @@ ir_node *can_replace_load_by_const(const ir_node *load, ir_node *c) {
 
 			/* 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(dbg, block, res, l_mode);
 		}
 	} else {
 		/* copy the value from the const code irg */
@@ -1119,7 +1116,7 @@ static unsigned optimize_load(ir_node *load)
 			 */
 			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)));
+			exchange(info->projs[pn_Load_X_regular], new_r_Jmp(get_nodes_block(load)));
 			info->projs[pn_Load_X_regular] = NULL;
 			res |= CF_CHANGED;
 		}
@@ -1134,7 +1131,7 @@ static unsigned optimize_load(ir_node *load)
 
 		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);
@@ -1162,7 +1159,7 @@ static unsigned optimize_load(ir_node *load)
 				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;
 			}
@@ -1202,7 +1199,7 @@ static unsigned optimize_load(ir_node *load)
 			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;
 		}
@@ -1612,10 +1609,10 @@ 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) {
@@ -1629,19 +1626,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, 0);
 #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, block, 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, block, store, mode_X, pn_Store_X_except);
 
 		info->projs[pn_Store_X_except] = projX;
 		info->exc_block                = exc;
@@ -1797,10 +1794,9 @@ typedef struct avail_entry_t {
  * Compare two avail entries.
  */
 static int cmp_avail_entry(const void *elt, const void *key, size_t size) {
-	(void) size;
-
 	const avail_entry_t *a = elt;
 	const avail_entry_t *b = key;
+	(void) size;
 
 	return a->ptr != b->ptr || a->mode != b->mode;
 }  /* cmp_avail_entry */
@@ -1917,7 +1913,7 @@ static void move_loads_out_of_loops(scc *pscc, loop_env *env) {
 					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, 0);
 						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 +1921,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(pred, 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(pred, irn, load_mode, pn_Load_res);
 				}
 
 				/* now kill the old Load */
@@ -2302,3 +2298,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 */