It does not make any sense to remove AM, which loads a non-GP value to fix register...

[libfirm] / ir / opt / ldstopt.c

diff --git a/ir/opt/ldstopt.c b/ir/opt/ldstopt.c
index 21631fb..d43a0b5 100644 (file)
--- a/ir/opt/ldstopt.c
+++ b/ir/opt/ldstopt.c
@@ -855,29 +855,32 @@ static int try_load_after_store(ir_node *load,
        store_mode     = get_irn_mode(get_Store_value(store));
        store_mode_len = get_mode_size_bytes(store_mode);
        delta          = load_offset - store_offset;
-       if (delta < 0 || delta + load_mode_len > store_mode_len)
-               return 0;
+       store_value    = get_Store_value(store);
 
-       if (get_mode_arithmetic(store_mode) != irma_twos_complement ||
-           get_mode_arithmetic(load_mode)  != irma_twos_complement)
-               return 0;
+       if (delta != 0 || store_mode != load_mode) {
+               if (delta < 0 || delta + load_mode_len > store_mode_len)
+                       return 0;
+
+               if (get_mode_arithmetic(store_mode) != irma_twos_complement ||
+                       get_mode_arithmetic(load_mode)  != irma_twos_complement)
+                       return 0;
 
-       store_value = get_Store_value(store);
 
-       /* produce a shift to adjust offset delta */
-       if (delta > 0) {
-               ir_node *cnst;
+               /* produce a shift to adjust offset delta */
+               if (delta > 0) {
+                       ir_node *cnst;
 
-               /* 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, cnst, store_mode);
-       }
+                       /* 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, 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);
+               /* 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);
+               }
        }
 
        DBG_OPT_RAW(load, store_value);
@@ -2080,7 +2083,7 @@ static void dfs(ir_node *irn, loop_env *env)
                        ir_node *pred = get_irn_n(irn, i);
                        node_entry *o = get_irn_ne(pred, env);
 
-                       if (irn_not_visited(pred)) {
+                       if (!irn_visited(pred)) {
                                dfs(pred, env);
                                node->low = MIN(node->low, o->low);
                        }
@@ -2091,7 +2094,7 @@ static void dfs(ir_node *irn, loop_env *env)
                ir_node *pred = get_fragile_op_mem(irn);
                node_entry *o = get_irn_ne(pred, env);
 
-               if (irn_not_visited(pred)) {
+               if (!irn_visited(pred)) {
                        dfs(pred, env);
                        node->low = MIN(node->low, o->low);
                }
@@ -2101,7 +2104,7 @@ static void dfs(ir_node *irn, loop_env *env)
                ir_node *pred = get_Proj_pred(irn);
                node_entry *o = get_irn_ne(pred, env);
 
-               if (irn_not_visited(pred)) {
+               if (!irn_visited(pred)) {
                        dfs(pred, env);
                        node->low = MIN(node->low, o->low);
                }
@@ -2167,7 +2170,7 @@ static void do_dfs(ir_graph *irg, loop_env *env) {
        for (i = get_End_n_keepalives(end) - 1; i >= 0; --i) {
                ir_node *ka = get_End_keepalive(end, i);
 
-               if (is_Phi(ka) && irn_not_visited(ka))
+               if (is_Phi(ka) && !irn_visited(ka))
                        dfs(ka, env);
        }
        current_ir_graph = rem;