X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeabihelper.c;h=75ca7e893b6b5f7f75cad84ad0edad6bae180c2a;hb=5c6fc6b9c9d953da7efd735f66ce95a93230e7cd;hp=035af4e5685220134ae3ef367fb14e62af2c300f;hpb=3e889332cb054e5cee1a12bba6dd0209121100cf;p=libfirm diff --git a/ir/be/beabihelper.c b/ir/be/beabihelper.c index 035af4e56..75ca7e893 100644 --- a/ir/be/beabihelper.c +++ b/ir/be/beabihelper.c @@ -22,18 +22,19 @@ * @brief Helper functions for handling ABI constraints in the code * selection phase. * @author Matthias Braun - * @version $Id$ */ #include "config.h" #include "beabihelper.h" #include "bearch.h" +#include "beirg.h" #include "benode.h" #include "besched.h" #include "ircons.h" #include "iredges.h" #include "irgwalk.h" -#include "irphase_t.h" +#include "irnodemap.h" +#include "irtools.h" #include "heights.h" /** @@ -52,11 +53,10 @@ typedef struct reg_flag_t { */ typedef struct register_state_mapping_t { ir_node **value_map; /**< mapping of state indices to values */ - int **reg_index_map; /**< mapping of regclass,regnum to an index + size_t **reg_index_map; /**< mapping of regclass,regnum to an index into the value_map */ reg_flag_t *regs; /**< registers (and memory values) that form a state */ - ir_node *last_barrier; } register_state_mapping_t; /** @@ -66,7 +66,6 @@ struct beabi_helper_env_t { ir_graph *irg; /**< the graph we operate on */ register_state_mapping_t prolog; /**< the register state map for the prolog */ register_state_mapping_t epilog; /**< the register state map for the epilog */ - ir_phase *stack_order; /**< a phase to handle stack dependencies. */ }; /** @@ -90,15 +89,15 @@ static void prepare_rsm(register_state_mapping_t *rsm, ARR_APP1(reg_flag_t, rsm->regs, memory); rsm->value_map = NULL; - rsm->reg_index_map = XMALLOCN(int*, n_reg_classes); + rsm->reg_index_map = XMALLOCN(size_t*, n_reg_classes); for (c = 0; c < n_reg_classes; ++c) { const arch_register_class_t *cls = &arch_env->register_classes[c]; unsigned n_regs = arch_register_class_n_regs(cls); unsigned r; - rsm->reg_index_map[c] = XMALLOCN(int, n_regs); + rsm->reg_index_map[c] = XMALLOCN(size_t, n_regs); for (r = 0; r < n_regs; ++r) { - rsm->reg_index_map[c][r] = -1; + rsm->reg_index_map[c][r] = (size_t)-1; } } } @@ -150,7 +149,7 @@ static void rsm_clear_regs(register_state_mapping_t *rsm, unsigned r; for (r = 0; r < n_regs; ++r) { - rsm->reg_index_map[c][r] = -1; + rsm->reg_index_map[c][r] = (size_t)-1; } } ARR_RESIZE(reg_flag_t, rsm->regs, 0); @@ -166,17 +165,17 @@ static void rsm_clear_regs(register_state_mapping_t *rsm, * Add a register and its constraint flags to a register state map * and return its index inside the map. */ -static int rsm_add_reg(register_state_mapping_t *rsm, - const arch_register_t *reg, - arch_register_req_type_t flags) +static size_t rsm_add_reg(register_state_mapping_t *rsm, + const arch_register_t *reg, + arch_register_req_type_t flags) { - int input_idx = ARR_LEN(rsm->regs); + size_t input_idx = ARR_LEN(rsm->regs); int cls_idx = reg->reg_class->index; int reg_idx = reg->index; reg_flag_t regflag = { reg, flags }; /* we must not have used get_value yet */ - assert(rsm->reg_index_map[cls_idx][reg_idx] == -1); + assert(rsm->reg_index_map[cls_idx][reg_idx] == (size_t)-1); rsm->reg_index_map[cls_idx][reg_idx] = input_idx; ARR_APP1(reg_flag_t, rsm->regs, regflag); @@ -190,9 +189,9 @@ static int rsm_add_reg(register_state_mapping_t *rsm, /** * Retrieve the ir_node stored at the given index in the register state map. */ -static ir_node *rsm_get_value(register_state_mapping_t *rsm, int index) +static ir_node *rsm_get_value(register_state_mapping_t *rsm, size_t index) { - assert(0 <= index && index < ARR_LEN(rsm->value_map)); + assert(index < ARR_LEN(rsm->value_map)); return rsm->value_map[index]; } @@ -202,9 +201,9 @@ static ir_node *rsm_get_value(register_state_mapping_t *rsm, int index) static ir_node *rsm_get_reg_value(register_state_mapping_t *rsm, const arch_register_t *reg) { - int cls_idx = reg->reg_class->index; - int reg_idx = reg->index; - int input_idx = rsm->reg_index_map[cls_idx][reg_idx]; + int cls_idx = reg->reg_class->index; + int reg_idx = reg->index; + size_t input_idx = rsm->reg_index_map[cls_idx][reg_idx]; return rsm_get_value(rsm, input_idx); } @@ -212,10 +211,10 @@ static ir_node *rsm_get_reg_value(register_state_mapping_t *rsm, /** * Enter a ir_node at the given index in the register state map. */ -static void rsm_set_value(register_state_mapping_t *rsm, int index, +static void rsm_set_value(register_state_mapping_t *rsm, size_t index, ir_node *value) { - assert(0 <= index && index < ARR_LEN(rsm->value_map)); + assert(index < ARR_LEN(rsm->value_map)); rsm->value_map[index] = value; } @@ -225,53 +224,12 @@ static void rsm_set_value(register_state_mapping_t *rsm, int index, static void rsm_set_reg_value(register_state_mapping_t *rsm, const arch_register_t *reg, ir_node *value) { - int cls_idx = reg->reg_class->index; - int reg_idx = reg->index; - int input_idx = rsm->reg_index_map[cls_idx][reg_idx]; + int cls_idx = reg->reg_class->index; + int reg_idx = reg->index; + size_t input_idx = rsm->reg_index_map[cls_idx][reg_idx]; rsm_set_value(rsm, input_idx, value); } -/** - * Create a Barrier from the registers stored at a register state map. - * - * @param rsm the register state map - * @param block the block to create the Barrier on - */ -static ir_node *rsm_create_barrier(register_state_mapping_t *rsm, - ir_node *block) -{ - int n_barrier_outs = ARR_LEN(rsm->regs); - ir_node **in = rsm->value_map; - ir_node *barrier; - int o; - - assert(ARR_LEN(rsm->value_map) == n_barrier_outs); - - barrier = be_new_Barrier(block, n_barrier_outs, in); - - for (o = 0; o < n_barrier_outs; ++o) { - const reg_flag_t *regflag = &rsm->regs[o]; - const arch_register_t *reg = regflag->reg; - ir_node *proj; - if (reg == NULL) { - arch_set_out_register_req(barrier, o, arch_no_register_req); - proj = new_r_Proj(barrier, mode_M, o); - } else { - be_set_constr_single_reg_in(barrier, o, reg, arch_register_req_type_none); - be_set_constr_single_reg_out(barrier, o, reg, regflag->flags); - proj = new_r_Proj(barrier, reg->reg_class->mode, o); - } - rsm->value_map[o] = proj; - } - - rsm->last_barrier = barrier; - - return barrier; -} - - - - beabi_helper_env_t *be_abihelper_prepare(ir_graph *irg) { @@ -317,29 +275,20 @@ ir_node *be_prolog_create_start(beabi_helper_env_t *env, dbg_info *dbgi, const arch_register_t *reg = regflag->reg; ir_node *proj; if (reg == NULL) { - arch_set_out_register_req(start, o, arch_no_register_req); + arch_set_irn_register_req_out(start, o, arch_no_register_req); proj = new_r_Proj(start, mode_M, o); } else { be_set_constr_single_reg_out(start, o, regflag->reg, regflag->flags); - arch_irn_set_register(start, o, regflag->reg); + arch_set_irn_register_out(start, o, regflag->reg); proj = new_r_Proj(start, reg->reg_class->mode, o); } env->prolog.value_map[o] = proj; } - /* start node should really be the first thing constructed */ - assert(env->prolog.last_barrier == NULL); - env->prolog.last_barrier = start; - return start; } -ir_node *be_prolog_create_barrier(beabi_helper_env_t *env, ir_node *block) -{ - return rsm_create_barrier(&env->prolog, block); -} - ir_node *be_prolog_get_reg_value(beabi_helper_env_t *env, const arch_register_t *reg) { @@ -375,7 +324,7 @@ void be_epilog_begin(beabi_helper_env_t *env) void be_epilog_add_reg(beabi_helper_env_t *env, const arch_register_t *reg, arch_register_req_type_t flags, ir_node *value) { - int index = rsm_add_reg(&env->epilog, reg, flags); + size_t index = rsm_add_reg(&env->epilog, reg, flags); rsm_set_value(&env->epilog, index, value); } @@ -401,19 +350,14 @@ ir_node *be_epilog_get_memory(beabi_helper_env_t *env) return rsm_get_value(&env->epilog, 0); } -ir_node *be_epilog_create_barrier(beabi_helper_env_t *env, ir_node *block) -{ - return rsm_create_barrier(&env->epilog, block); -} - ir_node *be_epilog_create_return(beabi_helper_env_t *env, dbg_info *dbgi, ir_node *block) { - int n_return_in = ARR_LEN(env->epilog.regs); + size_t n_return_in = ARR_LEN(env->epilog.regs); ir_node **in = env->epilog.value_map; int n_res = 1; /* TODO */ unsigned pop = 0; /* TODO */ - int i; + size_t i; ir_node *ret; assert(ARR_LEN(env->epilog.value_map) == n_return_in); @@ -430,27 +374,69 @@ ir_node *be_epilog_create_return(beabi_helper_env_t *env, dbg_info *dbgi, } rsm_clear_regs(&env->epilog, be_get_irg_arch_env(env->irg)); - env->epilog.last_barrier = NULL; return ret; } -static void add_missing_keep_walker(ir_node *node, void *data) +/** + * Tests whether a node has a real user and is not just kept by the End or + * Anchor node + */ +static bool has_real_user(const ir_node *node) { - int n_outs, i; - unsigned *found_projs; - const ir_edge_t *edge; - ir_mode *mode = get_irn_mode(node); - ir_node *last_keep; - (void) data; - if (mode != mode_T) + foreach_out_edge(node, edge) { + ir_node *user = get_edge_src_irn(edge); + if (!is_End(user) && !is_Anchor(user)) + return true; + } + return false; +} + +static ir_node *add_to_keep(ir_node *last_keep, + const arch_register_class_t *cls, ir_node *node) +{ + if (last_keep != NULL) { + be_Keep_add_node(last_keep, cls, node); + } else { + ir_node *in[1] = { node }; + ir_node *block = get_nodes_block(node); + ir_node *schedpoint; + last_keep = be_new_Keep(block, 1, in); + + schedpoint = skip_Proj(node); + if (sched_is_scheduled(schedpoint)) { + sched_add_after(schedpoint, last_keep); + } + } + return last_keep; +} + +void be_add_missing_keeps_node(ir_node *node) +{ + int n_outs, i; + ir_mode *mode = get_irn_mode(node); + ir_node *last_keep; + + if (mode != mode_T) { + if (!has_real_user(node)) { + const arch_register_req_t *req = arch_get_irn_register_req(node); + const arch_register_class_t *cls = req->cls; + if (cls == NULL + || (cls->flags & arch_register_class_flag_manual_ra)) { + return; + } + + add_to_keep(NULL, cls, node); + } return; + } - n_outs = arch_irn_get_n_outs(node); + n_outs = arch_get_irn_n_outs(node); if (n_outs <= 0) return; - rbitset_alloca(found_projs, n_outs); + unsigned *const found_projs = rbitset_alloca(n_outs); + ir_node **const existing_projs = ALLOCANZ(ir_node*, n_outs); foreach_out_edge(node, edge) { ir_node *succ = get_edge_src_irn(edge); ir_mode *mode = get_irn_mode(succ); @@ -459,21 +445,21 @@ static void add_missing_keep_walker(ir_node *node, void *data) /* The node could be kept */ if (is_End(succ) || is_Anchor(succ)) continue; - if (mode == mode_M || mode == mode_X) continue; + pn = get_Proj_proj(succ); + existing_projs[pn] = succ; + if (!has_real_user(succ)) + continue; - pn = get_Proj_proj(succ); assert(pn < n_outs); rbitset_set(found_projs, pn); } - /* are keeps missing? */ last_keep = NULL; for (i = 0; i < n_outs; ++i) { - ir_node *block; - ir_node *in[1]; + ir_node *value; const arch_register_req_t *req; const arch_register_class_t *cls; @@ -481,25 +467,25 @@ static void add_missing_keep_walker(ir_node *node, void *data) continue; } - req = arch_get_out_register_req(node, i); + req = arch_get_irn_register_req_out(node, i); cls = req->cls; if (cls == NULL || (cls->flags & arch_register_class_flag_manual_ra)) { continue; } - block = get_nodes_block(node); - in[0] = new_r_Proj(node, arch_register_class_mode(cls), i); - if (last_keep != NULL) { - be_Keep_add_node(last_keep, cls, in[0]); - } else { - last_keep = be_new_Keep(block, 1, in); - if (sched_is_scheduled(node)) { - sched_add_after(node, last_keep); - } - } + value = existing_projs[i]; + if (value == NULL) + value = new_r_Proj(node, arch_register_class_mode(cls), i); + last_keep = add_to_keep(last_keep, cls, value); } } +static void add_missing_keep_walker(ir_node *node, void *data) +{ + (void)data; + be_add_missing_keeps_node(node); +} + void be_add_missing_keeps(ir_graph *irg) { irg_walk_graph(irg, add_missing_keep_walker, NULL, NULL); @@ -583,6 +569,7 @@ static int cmp_call_dependency(const void *c1, const void *c2) { const ir_node *n1 = *(const ir_node **) c1; const ir_node *n2 = *(const ir_node **) c2; + unsigned h1, h2; if (dependent_on(n1, n2)) return 1; @@ -591,7 +578,16 @@ static int cmp_call_dependency(const void *c1, const void *c2) return -1; /* The nodes have no depth order, but we need a total order because qsort() - * is not stable. */ + * is not stable. + * + * Additionally, we need to respect transitive dependencies. Consider a + * Call a depending on Call b and an independent Call c. + * We MUST NOT order c > a and b > c. */ + h1 = get_irn_height(heights, n1); + h2 = get_irn_height(heights, n2); + if (h1 < h2) return 1; + if (h1 > h2) return -1; + /* Same height, so use a random (but stable) order */ return get_irn_idx(n2) - get_irn_idx(n1); } @@ -600,11 +596,11 @@ static int cmp_call_dependency(const void *c1, const void *c2) */ static void process_ops_in_block(ir_node *block, void *data) { - ir_phase *phase = (ir_phase*)data; - unsigned n; - unsigned n_nodes; - ir_node *node; - ir_node **nodes; + ir_nodemap *map = (ir_nodemap*)data; + unsigned n; + unsigned n_nodes; + ir_node *node; + ir_node **nodes; n_nodes = 0; for (node = (ir_node*)get_irn_link(block); node != NULL; @@ -631,29 +627,114 @@ static void process_ops_in_block(ir_node *block, void *data) ir_node *node = nodes[n]; ir_node *pred = nodes[n-1]; - phase_set_irn_data(phase, node, pred); + ir_nodemap_insert(map, node, pred); } xfree(nodes); } -void be_collect_stacknodes(beabi_helper_env_t *env) + + +struct be_stackorder_t { + ir_nodemap stack_order; /**< a phase to handle stack dependencies. */ +}; + +be_stackorder_t *be_collect_stacknodes(ir_graph *irg) { - ir_graph *irg = env->irg; + be_stackorder_t *env = XMALLOCZ(be_stackorder_t); + + ir_reserve_resources(irg, IR_RESOURCE_IRN_LINK); /* collect all potential^stack accessing nodes */ irg_walk_graph(irg, firm_clear_link, link_ops_in_block_walker, NULL); - assert(env->stack_order == NULL); - env->stack_order = new_phase(irg, phase_irn_init_default); + ir_nodemap_init(&env->stack_order, irg); /* use heights to create a total order for those nodes: this order is stored * in the created phase */ heights = heights_new(irg); - irg_block_walk_graph(irg, NULL, process_ops_in_block, env->stack_order); + irg_block_walk_graph(irg, NULL, process_ops_in_block, &env->stack_order); heights_free(heights); + + ir_free_resources(irg, IR_RESOURCE_IRN_LINK); + + return env; +} + +ir_node *be_get_stack_pred(const be_stackorder_t *env, const ir_node *node) +{ + return ir_nodemap_get(ir_node, &env->stack_order, node); } -ir_node *be_get_stack_pred(const beabi_helper_env_t *env, const ir_node *node) +void be_free_stackorder(be_stackorder_t *env) { - return (ir_node*)phase_get_irn_data(env->stack_order, node); + ir_nodemap_destroy(&env->stack_order); + free(env); +} + +static void create_stores_for_type(ir_graph *irg, ir_type *type) +{ + size_t n = get_compound_n_members(type); + ir_node *frame = get_irg_frame(irg); + ir_node *initial_mem = get_irg_initial_mem(irg); + ir_node *mem = initial_mem; + ir_node *first_store = NULL; + ir_node *start_block = get_irg_start_block(irg); + ir_node *args = get_irg_args(irg); + size_t i; + + /* all parameter entities left in the frame type require stores. + * (The ones passed on the stack have been moved to the arg type) */ + for (i = 0; i < n; ++i) { + ir_entity *entity = get_compound_member(type, i); + ir_node *addr; + size_t arg; + if (!is_parameter_entity(entity)) + continue; + + arg = get_entity_parameter_number(entity); + if (arg == IR_VA_START_PARAMETER_NUMBER) + continue; + + addr = new_r_Sel(start_block, mem, frame, 0, NULL, entity); + if (entity->attr.parameter.doubleword_low_mode != NULL) { + ir_mode *mode = entity->attr.parameter.doubleword_low_mode; + ir_node *val0 = new_r_Proj(args, mode, arg); + ir_node *val1 = new_r_Proj(args, mode, arg+1); + ir_node *store0 = new_r_Store(start_block, mem, addr, val0, + cons_none); + ir_node *mem0 = new_r_Proj(store0, mode_M, pn_Store_M); + size_t offset = get_mode_size_bits(mode)/8; + ir_mode *addr_mode = get_irn_mode(addr); + ir_node *cnst = new_r_Const_long(irg, addr_mode, offset); + ir_node *next_addr = new_r_Add(start_block, addr, cnst, addr_mode); + ir_node *store1 = new_r_Store(start_block, mem0, next_addr, val1, + cons_none); + mem = new_r_Proj(store1, mode_M, pn_Store_M); + if (first_store == NULL) + first_store = store0; + } else { + ir_type *tp = get_entity_type(entity); + ir_mode *mode = is_compound_type(tp) ? mode_P : get_type_mode(tp); + ir_node *val = new_r_Proj(args, mode, arg); + ir_node *store = new_r_Store(start_block, mem, addr, val, cons_none); + mem = new_r_Proj(store, mode_M, pn_Store_M); + if (first_store == NULL) + first_store = store; + } + } + + if (mem != initial_mem) + edges_reroute_except(initial_mem, mem, first_store); +} + +void be_add_parameter_entity_stores(ir_graph *irg) +{ + ir_type *frame_type = get_irg_frame_type(irg); + be_stack_layout_t *layout = be_get_irg_stack_layout(irg); + ir_type *between_type = layout->between_type; + + create_stores_for_type(irg, frame_type); + if (between_type != NULL) { + create_stores_for_type(irg, between_type); + } }