#endif
#include <string.h>
-#include <stdbool.h>
#include "iroptimize.h"
#include "irnode_t.h"
set_compound_graph_path_array_index(res, pos, get_Sel_array_index_long(ptr, 0));
}
} else if (is_Add(ptr)) {
- ir_node *l = get_Add_left(ptr);
- ir_node *r = get_Add_right(ptr);
- ir_mode *mode;
+ ir_node *l = get_Add_left(ptr);
+ ir_node *r = get_Add_right(ptr);
+ ir_mode *mode = get_irn_mode(ptr);
+ tarval *tmp;
- if (is_Const(r)) {
+ if (is_Const(r) && get_irn_mode(l) == mode) {
ptr = l;
tv = get_Const_tarval(r);
} else {
}
ptr_arith:
mode = get_tarval_mode(tv);
+ tmp = tv;
/* ptr must be a Sel or a SymConst, this was checked in find_constant_entity() */
if (is_Sel(ptr)) {
size = get_type_size_bytes(get_entity_type(ent));
sz = new_tarval_from_long(size, mode);
- tv_index = tarval_div(tv, sz);
- tv = tarval_mod(tv, sz);
+ tv_index = tarval_div(tmp, sz);
+ tmp = tarval_mod(tmp, sz);
- if (tv_index == tarval_bad || tv == tarval_bad)
+ if (tv_index == tarval_bad || tmp == tarval_bad)
return NULL;
assert(get_array_n_dimensions(tp) == 1 && "multiarrays not implemented");
/* ok, bounds check finished */
++idx;
}
- if (! tarval_is_null(tv)) {
+ if (! tarval_is_null(tmp)) {
/* access to some struct/union member */
return NULL;
}
* valid, if the graph is in phase_high and _no_ address computation is used.
*/
static compound_graph_path *get_accessed_path(ir_node *ptr) {
- return rec_get_accessed_path(ptr, 0);
+ compound_graph_path *gr = rec_get_accessed_path(ptr, 0);
+ return gr;
} /* get_accessed_path */
typedef struct path_entry {
continue;
}
}
- if (p->index >= n)
+ if (p->index >= (int) n)
return NULL;
initializer = get_initializer_compound_value(initializer, p->index);
return (prop & (mtp_property_const|mtp_property_pure)) != 0;
} /* is_Call_pure */
-static ir_node *get_base_ptr(ir_node *ptr)
+static ir_node *get_base_and_offset(ir_node *ptr, long *pOffset)
{
- while (is_Add(ptr) && is_Const(get_Add_right(ptr))) {
- ptr = get_Add_left(ptr);
- }
-
- return ptr;
-}
+ ir_mode *mode = get_irn_mode(ptr);
+ long offset = 0;
-static long get_base_offset(ir_node *ptr)
-{
/* TODO: long might not be enough, we should probably use some tarval thingy... */
- long offset = 0;
- while (is_Add(ptr)) {
- ir_node *right = get_Add_right(ptr);
- if (!is_Const(right))
+ for (;;) {
+ if (is_Add(ptr)) {
+ ir_node *l = get_Add_left(ptr);
+ ir_node *r = get_Add_right(ptr);
+
+ if (get_irn_mode(l) != mode || !is_Const(r))
+ break;
+
+ offset += get_tarval_long(get_Const_tarval(r));
+ ptr = l;
+ } else if (is_Sub(ptr)) {
+ ir_node *l = get_Sub_left(ptr);
+ ir_node *r = get_Sub_right(ptr);
+
+ if (get_irn_mode(l) != mode || !is_Const(r))
+ break;
+
+ offset -= get_tarval_long(get_Const_tarval(r));
+ ptr = l;
+ } else if (is_Sel(ptr)) {
+ ir_entity *ent = get_Sel_entity(ptr);
+ ir_type *tp = get_entity_owner(ent);
+
+ if (is_Array_type(tp)) {
+ int size;
+ ir_node *index;
+
+ /* only one dimensional arrays yet */
+ if (get_Sel_n_indexs(ptr) != 1)
+ break;
+ index = get_Sel_index(ptr, 0);
+ if (! is_Const(index))
+ break;
+
+ tp = get_entity_type(ent);
+ if (get_type_state(tp) != layout_fixed)
+ break;
+
+ size = get_type_size_bytes(tp);
+ offset += size * get_tarval_long(get_Const_tarval(index));
+ } else {
+ if (get_type_state(tp) != layout_fixed)
+ break;
+ offset += get_entity_offset(ent);
+ }
+ ptr = get_Sel_ptr(ptr);
+ } else
break;
- offset += get_tarval_long(get_Const_tarval(right));
- ptr = get_Add_left(ptr);
}
- return offset;
+ *pOffset = offset;
+ return ptr;
}
-static int try_load_store(ir_node *load,
+static int try_load_after_store(ir_node *load,
ir_node *load_base_ptr, long load_offset, ir_node *store)
{
ldst_info_t *info;
ir_node *store_ptr = get_Store_ptr(store);
- ir_node *store_base_ptr = get_base_ptr(store_ptr);
+ long store_offset;
+ ir_node *store_base_ptr = get_base_and_offset(store_ptr, &store_offset);
ir_node *store_value;
ir_mode *store_mode;
ir_node *load_ptr;
ir_mode *load_mode;
- long store_offset = get_base_offset(store_ptr);
long load_mode_len;
long store_mode_len;
long delta;
if (load_base_ptr != store_base_ptr)
return 0;
- load_mode = get_Load_mode(load);
- load_mode_len = get_mode_size_bytes(load_mode);
+ load_mode = get_Load_mode(load);
+ load_mode_len = get_mode_size_bytes(load_mode);
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 >= store_mode_len)
+ delta = load_offset - store_offset;
+ if (delta < 0 || delta + load_mode_len > store_mode_len)
return 0;
- if (store_mode_len - delta > load_mode_len)
+ 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);
- DBG_OPT_RAW(load, store_value);
/* produce a shift to adjust offset delta */
if (delta > 0) {
- ir_node *cnst = new_r_Const_long(current_ir_graph,
- get_irg_start_block(current_ir_graph), mode_Iu, delta * 8);
+ 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);
}
store_value, load_mode);
}
+ DBG_OPT_RAW(load, store_value);
+
info = get_irn_link(load);
if (info->projs[pn_Load_M])
exchange(info->projs[pn_Load_M], get_Load_mem(load));
* INC_MASTER() must be called before dive into
*/
static unsigned follow_Mem_chain(ir_node *load, ir_node *curr) {
- unsigned res = 0;
+ unsigned res = 0;
ldst_info_t *info = get_irn_link(load);
- ir_node *pred;
- ir_node *ptr = get_Load_ptr(load);
- ir_node *mem = get_Load_mem(load);
- ir_mode *load_mode = get_Load_mode(load);
- ir_node *base_ptr = get_base_ptr(ptr);
- long load_offset = get_base_offset(ptr);
+ ir_node *pred;
+ ir_node *ptr = get_Load_ptr(load);
+ ir_node *mem = get_Load_mem(load);
+ ir_mode *load_mode = get_Load_mode(load);
for (pred = curr; load != pred; ) {
ldst_info_t *pred_info = get_irn_link(pred);
&& info->projs[pn_Load_X_except] == NULL)
|| get_nodes_MacroBlock(load) == get_nodes_MacroBlock(pred)))
{
- int changes
- = try_load_store(load, base_ptr, load_offset, pred);
- if (changes != 0) {
+ long load_offset;
+ ir_node *base_ptr = get_base_and_offset(ptr, &load_offset);
+ int changes = try_load_after_store(load, base_ptr, load_offset, pred);
+
+ if (changes != 0)
return res | changes;
- }
} else if (is_Load(pred) && get_Load_ptr(pred) == ptr &&
can_use_stored_value(get_Load_mode(pred), load_mode)) {
/*
static unsigned optimize_load(ir_node *load)
{
ldst_info_t *info = get_irn_link(load);
- ir_node *mem, *ptr, *value;
- ir_entity *ent;
- unsigned res = 0;
+ ir_node *mem, *ptr, *value;
+ ir_entity *ent;
+ long dummy;
+ unsigned res = 0;
/* do NOT touch volatile loads for now */
if (get_Load_volatility(load) == volatility_is_volatile)
assert(is_proper_compound_graph_path(path, get_compound_graph_path_length(path)-1));
value = get_compound_ent_value_by_path(ent, path);
+ DB((dbg, LEVEL_1, " Constant access at %F%F resulted in %+F\n", ent, path, value));
free_compound_graph_path(path);
}
}
}
/* Check, if the address of this load is used more than once.
- * If not, this load cannot be removed in any case. */
- if (get_irn_n_uses(ptr) <= 1 && get_irn_n_uses(get_base_ptr(ptr)) <= 1)
+ * If not, more load cannot be removed in any case. */
+ if (get_irn_n_uses(ptr) <= 1 && get_irn_n_uses(get_base_and_offset(ptr, &dummy)) <= 1)
return res;
/*
return res;
} /* follow_Mem_chain_for_Store */
+/** find entity used as base for an address calculation */
+static ir_entity *find_entity(ir_node *ptr)
+{
+ switch(get_irn_opcode(ptr)) {
+ case iro_SymConst:
+ return get_SymConst_entity(ptr);
+ case iro_Sel: {
+ ir_node *pred = get_Sel_ptr(ptr);
+ if (get_irg_frame(get_irn_irg(ptr)) == pred)
+ return get_Sel_entity(ptr);
+
+ return find_entity(pred);
+ }
+ case iro_Sub:
+ case iro_Add: {
+ ir_node *left = get_binop_left(ptr);
+ ir_node *right;
+ if (mode_is_reference(get_irn_mode(left)))
+ return find_entity(left);
+ right = get_binop_right(ptr);
+ if (mode_is_reference(get_irn_mode(right)))
+ return find_entity(right);
+ return NULL;
+ }
+ default:
+ return NULL;
+ }
+}
+
/**
* optimize a Store
*
* @param store the Store node
*/
static unsigned optimize_store(ir_node *store) {
- ir_node *ptr, *mem;
+ ir_node *ptr;
+ ir_node *mem;
+ ir_entity *entity;
if (get_Store_volatility(store) == volatility_is_volatile)
return 0;
- ptr = get_Store_ptr(store);
+ ptr = get_Store_ptr(store);
+ entity = find_entity(ptr);
+
+ /* a store to an entity which is never read is unnecessary */
+ if (entity != NULL && !(get_entity_usage(entity) & ir_usage_read)) {
+ ldst_info_t *info = get_irn_link(store);
+ if (info->projs[pn_Store_X_except] == NULL) {
+ exchange(info->projs[pn_Store_M], get_Store_mem(store));
+ kill_node(store);
+ reduce_adr_usage(ptr);
+ return DF_CHANGED;
+ }
+ }
/* Check, if the address of this Store is used more than once.
* If not, this Store cannot be removed in any case. */
assure_postdoms(irg);
if (get_opt_alias_analysis()) {
- assure_irg_address_taken_computed(irg);
- assure_irp_globals_address_taken_computed();
+ assure_irg_entity_usage_computed(irg);
+ assure_irp_globals_entity_usage_computed();
}
obstack_init(&env.obst);
/* Handle graph state */
if (env.changes) {
set_irg_outs_inconsistent(irg);
+ set_irg_entity_usage_state(irg, ir_entity_usage_not_computed);
}
if (env.changes & CF_CHANGED) {
projects / libfirm / blobdiff