X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Fldstopt.c;h=6d42668a8efa9e61619760e1413ecb2834a535eb;hb=f600524c363556c785b85c0dff8792d04f73e252;hp=7769e6e2850f4e072774e72326b36e06710f0a0e;hpb=e153c0201ad4b75fa63cacd746cf6295bde5cbdc;p=libfirm

diff --git a/ir/opt/ldstopt.c b/ir/opt/ldstopt.c
index 7769e6e28..6d42668a8 100644
--- a/ir/opt/ldstopt.c
+++ b/ir/opt/ldstopt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -391,7 +391,7 @@ static void handle_load_update(ir_node *load) {
 		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(load, new_Bad());
+		kill_node(load);
 		reduce_adr_usage(ptr);
 	}
 }  /* handle_load_update */
@@ -446,8 +446,8 @@ static unsigned is_Call_pure(ir_node *call) {
 		/* try the called entity */
 		ir_node *ptr = get_Call_ptr(call);
 
-		if (is_SymConst_addr_ent(ptr)) {
-			ir_entity *ent = get_SymConst_entity(ptr);
+		if (is_Global(ptr)) {
+			ir_entity *ent = get_Global_entity(ptr);
 
 			prop = get_entity_additional_properties(ent);
 		}
@@ -523,7 +523,7 @@ static unsigned follow_Mem_chain(ir_node *load, ir_node *curr) {
 				if (info->projs[pn_Load_res])
 					exchange(info->projs[pn_Load_res], value);
 
-				exchange(load, new_Bad());
+				kill_node(load);
 				reduce_adr_usage(ptr);
 				return res | DF_CHANGED;
 			}
@@ -572,7 +572,7 @@ static unsigned follow_Mem_chain(ir_node *load, ir_node *curr) {
 					res |= CF_CHANGED;
 				}
 
-				exchange(load, new_Bad());
+				kill_node(load);
 				reduce_adr_usage(ptr);
 				return res |= DF_CHANGED;
 			}
@@ -700,7 +700,7 @@ static unsigned optimize_load(ir_node *load)
 			exchange(info->projs[pn_Load_X_regular], new_r_Jmp(current_ir_graph, get_nodes_block(load)));
 			res |= CF_CHANGED;
 		}
-		exchange(load, new_Bad());
+		kill_node(load);
 		reduce_adr_usage(ptr);
 		return res | DF_CHANGED;
 	}
@@ -726,7 +726,7 @@ static unsigned optimize_load(ir_node *load)
 		if (info->projs[pn_Load_res])
 			exchange(info->projs[pn_Load_res], new_node);
 
-		exchange(load, new_Bad());
+		kill_node(load);
 		reduce_adr_usage(ptr);
 		return res | DF_CHANGED;
 	}
@@ -776,7 +776,7 @@ static unsigned optimize_load(ir_node *load)
 							res |= DF_CHANGED;
 						}
 					}
-					exchange(load, new_Bad());
+					kill_node(load);
 					reduce_adr_usage(ptr);
 					return res;
 				} else {
@@ -812,7 +812,7 @@ static unsigned optimize_load(ir_node *load)
 							exchange(info->projs[pn_Load_res], copy_const_value(get_irn_dbg_info(load), c));
 							res |= DF_CHANGED;
 						}
-						exchange(load, new_Bad());
+						kill_node(load);
 						reduce_adr_usage(ptr);
 						return res;
 					} else {
@@ -895,20 +895,22 @@ static unsigned follow_Mem_chain_for_Store(ir_node *store, ir_node *curr) {
 			if (get_Store_volatility(pred) != volatility_is_volatile && !pred_info->projs[pn_Store_X_except]) {
 				DBG_OPT_WAW(pred, store);
 				exchange(pred_info->projs[pn_Store_M], get_Store_mem(pred));
-				exchange(pred, new_Bad());
+				kill_node(pred);
 				reduce_adr_usage(ptr);
 				return DF_CHANGED;
 			}
 		} else if (is_Load(pred) && get_Load_ptr(pred) == ptr &&
 		           value == pred_info->projs[pn_Load_res]) {
 			/*
-			 * a Store of a value after a Load -- a write after read.
-			 * We may remove the second Store, if it does not have an exception handler.
+			 * a Store of a value just loaded from the same address
+			 * -- a write after read.
+			 * We may remove the Store, if it does not have an exception
+			 * handler.
 			 */
 			if (! info->projs[pn_Store_X_except]) {
 				DBG_OPT_WAR(store, pred);
 				exchange(info->projs[pn_Store_M], mem);
-				exchange(store, new_Bad());
+				kill_node(store);
 				reduce_adr_usage(ptr);
 				return DF_CHANGED;
 			}
@@ -926,6 +928,12 @@ static unsigned follow_Mem_chain_for_Store(ir_node *store, ir_node *curr) {
 				break;
 			pred = skip_Proj(get_Store_mem(pred));
 		} else if (get_irn_op(pred) == op_Load) {
+			ir_alias_relation rel = get_alias_relation(
+				current_ir_graph, get_Load_ptr(pred), get_Load_mode(pred),
+				ptr, mode);
+			if (rel != no_alias)
+				break;
+
 			pred = skip_Proj(get_Load_mem(pred));
 		} else {
 			/* follow only Load chains */
@@ -1351,10 +1359,10 @@ static void move_loads_out_of_loops(scc *pscc, loop_env *env) {
 			if (info->projs[pn_Load_res] == NULL || info->projs[pn_Load_X_regular] != NULL || info->projs[pn_Load_X_except] != NULL)
 				continue;
 
-			/* for now, we can only handle Load(SymConst) */
-			if (! is_SymConst_addr_ent(ptr))
+			/* for now, we can only handle Load(Global) */
+			if (! is_Global(ptr))
 				continue;
-			ent = get_SymConst_entity(ptr);
+			ent = get_Global_entity(ptr);
 			load_mode = get_Load_mode(load);
 			for (other = pscc->head; other != NULL; other = next_other) {
 				node_entry *ne = get_irn_ne(other, env);