X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=ir%2Fbe%2Fbeabihelper.c;h=adfc77429f930382dba9206754b0c50a5b0f892d;hb=3c3425a50a1d721b74a015c6812257e32feeac85;hp=c5f95551f25456b10dafa1daa4f3325bb7321a23;hpb=fedd1b41af2db9492f9b9d0626b6db560288a63e;p=libfirm diff --git a/ir/be/beabihelper.c b/ir/be/beabihelper.c index c5f95551f..adfc77429 100644 --- a/ir/be/beabihelper.c +++ b/ir/be/beabihelper.c @@ -22,7 +22,6 @@ * @brief Helper functions for handling ABI constraints in the code * selection phase. * @author Matthias Braun - * @version $Id$ */ #include "config.h" @@ -33,7 +32,8 @@ #include "ircons.h" #include "iredges.h" #include "irgwalk.h" -#include "irphase_t.h" +#include "irnodemap.h" +#include "irtools.h" #include "heights.h" /** @@ -383,7 +383,6 @@ ir_node *be_epilog_create_return(beabi_helper_env_t *env, dbg_info *dbgi, */ static bool has_real_user(const ir_node *node) { - const ir_edge_t *edge; foreach_out_edge(node, edge) { ir_node *user = get_edge_src_irn(edge); if (!is_End(user) && !is_Anchor(user)) @@ -411,15 +410,14 @@ static ir_node *add_to_keep(ir_node *last_keep, return last_keep; } -static void add_missing_keep_walker(ir_node *node, void *data) +void be_add_missing_keeps_node(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; - ir_node **existing_projs; - (void) data; + int n_outs, i; + unsigned *found_projs; + ir_mode *mode = get_irn_mode(node); + ir_node *last_keep; + ir_node **existing_projs; + if (mode != mode_T) { if (!has_real_user(node)) { const arch_register_req_t *req = arch_get_irn_register_req(node); @@ -483,6 +481,12 @@ static void add_missing_keep_walker(ir_node *node, void *data) } } +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); @@ -582,10 +586,10 @@ static int cmp_call_dependency(const void *c1, const void *c2) * 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; + if (h1 < h2) return 1; + if (h1 > h2) return -1; /* Same height, so use a random (but stable) order */ - return get_irn_idx(n1) - get_irn_idx(n2); + return get_irn_idx(n2) - get_irn_idx(n1); } /** @@ -593,11 +597,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; @@ -624,7 +628,7 @@ 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); } @@ -632,7 +636,7 @@ static void process_ops_in_block(ir_node *block, void *data) struct be_stackorder_t { - ir_phase *stack_order; /**< a phase to handle stack dependencies. */ + ir_nodemap stack_order; /**< a phase to handle stack dependencies. */ }; be_stackorder_t *be_collect_stacknodes(ir_graph *irg) @@ -644,13 +648,12 @@ be_stackorder_t *be_collect_stacknodes(ir_graph *irg) /* 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); @@ -660,19 +663,18 @@ be_stackorder_t *be_collect_stacknodes(ir_graph *irg) ir_node *be_get_stack_pred(const be_stackorder_t *env, const ir_node *node) { - return (ir_node*)phase_get_irn_data(env->stack_order, node); + return ir_nodemap_get(ir_node, &env->stack_order, node); } void be_free_stackorder(be_stackorder_t *env) { - phase_free(env->stack_order); + ir_nodemap_destroy(&env->stack_order); free(env); } -void be_add_parameter_entity_stores(ir_graph *irg) +static void create_stores_for_type(ir_graph *irg, ir_type *type) { - ir_type *frame_type = get_irg_frame_type(irg); - size_t n = get_compound_n_members(frame_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; @@ -684,7 +686,7 @@ void be_add_parameter_entity_stores(ir_graph *irg) /* 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(frame_type, i); + ir_entity *entity = get_compound_member(type, i); ir_node *addr; size_t arg; if (!is_parameter_entity(entity)) @@ -713,7 +715,7 @@ void be_add_parameter_entity_stores(ir_graph *irg) first_store = store0; } else { ir_type *tp = get_entity_type(entity); - ir_mode *mode = get_type_mode(tp); + 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); @@ -727,3 +729,15 @@ void be_add_parameter_entity_stores(ir_graph *irg) set_Store_mem(first_store, initial_mem); } } + +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); + } +}