* @author Beyhan Veliev, Michael Beck
* @version $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include <string.h>
for (i = 0; i < n; ++i) {
ir_node *idx = get_Sel_index(sel, i);
- if (get_irn_op(idx) != op_Const)
+ if (!is_Const(idx))
return 0;
}
return 1;
*/
int is_address_taken(ir_node *sel)
{
- int i;
- ir_mode *emode, *mode;
- ir_node *value;
+ int i, input_nr, k;
+ ir_mode *emode, *mode;
+ ir_node *value;
ir_entity *ent;
if (! is_const_sel(sel))
switch (get_irn_opcode(succ)) {
case iro_Load:
+ /* do not remove volatile variables */
+ if (get_Load_volatility(succ) == volatility_is_volatile)
+ return 1;
/* check if this load is not a hidden conversion */
mode = get_Load_mode(succ);
ent = get_Sel_entity(sel);
emode = get_type_mode(get_entity_type(ent));
if (! check_load_store_mode(mode, emode))
return 1;
- /* do not remove volatile variables */
- if (get_Load_volatility(succ) == volatility_is_volatile)
- return 1;
break;
case iro_Store:
value = get_Store_value(succ);
if (value == sel)
return 1;
+ /* do not remove volatile variables */
+ if (get_Store_volatility(succ) == volatility_is_volatile)
+ return 1;
/* check if this Store is not a hidden conversion */
mode = get_irn_mode(value);
ent = get_Sel_entity(sel);
emode = get_type_mode(get_entity_type(ent));
if (! check_load_store_mode(mode, emode))
return 1;
- /* do not remove volatile variables */
- if (get_Store_volatility(succ) == volatility_is_volatile)
- return 1;
break;
case iro_Sel: {
- /* Check the Sel successor of Sel */
- int res = is_address_taken(succ);
+ int res;
+ ir_entity *entity = get_Sel_entity(succ);
+ /* we can't handle unions correctly yet -> address taken */
+ if (is_Union_type(get_entity_owner(entity)))
+ return 1;
+ /* Check the Sel successor of Sel */
+ res = is_address_taken(succ);
if (res)
return 1;
break;
*/
return 1;
+ case iro_Id: {
+ int res = is_address_taken(succ);
+ if (res)
+ return 1;
+ break;
+ }
+
+ case iro_Tuple:
+ /* Non-optimized Tuple, happens in inlining */
+ for (input_nr = get_Tuple_n_preds(succ) - 1; input_nr >= 0; --input_nr) {
+ ir_node *pred = get_Tuple_pred(succ, input_nr);
+
+ if (pred == sel) {
+ /* we found one input */
+ for (k = get_irn_n_outs(succ) - 1; k >= 0; --k) {
+ ir_node *proj = get_irn_out(succ, k);
+
+ if (is_Proj(proj) && get_Proj_proj(proj) == input_nr) {
+ int res = is_address_taken(proj);
+ if (res)
+ return 1;
+ }
+ }
+ }
+ }
+ break;
+
default:
/* another op, the address is taken */
return 1;
*
* @param ent the entity that will be scalar replaced
* @param sel a Sel node that selects some fields of this entity
- *
- * Uses the visited flag to mark already linked Sel nodes.
*/
-static void link_all_leave_sels(ir_entity *ent, ir_node *sel) {
- int i, flag = 1;
+static int link_all_leave_sels(ir_entity *ent, ir_node *sel) {
+ int i, is_leave = 1;
for (i = get_irn_n_outs(sel) - 1; i >= 0; --i) {
ir_node *succ = get_irn_out(sel, i);
if (is_Sel(succ)) {
+ /* the current leave has further Sel's, no leave */
+ is_leave = 0;
link_all_leave_sels(ent, succ);
- flag = 0;
+ } else if (is_Id(succ)) {
+ is_leave &= link_all_leave_sels(ent, succ);
}
}
- if (flag) {
- /* if Sel nodes with memory inputs are used, a entity can be
- * visited more than once causing a ring here, so we use the
- * node flag to mark linked nodes
- */
- if (irn_visited(sel))
- return;
+ if (is_leave) {
+ /* beware of Id's */
+ sel = skip_Id(sel);
/* we know we are at a leave, because this function is only
- * called if the address is NOT taken, so succ must be a Load
- * or a Store node
+ * called if the address is NOT taken, so sel's successor(s)
+ * must be Loads or Stores
*/
set_irn_link(sel, get_entity_link(ent));
set_entity_link(ent, sel);
-
- mark_irn_visited(sel);
}
+ return is_leave;
}
/* we need a special address that serves as an address taken marker */
static int find_possible_replacements(ir_graph *irg) {
ir_node *irg_frame;
ir_type *frame_tp;
- int i;
+ int i, j, k, static_link_arg;
int res = 0;
- set_using_irn_visited(irg);
- inc_irg_visited(irg);
-
/*
* First, clear the link field of all interesting entities.
*/
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);
+ if (is_method_entity(ent)) {
+ ir_graph *inner_irg = get_entity_irg(ent);
+ ir_node *args;
+
+ assure_irg_outs(inner_irg);
+ args = get_irg_args(inner_irg);
+ for (j = get_irn_n_outs(args) - 1; j >= 0; --j) {
+ ir_node *arg = get_irn_out(args, j);
+
+ if (get_Proj_proj(arg) == static_link_arg) {
+ for (k = get_irn_n_outs(arg) - 1; k >= 0; --k) {
+ ir_node *succ = get_irn_out(arg, k);
+
+ if (is_Sel(succ)) {
+ ir_entity *ent = get_Sel_entity(succ);
+
+ if (get_entity_owner(ent) == frame_tp) {
+ /* found an access to the outer frame */
+ set_entity_link(ent, ADDRESS_TAKEN);
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
/*
* Check the ir_graph for Sel nodes. If the entity of Sel
* isn't a scalar replacement set the link of this entity
ir_entity *ent = get_Sel_entity(succ);
ir_type *ent_type;
+ /* we are only interested in entities on the frame, NOT
+ on the value type */
+ if (get_entity_owner(ent) != frame_tp)
+ continue;
+
if (get_entity_link(ent) == ADDRESS_TAKEN)
continue;
/* we can handle arrays, structs and atomic types yet */
if (is_Array_type(ent_type) || is_Struct_type(ent_type) || is_atomic_type(ent_type)) {
if (is_address_taken(succ)) {
- if (get_entity_link(ent)) /* killing one */
+ /* killing one */
+ if (get_entity_link(ent))
--res;
set_entity_link(ent, ADDRESS_TAKEN);
} else {
}
}
- clear_using_irn_visited(irg);
return res;
}
if (! is_Sel(pred)) {
/* we found the root */
-
- res = xmalloc(sizeof(*res) + (len - 1) * sizeof(res->path));
+ res = XMALLOCF(path_t, path, len);
res->path_len = len;
} else
res = find_path(pred, len);
*/
static void topologic_walker(ir_node *node, void *ctx) {
env_t *env = ctx;
- ir_op *op = get_irn_op(node);
ir_node *adr, *block, *mem, *val;
ir_mode *mode;
unsigned vnum;
- if (op == op_Load) {
+ if (is_Load(node)) {
/* a load, check if we can resolve it */
adr = get_Load_ptr(node);
DB((dbg, SET_LEVEL_3, "replacing by value %u\n", vnum));
+ block = get_nodes_block(node);
+ set_cur_block(block);
+
/* check, if we can replace this Load */
val = get_value(vnum, env->modes[vnum]);
val = new_d_Conv(get_irn_dbg_info(node), val, mode);
mem = get_Load_mem(node);
- block = get_nodes_block(node);
turn_into_tuple(node, pn_Load_max);
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(current_ir_graph, block));
+ set_Tuple_pred(node, pn_Load_X_regular, new_Jmp());
set_Tuple_pred(node, pn_Load_X_except, new_Bad());
- } else if (op == op_Store) {
+ } else if (is_Store(node)) {
DB((dbg, SET_LEVEL_3, " checking %+F for replacement ", node));
/* a Store always can be replaced */
DB((dbg, SET_LEVEL_3, "replacing by value %u\n", vnum));
+ block = get_nodes_block(node);
+ set_cur_block(block);
+
/* Beware: A Store can contain a hidden conversion in Firm. */
val = get_Store_value(node);
if (get_irn_mode(val) != env->modes[vnum])
val = new_d_Conv(get_irn_dbg_info(node), val, env->modes[vnum]);
+
set_value(vnum, val);
mem = get_Store_mem(node);
- block = get_nodes_block(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(current_ir_graph, block));
+ set_Tuple_pred(node, pn_Store_X_regular, new_Jmp());
set_Tuple_pred(node, pn_Store_X_except, new_Bad());
}
}
/* Call algorithm that computes the out edges */
assure_irg_outs(irg);
+ /* we use the link field to store the VNUM */
+ ir_reserve_resources(irg, IR_RESOURCE_IRN_LINK);
+ irp_reserve_resources(irp, IR_RESOURCE_ENTITY_LINK);
+
/* Find possible scalar replacements */
if (find_possible_replacements(irg)) {
- DB((dbg, SET_LEVEL_1, "Scalar Replacement: %s\n", get_entity_name(get_irg_entity(irg))));
+ DB((dbg, SET_LEVEL_1, "Scalar Replacement: %+F\n", irg));
/* Insert in set the scalar replacements. */
irg_frame = get_irg_frame(irg);
DEL_ARR_F(modes);
}
+ ir_free_resources(irg, IR_RESOURCE_IRN_LINK);
+ irp_free_resources(irp, IR_RESOURCE_ENTITY_LINK);
+
current_ir_graph = rem;
return res;
}