/*
- * Copyright (C) 1995-2008 University of Karlsruhe. All right reserved.
+ * Copyright (C) 1995-2011 University of Karlsruhe. All right reserved.
*
* This file is part of libFirm.
*
*/
typedef struct path_t {
unsigned vnum; /**< The value number. */
- unsigned path_len; /**< The length of the access path. */
+ size_t path_len; /**< The length of the access path. */
path_elem_t path[1]; /**< The path. */
} path_t;
*/
static int path_cmp(const void *elt, const void *key, size_t size)
{
- const path_t *p1 = elt;
- const path_t *p2 = key;
+ const path_t *p1 = (const path_t*)elt;
+ const path_t *p2 = (const path_t*)key;
(void) size;
/* we can use memcmp here, because identical tarvals should have identical addresses */
*/
static int ent_cmp(const void *elt, const void *key, size_t size)
{
- const scalars_t *c1 = elt;
- const scalars_t *c2 = key;
+ const scalars_t *c1 = (const scalars_t*)elt;
+ const scalars_t *c2 = (const scalars_t*)key;
(void) size;
return c1->ent != c2->ent;
/*
* Returns non-zero, if the address of an entity
- * represented by a Sel node (or it's successor Sels) is taken.
+ * represented by a Sel node (or its successor Sels) is taken.
*/
int is_address_taken(ir_node *sel)
{
*
* This function finds variables on the (members of the) frame type
* that can be scalar replaced, because their address is never taken.
- * If such a variable is found, it's entity link will hold a list of all
+ * If such a variable is found, its entity link will hold a list of all
* Sel nodes, that selects the atomic fields of this entity.
* Otherwise, the link will be ADDRESS_TAKEN or NULL.
*
{
ir_node *irg_frame;
ir_type *frame_tp;
- int i, j, k, static_link_arg;
+ size_t mem_idx;
+ int i;
+ long static_link_arg;
int res = 0;
/*
* First, clear the link field of all interesting entities.
*/
frame_tp = get_irg_frame_type(irg);
- for (i = get_class_n_members(frame_tp) - 1; i >= 0; --i) {
- ir_entity *ent = get_class_member(frame_tp, i);
+ for (mem_idx = get_class_n_members(frame_tp); mem_idx > 0;) {
+ ir_entity *ent = get_class_member(frame_tp, --mem_idx);
set_entity_link(ent, NULL);
}
/* check for inner functions:
* FIXME: need a way to get the argument position for the static link */
static_link_arg = 0;
- for (i = get_class_n_members(frame_tp) - 1; i >= 0; --i) {
- ir_entity *ent = get_class_member(frame_tp, i);
+ for (mem_idx = get_class_n_members(frame_tp); mem_idx > 0;) {
+ ir_entity *ent = get_class_member(frame_tp, --mem_idx);
if (is_method_entity(ent)) {
ir_graph *inner_irg = get_entity_irg(ent);
ir_node *args;
+ int j;
assure_irg_outs(inner_irg);
args = get_irg_args(inner_irg);
ir_node *arg = get_irn_out(args, j);
if (get_Proj_proj(arg) == static_link_arg) {
+ int k;
for (k = get_irn_n_outs(arg) - 1; k >= 0; --k) {
ir_node *succ = get_irn_out(arg, k);
}
/**
- * Return a path from the Sel node sel to it's root.
+ * Return a path from the Sel node "sel" to its root.
*
* @param sel the Sel node
* @param len the length of the path so far
*/
-static path_t *find_path(ir_node *sel, unsigned len)
+static path_t *find_path(ir_node *sel, size_t len)
{
- int pos, i, n;
+ size_t pos;
+ int i, n;
path_t *res;
ir_node *pred = get_Sel_ptr(sel);
} else
res = find_path(pred, len);
+ assert(len <= res->path_len);
pos = res->path_len - len;
res->path[pos++].ent = get_Sel_entity(sel);
DB((dbg, SET_LEVEL_3, " Visiting Sel nodes of entity %+F\n", ent));
/* visit all Sel nodes in the chain of the entity */
- for (sel = get_entity_link(ent); sel; sel = next) {
- next = get_irn_link(sel);
+ for (sel = (ir_node*)get_entity_link(ent); sel != NULL;
+ sel = next) {
+ next = (ir_node*)get_irn_link(sel);
/* we must mark this sel for later */
pset_insert_ptr(sels, sel);
key = find_path(sel, 0);
- path = set_find(pathes, key, PATH_SIZE(key), path_hash(key));
+ path = (path_t*)set_find(pathes, key, PATH_SIZE(key), path_hash(key));
if (path) {
SET_VNUM(sel, path->vnum);
SET_VNUM(sel, key->vnum);
DB((dbg, SET_LEVEL_3, " %+F represents value %u\n", sel, key->vnum));
- ARR_EXTO(ir_mode *, *modes, (int)((key->vnum + 15) & ~15));
+ ARR_EXTO(ir_mode *, *modes, (key->vnum + 15) & ~15);
(*modes)[key->vnum] = get_type_mode(get_entity_type(get_Sel_entity(sel)));
*/
static void topologic_walker(ir_node *node, void *ctx)
{
- env_t *env = ctx;
+ env_t *env = (env_t*)ctx;
ir_graph *irg = get_irn_irg(node);
ir_node *adr, *block, *mem, *val;
ir_mode *mode;
set_Tuple_pred(node, pn_Load_M, mem);
set_Tuple_pred(node, pn_Load_res, val);
set_Tuple_pred(node, pn_Load_X_regular, new_r_Jmp(block));
- set_Tuple_pred(node, pn_Load_X_except, new_r_Bad(irg));
+ set_Tuple_pred(node, pn_Load_X_except, new_r_Bad(irg, mode_X));
} else if (is_Store(node)) {
DB((dbg, SET_LEVEL_3, " checking %+F for replacement ", node));
turn_into_tuple(node, pn_Store_max);
set_Tuple_pred(node, pn_Store_M, mem);
set_Tuple_pred(node, pn_Store_X_regular, new_r_Jmp(block));
- set_Tuple_pred(node, pn_Store_X_except, new_r_Bad(irg));
+ set_Tuple_pred(node, pn_Store_X_except, new_r_Bad(irg, mode_X));
}
}
if (nvals > 0) {
do_scalar_replacements(irg, sels, nvals, modes);
- foreach_set(set_ent, value) {
+ foreach_set(set_ent, scalars_t*, value) {
free_entity(value->ent);
}
* neither changed control flow, cf-backedges should be still
* consistent.
*/
- set_irg_outs_inconsistent(irg);
- set_irg_loopinfo_inconsistent(irg);
-
res = 1;
}
del_pset(sels);
projects / libfirm / blobdiff