- implemented ia32_ClimbFrame() pseudo-instruction

[libfirm] / ir / opt / ldstopt.c

diff --git a/ir/opt/ldstopt.c b/ir/opt/ldstopt.c
index 21631fb..ce87077 100644 (file)
--- a/ir/opt/ldstopt.c
+++ b/ir/opt/ldstopt.c
@@ -23,9 +23,7 @@
  * @author  Michael Beck
  * @version $Id$
  */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include <string.h>
 
@@ -855,29 +853,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;
 
-       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;
 
-       /* 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);
-       }
+               /* 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);
+               }
 
-       /* 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);
@@ -1626,7 +1627,7 @@ 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);
+       store = new_rd_Store(db, current_ir_graph, block, phiM, ptr, phiD, 0);
 #ifdef DO_CACHEOPT
        co_set_irn_name(store, co_get_irn_ident(old_store));
 #endif
@@ -1877,7 +1878,7 @@ static void move_loads_out_of_loops(scc *pscc, loop_env *env) {
                                        ir_node *pred = get_Block_cfgpred_block(blk, pos);
                                        ir_node *irn, *mem;
 
-                                       pe->load = irn = new_rd_Load(db, current_ir_graph, pred, get_Phi_pred(phi, pos), ptr, load_mode);
+                                       pe->load = irn = new_rd_Load(db, current_ir_graph, pred, get_Phi_pred(phi, pos), ptr, load_mode, 0);
                                        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);
@@ -2080,7 +2081,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 +2092,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 +2102,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 +2168,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;
@@ -2257,5 +2258,5 @@ int optimize_load_store(ir_graph *irg) {
                have Bad() predecessors. */
                set_irg_doms_inconsistent(irg);
        }
-       return (int) env.changes;
+       return env.changes != 0;
 }  /* optimize_load_store */