X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Fldstopt.c;h=0416d5ac6ac03a98e140a40bdd92e9ca7953662e;hb=762b472fc81c73cf7a1b0041b8cd286b7206d79d;hp=fe175a9ce400bd3496124b19fb87013e3f7f8b9c;hpb=99253d30b9d32d58de6411b583dce72ede4261fd;p=libfirm

diff --git a/ir/opt/ldstopt.c b/ir/opt/ldstopt.c
index fe175a9ce..0416d5ac6 100644
--- a/ir/opt/ldstopt.c
+++ b/ir/opt/ldstopt.c
@@ -74,7 +74,7 @@ typedef struct walk_env_t {
 
 /** A Load/Store info. */
 typedef struct ldst_info_t {
-	ir_node  *projs[MAX_PROJ];    /**< list of Proj's of this node */
+	ir_node  *projs[MAX_PROJ+1];  /**< 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 */
 	unsigned visited;             /**< visited counter for breaking loops */
@@ -215,7 +215,7 @@ static void collect_nodes(ir_node *node, void *env)
 
 			if (is_Proj(proj)) {
 				pred   = get_Proj_pred(proj);
-				is_exc = get_Proj_proj(proj) == pn_Generic_X_except;
+				is_exc = is_x_except_Proj(proj);
 			}
 
 			/* ignore Bad predecessors, they will be removed later */
@@ -709,8 +709,7 @@ static void handle_load_update(ir_node *load)
 		ir_node *mem = get_Load_mem(load);
 
 		/* a Load whose value is neither used nor exception checked, remove it */
-		if (info->projs[pn_Load_M])
-			exchange(info->projs[pn_Load_M], mem);
+		exchange(info->projs[pn_Load_M], mem);
 		if (info->projs[pn_Load_X_regular])
 			exchange(info->projs[pn_Load_X_regular], new_r_Jmp(get_nodes_block(load)));
 		kill_node(load);
@@ -914,7 +913,7 @@ static int try_load_after_store(ir_node *load,
 	/* no exception */
 	if (info->projs[pn_Load_X_except]) {
 		ir_graph *irg = get_irn_irg(load);
-		exchange( info->projs[pn_Load_X_except], new_r_Bad(irg));
+		exchange( info->projs[pn_Load_X_except], new_r_Bad(irg, mode_X));
 		res |= CF_CHANGED;
 	}
 	if (info->projs[pn_Load_X_regular]) {
@@ -1020,7 +1019,7 @@ static unsigned follow_Mem_chain(ir_node *load, ir_node *curr)
 				/* no exception */
 				if (info->projs[pn_Load_X_except]) {
 					ir_graph *irg = get_irn_irg(load);
-					exchange(info->projs[pn_Load_X_except], new_r_Bad(irg));
+					exchange(info->projs[pn_Load_X_except], new_r_Bad(irg, mode_X));
 					res |= CF_CHANGED;
 				}
 				if (info->projs[pn_Load_X_regular]) {
@@ -1097,8 +1096,9 @@ ir_node *can_replace_load_by_const(const ir_node *load, ir_node *c)
 		if (is_reinterpret_cast(c_mode, l_mode)) {
 			/* copy the value from the const code irg and cast it */
 			res = new_rd_Conv(dbgi, block, res, l_mode);
+		} else {
+			return NULL;
 		}
-		return NULL;
 	}
 	return res;
 }
@@ -1157,7 +1157,7 @@ static unsigned optimize_load(ir_node *load)
 			/* no exception, clear the info field as it might be checked later again */
 			if (info->projs[pn_Load_X_except]) {
 				ir_graph *irg = get_irn_irg(load);
-				exchange(info->projs[pn_Load_X_except], new_r_Bad(irg));
+				exchange(info->projs[pn_Load_X_except], new_r_Bad(irg, mode_X));
 				info->projs[pn_Load_X_except] = NULL;
 				res |= CF_CHANGED;
 			}
@@ -1168,7 +1168,7 @@ static unsigned optimize_load(ir_node *load)
 			}
 
 			if (get_entity_linkage(ent) & IR_LINKAGE_CONSTANT) {
-				if (ent->initializer != NULL) {
+				if (has_entity_initializer(ent)) {
 					/* new style initializer */
 					value = find_compound_ent_value(ptr);
 				} else if (entity_has_compound_ent_values(ent)) {
@@ -1192,7 +1192,7 @@ static unsigned optimize_load(ir_node *load)
 		/* we completely replace the load by this value */
 		if (info->projs[pn_Load_X_except]) {
 			ir_graph *irg = get_irn_irg(load);
-			exchange(info->projs[pn_Load_X_except], new_r_Bad(irg));
+			exchange(info->projs[pn_Load_X_except], new_r_Bad(irg, mode_X));
 			info->projs[pn_Load_X_except] = NULL;
 			res |= CF_CHANGED;
 		}
@@ -1481,7 +1481,10 @@ static unsigned optimize_store(ir_node *store)
 static unsigned optimize_phi(ir_node *phi, walk_env_t *wenv)
 {
 	int i, n;
-	ir_node *store, *old_store, *ptr, *block, *phi_block, *phiM, *phiD, *exc, *projM;
+	ir_node *store, *ptr, *block, *phi_block, *phiM, *phiD, *exc, *projM;
+#ifdef DO_CACHEOPT
+	ir_node *old_store;
+#endif
 	ir_mode *mode;
 	ir_node **inM, **inD, **projMs;
 	int *idx;
@@ -1504,16 +1507,14 @@ static unsigned optimize_phi(ir_node *phi, walk_env_t *wenv)
 		return 0;
 
 	store = skip_Proj(projM);
+#ifdef DO_CACHEOPT
 	old_store = store;
+#endif
 	if (!is_Store(store))
 		return 0;
 
 	block = get_nodes_block(store);
 
-	/* abort on dead blocks */
-	if (is_Block_dead(block))
-		return 0;
-
 	/* check if the block is post dominated by Phi-block
 	   and has no exception exit */
 	bl_info = (block_info_t*)get_irn_link(block);
@@ -1549,10 +1550,7 @@ static unsigned optimize_phi(ir_node *phi, walk_env_t *wenv)
 		if (exc != info->exc_block)
 			return 0;
 
-		/* abort on dead blocks */
 		block = get_nodes_block(pred);
-		if (is_Block_dead(block))
-			return 0;
 
 		/* check if the block is post dominated by Phi-block
 		   and has no exception exit. Note that block must be different from
@@ -1681,7 +1679,7 @@ static void do_load_store_optimize(ir_node *n, void *env)
 		break;
 
 	default:
-		;
+		break;
 	}
 }  /* do_load_store_optimize */
 
@@ -1822,7 +1820,6 @@ static unsigned hash_cache_entry(const avail_entry_t *entry)
 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;
 	phi_entry *phi_list = NULL;
 	set       *avail;
@@ -1878,7 +1875,6 @@ static void move_loads_out_of_loops(scc *pscc, loop_env *env)
 			/* for now, we can only move Load(Global) */
 			if (! is_Global(ptr))
 				continue;
-			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);
@@ -1927,7 +1923,12 @@ static void move_loads_out_of_loops(scc *pscc, loop_env *env)
 					ninfo = get_ldst_info(irn, phase_obst(&env->ph));
 
 					ninfo->projs[pn_Load_M] = mem = new_r_Proj(irn, mode_M, pn_Load_M);
-					set_Phi_pred(phi, pos, mem);
+					if (res == NULL) {
+						/* irn is from cache, so do not set phi pred again.
+						 * There might be other Loads between phi and irn already.
+						 */
+						set_Phi_pred(phi, pos, mem);
+					}
 
 					ninfo->projs[pn_Load_res] = new_r_Proj(irn, load_mode, pn_Load_res);
 				}
@@ -2196,15 +2197,15 @@ static void do_dfs(ir_graph *irg, loop_env *env)
 		ir_node *pred = get_Block_cfgpred(endblk, i);
 
 		pred = skip_Proj(pred);
-		if (is_Return(pred))
+		if (is_Return(pred)) {
 			dfs(get_Return_mem(pred), env);
-		else if (is_Raise(pred))
+		} else if (is_Raise(pred)) {
 			dfs(get_Raise_mem(pred), env);
-		else if (is_fragile_op(pred))
+		} else if (is_fragile_op(pred)) {
 			dfs(get_fragile_op_mem(pred), env);
-		else if (is_Bad(pred))
-			/* ignore non-optimized block predecessor */;
-		else {
+		} else if (is_Bad(pred)) {
+			/* ignore non-optimized block predecessor */
+		} else {
 			assert(0 && "Unknown EndBlock predecessor");
 		}
 	}
@@ -2286,8 +2287,8 @@ int optimize_load_store(ir_graph *irg)
 
 	/* Handle graph state */
 	if (env.changes) {
-		set_irg_outs_inconsistent(irg);
 		set_irg_entity_usage_state(irg, ir_entity_usage_not_computed);
+		edges_deactivate(irg);
 	}
 
 	if (env.changes & CF_CHANGED) {