Reverted r27368, needed for propagation of changed nodes ...
[libfirm] / ir / opt / ldstopt.c
index dd0231e..8e703d1 100644 (file)
@@ -109,7 +109,8 @@ static unsigned master_visited = 0;
 /**
  * get the Load/Store info of a node
  */
-static ldst_info_t *get_ldst_info(ir_node *node, struct obstack *obst) {
+static ldst_info_t *get_ldst_info(ir_node *node, struct obstack *obst)
+{
        ldst_info_t *info = get_irn_link(node);
 
        if (! info) {
@@ -122,7 +123,8 @@ static ldst_info_t *get_ldst_info(ir_node *node, struct obstack *obst) {
 /**
  * get the Block info of a node
  */
-static block_info_t *get_block_info(ir_node *node, struct obstack *obst) {
+static block_info_t *get_block_info(ir_node *node, struct obstack *obst)
+{
        block_info_t *info = get_irn_link(node);
 
        if (! info) {
@@ -295,7 +297,7 @@ static ir_entity *find_constant_entity(ir_node *ptr)
                                }
                        }
 
-                       if (variability_constant == get_entity_variability(ent))
+                       if (get_entity_linkage(ent) & IR_LINKAGE_CONSTANT)
                                return ent;
 
                        /* try next */
@@ -333,7 +335,8 @@ static ir_entity *find_constant_entity(ir_node *ptr)
 /**
  * Return the Selection index of a Sel node from dimension n
  */
-static long get_Sel_array_index_long(ir_node *n, int dim) {
+static long get_Sel_array_index_long(ir_node *n, int dim)
+{
        ir_node *index = get_Sel_index(n, dim);
        assert(is_Const(index));
        return get_tarval_long(get_Const_tarval(index));
@@ -347,7 +350,8 @@ static long get_Sel_array_index_long(ir_node *n, int dim) {
  * @param depth  current depth in steps upward from the root
  *               of the address
  */
-static compound_graph_path *rec_get_accessed_path(ir_node *ptr, int depth) {
+static compound_graph_path *rec_get_accessed_path(ir_node *ptr, int depth)
+{
        compound_graph_path *res = NULL;
        ir_entity           *root, *field, *ent;
        int                 path_len, pos, idx;
@@ -494,7 +498,8 @@ ptr_arith:
  * Returns an access path or NULL.  The access path is only
  * valid, if the graph is in phase_high and _no_ address computation is used.
  */
-static compound_graph_path *get_accessed_path(ir_node *ptr) {
+static compound_graph_path *get_accessed_path(ir_node *ptr)
+{
        compound_graph_path *gr = rec_get_accessed_path(ptr, 0);
        return gr;
 }  /* get_accessed_path */
@@ -505,7 +510,8 @@ typedef struct path_entry {
        long              index;
 } path_entry;
 
-static ir_node *rec_find_compound_ent_value(ir_node *ptr, path_entry *next) {
+static ir_node *rec_find_compound_ent_value(ir_node *ptr, path_entry *next)
+{
        path_entry       entry, *p;
        ir_entity        *ent, *field;
        ir_initializer_t *initializer;
@@ -679,7 +685,8 @@ ptr_arith:
        return NULL;
 }
 
-static ir_node *find_compound_ent_value(ir_node *ptr) {
+static ir_node *find_compound_ent_value(ir_node *ptr)
+{
        return rec_find_compound_ent_value(ptr, NULL);
 }
 
@@ -689,7 +696,8 @@ static void reduce_adr_usage(ir_node *ptr);
 /**
  * Update a Load that may have lost its users.
  */
-static void handle_load_update(ir_node *load) {
+static void handle_load_update(ir_node *load)
+{
        ldst_info_t *info = get_irn_link(load);
 
        /* do NOT touch volatile loads for now */
@@ -713,20 +721,22 @@ static void handle_load_update(ir_node *load) {
  * A use of an address node has vanished. Check if this was a Proj
  * node and update the counters.
  */
-static void reduce_adr_usage(ir_node *ptr) {
-       if (is_Proj(ptr)) {
-               if (get_irn_n_edges(ptr) <= 0) {
-                       /* this Proj is dead now */
-                       ir_node *pred = get_Proj_pred(ptr);
-
-                       if (is_Load(pred)) {
-                               ldst_info_t *info = get_irn_link(pred);
-                               info->projs[get_Proj_proj(ptr)] = NULL;
-
-                               /* this node lost its result proj, handle that */
-                               handle_load_update(pred);
-                       }
-               }
+static void reduce_adr_usage(ir_node *ptr)
+{
+       ir_node *pred;
+       if (!is_Proj(ptr))
+               return;
+       if (get_irn_n_edges(ptr) > 0)
+               return;
+
+       /* this Proj is dead now */
+       pred = get_Proj_pred(ptr);
+       if (is_Load(pred)) {
+               ldst_info_t *info = get_irn_link(pred);
+               info->projs[get_Proj_proj(ptr)] = NULL;
+
+               /* this node lost its result proj, handle that */
+               handle_load_update(pred);
        }
 }  /* reduce_adr_usage */
 
@@ -734,7 +744,8 @@ static void reduce_adr_usage(ir_node *ptr) {
  * Check, if an already existing value of mode old_mode can be converted
  * into the needed one new_mode without loss.
  */
-static int can_use_stored_value(ir_mode *old_mode, ir_mode *new_mode) {
+static int can_use_stored_value(ir_mode *old_mode, ir_mode *new_mode)
+{
        if (old_mode == new_mode)
                return 1;
 
@@ -750,7 +761,8 @@ static int can_use_stored_value(ir_mode *old_mode, ir_mode *new_mode) {
 /**
  * Check whether a Call is at least pure, ie. does only read memory.
  */
-static unsigned is_Call_pure(ir_node *call) {
+static unsigned is_Call_pure(ir_node *call)
+{
        ir_type *call_tp = get_Call_type(call);
        unsigned prop = get_method_additional_properties(call_tp);
 
@@ -915,7 +927,8 @@ static int try_load_after_store(ir_node *load,
  *
  * INC_MASTER() must be called before dive into
  */
-static unsigned follow_Mem_chain(ir_node *load, ir_node *curr) {
+static unsigned follow_Mem_chain(ir_node *load, ir_node *curr)
+{
        unsigned    res = 0;
        ldst_info_t *info = get_irn_link(load);
        ir_node     *pred;
@@ -969,7 +982,7 @@ 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(get_nodes_block(pred), pred, get_Load_mode(pred), pn_Load_res);
+                                               pred_info->projs[pn_Load_res] = new_r_Proj(pred, get_Load_mode(pred), pn_Load_res);
                                        }
                                        value = pred_info->projs[pn_Load_res];
 
@@ -1051,7 +1064,8 @@ static unsigned follow_Mem_chain(ir_node *load, ir_node *curr) {
  * Check if we can replace the load by a given const from
  * the const code irg.
  */
-ir_node *can_replace_load_by_const(const ir_node *load, ir_node *c) {
+ir_node *can_replace_load_by_const(const ir_node *load, ir_node *c)
+{
        ir_mode *c_mode = get_irn_mode(c);
        ir_mode *l_mode = get_Load_mode(load);
        ir_node *res    = NULL;
@@ -1094,39 +1108,12 @@ static unsigned optimize_load(ir_node *load)
        /* the address of the load to be optimized */
        ptr = get_Load_ptr(load);
 
-       /*
-        * Check if we can remove the exception from a Load:
-        * This can be done, if the address is from an Sel(Alloc) and
-        * the Sel type is a subtype of the allocated type.
-        *
-        * This optimizes some often used OO constructs,
-        * like x = new O; x->t;
-        */
-       if (info->projs[pn_Load_X_except]) {
-               ir_node *addr = ptr;
-
-               /* find base address */
-               while (is_Sel(addr))
-                       addr = get_Sel_ptr(addr);
-               if (is_Alloc(skip_Proj(skip_Cast(addr)))) {
-                       /* simple case: a direct load after an Alloc. Firm Alloc throw
-                        * an exception in case of out-of-memory. So, there is no way for an
-                        * exception in this load.
-                        * This code is constructed by the "exception lowering" in the Jack compiler.
-                        */
-                       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(get_nodes_block(load)));
-                       info->projs[pn_Load_X_regular] = NULL;
-                       res |= CF_CHANGED;
-               }
-       }
-
        /* The mem of the Load. Must still be returned after optimization. */
        mem = get_Load_mem(load);
 
-       if (! info->projs[pn_Load_res] && ! info->projs[pn_Load_X_except]) {
-               /* a Load which value is neither used nor exception checked, remove it */
+       if (info->projs[pn_Load_res] == NULL
+                       && info->projs[pn_Load_X_except] == NULL) {
+               /* the value is never used and we don't care about exceptions, remove */
                exchange(info->projs[pn_Load_M], mem);
 
                if (info->projs[pn_Load_X_regular]) {
@@ -1146,11 +1133,11 @@ static unsigned optimize_load(ir_node *load)
                value = NULL;
                /* check if we can determine the entity that will be loaded */
                ent = find_constant_entity(ptr);
-               if (ent != NULL                                     &&
-                   allocation_static == get_entity_allocation(ent) &&
-                   visibility_external_allocated != get_entity_visibility(ent)) {
-                       /* a static allocation that is not external: there should be NO exception
-                        * when loading even if we cannot replace the load itself. */
+               if (ent != NULL
+                               && get_entity_visibility(ent) != ir_visibility_external) {
+                       /* a static allocation that is not external: there should be NO
+                        * exception when loading even if we cannot replace the load itself.
+                        */
 
                        /* no exception, clear the info field as it might be checked later again */
                        if (info->projs[pn_Load_X_except]) {
@@ -1164,17 +1151,11 @@ static unsigned optimize_load(ir_node *load)
                                res |= CF_CHANGED;
                        }
 
-                       if (variability_constant == get_entity_variability(ent)) {
-                               if (is_atomic_entity(ent)) {
-                                       /* Might not be atomic after lowering of Sels.  In this case we
-                                        * could also load, but it's more complicated. */
-                                       /* more simpler case: we load the content of a constant value:
-                                        * replace it by the constant itself */
-                                       value = get_atomic_ent_value(ent);
-                               } else if (ent->has_initializer) {
+                       if (get_entity_linkage(ent) & IR_LINKAGE_CONSTANT) {
+                               if (ent->initializer != NULL) {
                                        /* new style initializer */
                                        value = find_compound_ent_value(ptr);
-                               } else {
+                               } else if (entity_has_compound_ent_values(ent)) {
                                        /* old style initializer */
                                        compound_graph_path *path = get_accessed_path(ptr);
 
@@ -1262,7 +1243,8 @@ static int is_partially_same(ir_node *small, ir_node *large)
  *
  * INC_MASTER() must be called before dive into
  */
-static unsigned follow_Mem_chain_for_Store(ir_node *store, ir_node *curr) {
+static unsigned follow_Mem_chain_for_Store(ir_node *store, ir_node *curr)
+{
        unsigned res = 0;
        ldst_info_t *info = get_irn_link(store);
        ir_node *pred;
@@ -1303,7 +1285,7 @@ static unsigned follow_Mem_chain_for_Store(ir_node *store, ir_node *curr) {
                                ir_node *predvalue = get_Store_value(pred);
                                ir_mode *predmode  = get_irn_mode(predvalue);
 
-                               if(is_completely_overwritten(predmode, mode)
+                               if (is_completely_overwritten(predmode, mode)
                                        || is_partially_same(predvalue, value)) {
                                        DBG_OPT_WAW(pred, store);
                                        exchange(pred_info->projs[pn_Store_M], get_Store_mem(pred));
@@ -1323,7 +1305,7 @@ static unsigned follow_Mem_chain_for_Store(ir_node *store, ir_node *curr) {
                                && !info->projs[pn_Store_X_except]) {
                                ir_node *predvalue = get_Store_value(pred);
 
-                               if(is_partially_same(value, predvalue)) {
+                               if (is_partially_same(value, predvalue)) {
                                        DBG_OPT_WAW(pred, store);
                                        exchange(info->projs[pn_Store_M], mem);
                                        kill_node(store);
@@ -1394,7 +1376,7 @@ static unsigned follow_Mem_chain_for_Store(ir_node *store, ir_node *curr) {
 /** find entity used as base for an address calculation */
 static ir_entity *find_entity(ir_node *ptr)
 {
-       switch(get_irn_opcode(ptr)) {
+       switch (get_irn_opcode(ptr)) {
        case iro_SymConst:
                return get_SymConst_entity(ptr);
        case iro_Sel: {
@@ -1425,7 +1407,8 @@ static ir_entity *find_entity(ir_node *ptr)
  *
  * @param store  the Store node
  */
-static unsigned optimize_store(ir_node *store) {
+static unsigned optimize_store(ir_node *store)
+{
        ir_node   *ptr;
        ir_node   *mem;
        ir_entity *entity;
@@ -1618,7 +1601,7 @@ static unsigned optimize_phi(ir_node *phi, walk_env_t *wenv)
        for (i = n - 1; i >= 0; --i) {
                ir_node *proj  = projMs[i];
 
-               if(is_Proj(proj)) {
+               if (is_Proj(proj)) {
                        ir_node *store = get_Proj_pred(proj);
                        exchange(proj, inM[i]);
                        kill_node(store);
@@ -1631,14 +1614,14 @@ static unsigned optimize_phi(ir_node *phi, walk_env_t *wenv)
        co_set_irn_name(store, co_get_irn_ident(old_store));
 #endif
 
-       projM = new_rd_Proj(NULL, block, store, mode_M, pn_Store_M);
+       projM = new_rd_Proj(NULL, 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, block, store, mode_X, pn_Store_X_except);
+               ir_node *projX = new_rd_Proj(NULL, store, mode_X, pn_Store_X_except);
 
                info->projs[pn_Store_X_except] = projX;
                info->exc_block                = exc;
@@ -1664,7 +1647,8 @@ static unsigned optimize_phi(ir_node *phi, walk_env_t *wenv)
 /**
  * walker, do the optimizations
  */
-static void do_load_store_optimize(ir_node *n, void *env) {
+static void do_load_store_optimize(ir_node *n, void *env)
+{
        walk_env_t *wenv = env;
 
        switch (get_irn_opcode(n)) {
@@ -1715,7 +1699,8 @@ typedef struct loop_env {
 /**
 * Gets the node_entry of a node
 */
-static node_entry *get_irn_ne(ir_node *irn, loop_env *env) {
+static node_entry *get_irn_ne(ir_node *irn, loop_env *env)
+{
        ir_phase   *ph = &env->ph;
        node_entry *e  = phase_get_irn_data(&env->ph, irn);
 
@@ -1733,7 +1718,8 @@ static node_entry *get_irn_ne(ir_node *irn, loop_env *env) {
  * @param env   the loop environment
  * @param n     the node to push
  */
-static void push(loop_env *env, ir_node *n) {
+static void push(loop_env *env, ir_node *n)
+{
        node_entry *e;
 
        if (env->tos == ARR_LEN(env->stack)) {
@@ -1752,7 +1738,8 @@ static void push(loop_env *env, ir_node *n) {
  *
  * @return  The topmost node
  */
-static ir_node *pop(loop_env *env) {
+static ir_node *pop(loop_env *env)
+{
        ir_node *n = env->stack[--env->tos];
        node_entry *e = get_irn_ne(n, env);
 
@@ -1767,7 +1754,8 @@ static ir_node *pop(loop_env *env) {
  * @param irn           the node to check
  * @param header_block  the header block of the induction variable
  */
-static int is_rc(ir_node *irn, ir_node *header_block) {
+static int is_rc(ir_node *irn, ir_node *header_block)
+{
        ir_node *block = get_nodes_block(irn);
 
        return (block != header_block) && block_dominates(block, header_block);
@@ -1793,7 +1781,8 @@ typedef struct avail_entry_t {
 /**
  * Compare two avail entries.
  */
-static int cmp_avail_entry(const void *elt, const void *key, size_t size) {
+static int cmp_avail_entry(const void *elt, const void *key, size_t size)
+{
        const avail_entry_t *a = elt;
        const avail_entry_t *b = key;
        (void) size;
@@ -1804,7 +1793,8 @@ static int cmp_avail_entry(const void *elt, const void *key, size_t size) {
 /**
  * Calculate the hash value of an avail entry.
  */
-static unsigned hash_cache_entry(const avail_entry_t *entry) {
+static unsigned hash_cache_entry(const avail_entry_t *entry)
+{
        return get_irn_idx(entry->ptr) * 9 + HASH_PTR(entry->mode);
 }  /* hash_cache_entry */
 
@@ -1814,7 +1804,8 @@ static unsigned hash_cache_entry(const avail_entry_t *entry) {
  * @param pscc   the loop described by an SCC
  * @param env    the loop environment
  */
-static void move_loads_out_of_loops(scc *pscc, loop_env *env) {
+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;
@@ -1921,10 +1912,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(pred, irn, mode_M, pn_Load_M);
+                                       ninfo->projs[pn_Load_M] = mem = new_r_Proj(irn, mode_M, pn_Load_M);
                                        set_Phi_pred(phi, pos, mem);
 
-                                       ninfo->projs[pn_Load_res] = new_r_Proj(pred, irn, load_mode, pn_Load_res);
+                                       ninfo->projs[pn_Load_res] = new_r_Proj(irn, load_mode, pn_Load_res);
                                }
 
                                /* now kill the old Load */
@@ -1944,7 +1935,8 @@ static void move_loads_out_of_loops(scc *pscc, loop_env *env) {
  * @param pscc  the SCC
  * @param env   the loop environment
  */
-static void process_loop(scc *pscc, loop_env *env) {
+static void process_loop(scc *pscc, loop_env *env)
+{
        ir_node *irn, *next, *header = NULL;
        node_entry *b, *h = NULL;
        int j, only_phi, num_outside, process = 0;
@@ -2069,7 +2061,8 @@ fail:
  * @param pscc  the SCC
  * @param env   the loop environment
  */
-static void process_scc(scc *pscc, loop_env *env) {
+static void process_scc(scc *pscc, loop_env *env)
+{
        ir_node *head = pscc->head;
        node_entry *e = get_irn_ne(head, env);
 
@@ -2176,7 +2169,8 @@ static void dfs(ir_node *irn, loop_env *env)
  * @param irg  the graph to process
  * @param env  the loop environment
  */
-static void do_dfs(ir_graph *irg, loop_env *env) {
+static void do_dfs(ir_graph *irg, loop_env *env)
+{
        ir_graph *rem = current_ir_graph;
        ir_node  *endblk, *end;
        int      i;
@@ -2215,7 +2209,8 @@ static void do_dfs(ir_graph *irg, loop_env *env) {
 /**
  * Initialize new phase data. We do this always explicit, so return NULL here
  */
-static void *init_loop_data(ir_phase *ph, const ir_node *irn, void *data) {
+static void *init_loop_data(ir_phase *ph, const ir_node *irn, void *data)
+{
        (void)ph;
        (void)irn;
        (void)data;
@@ -2227,7 +2222,8 @@ static void *init_loop_data(ir_phase *ph, const ir_node *irn, void *data) {
  *
  * @param irg  the graph
  */
-static int optimize_loops(ir_graph *irg) {
+static int optimize_loops(ir_graph *irg)
+{
        loop_env env;
 
        env.stack         = NEW_ARR_F(ir_node *, 128);
@@ -2235,13 +2231,13 @@ static int optimize_loops(ir_graph *irg) {
        env.nextDFSnum    = 0;
        env.POnum         = 0;
        env.changes       = 0;
-       phase_init(&env.ph, "ldstopt", irg, PHASE_DEFAULT_GROWTH, init_loop_data, NULL);
+       phase_init(&env.ph, irg, init_loop_data);
 
        /* calculate the SCC's and drive loop optimization. */
        do_dfs(irg, &env);
 
        DEL_ARR_F(env.stack);
-       phase_free(&env.ph);
+       phase_deinit(&env.ph);
 
        return env.changes;
 }  /* optimize_loops */
@@ -2249,7 +2245,8 @@ static int optimize_loops(ir_graph *irg) {
 /*
  * do the load store optimization
  */
-int optimize_load_store(ir_graph *irg) {
+int optimize_load_store(ir_graph *irg)
+{
        walk_env_t env;
 
        FIRM_DBG_REGISTER(dbg, "firm.opt.ldstopt");