X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Fircgcons.c;h=78df170a4fa117fa2052884d32b4294ebfb769f6;hb=169fd803ea2ed08171113c1fd7ab4e528e1ebc26;hp=abecbcdf5d1e50068687a1c7a2a89f4e2f7b74f2;hpb=b62b69d88a9ce077a88679643b888e3bed8da91c;p=libfirm diff --git a/ir/ir/ircgcons.c b/ir/ir/ircgcons.c index abecbcdf5..78df170a4 100644 --- a/ir/ir/ircgcons.c +++ b/ir/ir/ircgcons.c @@ -11,10 +11,13 @@ * Licence: This file protected by GPL - GNU GENERAL PUBLIC LICENSE. */ #ifdef HAVE_CONFIG_H -# include +# include "config.h" #endif +#ifdef HAVE_STRING_H #include +#endif + #include #include "ircgcons.h" @@ -26,7 +29,7 @@ #include "irgmod.h" #include "irgwalk.h" #include "irflag_t.h" - +#include "irtools.h" /* Return the current state of the interprocedural view. */ ip_view_state get_irp_ip_view_state(void) { @@ -53,8 +56,8 @@ typedef struct { } irg_data_t; static irg_data_t * irg_data_create(void) { - irg_data_t * data = xmalloc(sizeof(irg_data_t)); - memset(data, 0, sizeof(irg_data_t)); /* init */ + irg_data_t *data = xmalloc(sizeof(*data)); + memset(data, 0, sizeof(*data)); /* init */ return data; } @@ -82,23 +85,20 @@ static void caller_init(int arr_length, entity ** free_methods) { if (get_irn_op(call) != op_Call) continue; for (j = get_Call_n_callees(call) - 1; j >= 0; --j) { entity * ent = get_Call_callee(call, j); - if (ent) { + if (get_entity_irg(ent)) { irg_data_t * data = get_entity_link(ent); # ifndef CATE_jni assert(get_entity_irg(ent) && data); ++data->count; # endif /* ndef CATE_jni */ + } else { + set_entity_link(ent, NULL); } } } } } - -static INLINE void clear_link(ir_node * node, void * env) { - set_irn_link(node, NULL); -} - /* static INLINE ir_node * tail(ir_node * node) { ir_node * link; @@ -162,7 +162,7 @@ static void collect_phicallproj(void) { link(start, get_irg_frame(irg)); link(start, get_irg_globals(irg)); /* walk */ - irg_walk_graph(irg, clear_link, (irg_walk_func *) collect_phicallproj_walker, &end); + irg_walk_graph(irg, firm_clear_link, (irg_walk_func *) collect_phicallproj_walker, &end); } } @@ -445,7 +445,7 @@ static void move_nodes(ir_node * from_block, ir_node * to_block, ir_node * node) /* Abhängigkeiten vom Start-Block und den Filter-Operationen im * Start-Block auf den Aufrufer hinzufügen. */ static void construct_start(entity * caller, entity * callee, - ir_node * call, ir_node * exec) { + ir_node * call, ir_node * exec) { irg_data_t *data = get_entity_link(callee); ir_graph *irg = get_entity_irg(callee); ir_node *start = get_irg_start(irg); @@ -454,7 +454,7 @@ static void construct_start(entity * caller, entity * callee, assert(irg); assert(get_entity_peculiarity(callee) == peculiarity_existent); /* Else data is not initalized. */ assert((0 <= data->count) && - (data->count < get_Block_cg_n_cfgpreds(get_nodes_block(start)))); + (data->count < get_Block_cg_n_cfgpreds(get_nodes_block(start)))); set_Block_cg_cfgpred(get_nodes_block(start), data->count, exec); for (filter = get_irn_link(start); filter; filter = get_irn_link(filter)) { @@ -496,9 +496,9 @@ static void fill_mem(int length, irg_data_t * data[], ir_node * in[]) { for (i = 0; i < length; ++i) { if (data[i]) { /* explicit */ if (data[i]->reg) { - in[i] = data[i]->mem; + in[i] = data[i]->mem; } else { - in[i] = new_Bad(); + in[i] = new_Bad(); } } else { /* unknown */ in[i] = get_cg_Unknown(mode_M); @@ -514,9 +514,9 @@ static void fill_except_mem(int length, irg_data_t * data[], ir_node * in[]) { for (i = 0; i < length; ++i) { if (data[i]) { /* explicit */ if (data[i]->except) { - in[i] = data[i]->except_mem; + in[i] = data[i]->except_mem; } else { - in[i] = new_Bad(); + in[i] = new_Bad(); } } else { /* unknown */ in[i] = get_cg_Unknown(mode_M); @@ -532,9 +532,9 @@ static void fill_result(int pos, int length, irg_data_t * data[], ir_node * in[] for (i = 0; i < length; ++i) { if (data[i]) { /* explicit */ if (data[i]->reg) { - in[i] = data[i]->res[pos]; + in[i] = data[i]->res[pos]; } else { - in[i] = new_Bad(); + in[i] = new_Bad(); } } else { /* unknown */ in[i] = get_cg_Unknown(m); @@ -588,22 +588,29 @@ static bool is_outermost_graph(ir_graph *irg) { * Methoden auf die CallBegin-Operation, und von der Aufrufstelle auf die * aufgerufenen Methoden eintragen. */ static void construct_call(ir_node * call) { - int n_callees = get_Call_n_callees(call); - ir_node * post_block = get_nodes_block(call); /* block nach dem Aufruf */ - ir_node * pre_block = create_Block(get_Block_n_cfgpreds(post_block), - get_Block_cfgpred_arr(post_block)); /* block vor dem Aufruf (mit CallBegin) */ - ir_node * except_block = NULL, * proj; - ir_node * jmp = new_Break(); /* Sprung für intraprozedurale Darstellung (in - * pre_block) */ - ir_node * call_begin = new_CallBegin(call); /* (in pre_block) */ + int i, n_callees; + ir_node *post_block, *pre_block, *except_block, * proj, *jmp, *call_begin; + ir_node ** in; + entity * caller; + entity ** callees; + ir_graph ** irgs; + irg_data_t ** data; + + n_callees = get_Call_n_callees(call); + post_block = get_nodes_block(call); /* block nach dem Aufruf */ + pre_block = create_Block(get_Block_n_cfgpreds(post_block), + get_Block_cfgpred_arr(post_block)); /* block vor dem Aufruf (mit CallBegin) */ + except_block = NULL; + jmp = new_Break(); /* Sprung für intraprozedurale Darstellung (in * pre_block) */ + call_begin = new_CallBegin(call); /* (in pre_block) */ /* CallBegin might be entry to endless recursion. */ add_End_keepalive(get_irg_end(get_irn_irg(pre_block)), pre_block); - ir_node ** in = NEW_ARR_F(ir_node *, n_callees); - entity * caller = get_irg_entity(current_ir_graph); /* entity des aktuellen ir_graph */ - entity ** callees = NEW_ARR_F(entity *, n_callees); /* aufgerufene Methoden: entity */ - ir_graph ** irgs = NEW_ARR_F(ir_graph *, n_callees); /* aufgerufene Methoden: ir_graph */ - irg_data_t ** data = NEW_ARR_F(irg_data_t *, n_callees); /* aufgerufene Methoden: irg_data_t */ - int i; + + in = NEW_ARR_F(ir_node *, n_callees); + caller = get_irg_entity(current_ir_graph); /* entity des aktuellen ir_graph */ + callees = NEW_ARR_F(entity *, n_callees); /* aufgerufene Methoden: entity */ + irgs = NEW_ARR_F(ir_graph *, n_callees); /* aufgerufene Methoden: ir_graph */ + data = NEW_ARR_F(irg_data_t *, n_callees); /* aufgerufene Methoden: irg_data_t */ /* post_block kann bereits interprozedurale Steuerflussvorgänger * besitzen. Diese müssen dann auch noch für den pre_block gesetzt werden. */ @@ -621,8 +628,11 @@ static void construct_call(ir_node * call) { /* Wiederverwendete Daten initialisieren. */ for (i = 0; i < n_callees; ++i) { callees[i] = get_Call_callee(call, i); - irgs[i] = callees[i] ? get_entity_irg(callees[i]) : NULL; + irgs[i] = get_entity_irg(callees[i]); data[i] = get_entity_link(callees[i]); + /* Only entities that have an irg got a irg_data data structure. + In others there is some arbitrary garbage in the link field. */ + if (!irgs[i]) { assert(!data[i]); data[i] = NULL; } } /* @@ -636,10 +646,10 @@ static void construct_call(ir_node * call) { for (i = 0; i < n_callees; ++i) { if (data[i]) { /* explicit */ if (data[i]->reg) { - in[i] = new_r_Proj(irgs[i], get_nodes_block(data[i]->reg), - data[i]->reg, mode_X, data[i]->count); + in[i] = new_r_Proj(irgs[i], get_nodes_block(data[i]->reg), + data[i]->reg, mode_X, data[i]->count); } else { - in[i] = new_Bad(); + in[i] = new_Bad(); } } else { /* unknown */ in[i] = get_cg_Unknown(mode_X); @@ -656,18 +666,17 @@ static void construct_call(ir_node * call) { bool exc_to_end = false; if (exc_branches_to_end(current_ir_graph, proj)) { /* The Call aborts the procedure if it returns with an exception. - If this is an outermost procedure, the normal handling of exceptions - will generate a Break that goes to the end block. This is illegal - Frim. So directly branch to the end block with all exceptions. */ + If this is an outermost procedure, the normal handling of exceptions + will generate a Break that goes to the end block. This is illegal + Frim. So directly branch to the end block with all exceptions. */ exc_to_end = true; if (is_outermost_graph(current_ir_graph)) { - except_block = get_irg_end_block(current_ir_graph); + except_block = get_irg_end_block(current_ir_graph); } else { - irg_data_t * tmp_data = get_entity_link(get_irg_entity(current_ir_graph)); - except_block = get_nodes_block(tmp_data->except); + irg_data_t * tmp_data = get_entity_link(get_irg_entity(current_ir_graph)); + except_block = get_nodes_block(tmp_data->except); } - } else - { + } else { except_block = create_Block(1, &proj); set_nodes_block(proj, except_block); exchange(proj, new_Break()); @@ -685,14 +694,14 @@ static void construct_call(ir_node * call) { for (i = 0; i < n_callees; ++i) { entity * callee = get_Call_callee(call, i); if (data[i]) { /* explicit */ - if (data[i]->except) { - in[i] = new_r_Proj(get_entity_irg(callee), get_nodes_block(data[i]->except), - data[i]->except, mode_X, data[i]->count); - } else { - in[i] = new_Bad(); - } + if (data[i]->except) { + in[i] = new_r_Proj(get_entity_irg(callee), get_nodes_block(data[i]->except), + data[i]->except, mode_X, data[i]->count); + } else { + in[i] = new_Bad(); + } } else { /* unknown */ - in[i] = get_cg_Unknown(mode_X); + in[i] = get_cg_Unknown(mode_X); } } @@ -701,14 +710,14 @@ static void construct_call(ir_node * call) { /* append all existing preds of the end block to new in array. * Normal access routine guarantees that with first visit we * get the normal preds, and from then on the _cg_ preds. - * (interporcedural view is set!) + * (interprocedural view is set!) * Do not add the exc pred of end we are replacing! */ for (i = get_Block_n_cfgpreds(except_block)-1; i >= 0; --i) { - ir_node *pred = get_Block_cfgpred(except_block, i); - if (pred != proj) { - ARR_APP1(ir_node *, in, pred); - preds++; - } + ir_node *pred = get_Block_cfgpred(except_block, i); + if (pred != proj) { + ARR_APP1(ir_node *, in, pred); + preds++; + } } } set_Block_cg_cfgpred_arr(except_block, preds, in); @@ -719,7 +728,8 @@ static void construct_call(ir_node * call) { * eintragen. */ set_irg_current_block(current_ir_graph, pre_block); for (i = 0; i < n_callees; ++i) { - construct_start(caller, callees[i], call, new_Proj(call_begin, mode_X, i)); + if (irgs[i]) /* Else there is not graph to call */ + construct_start(caller, callees[i], call, new_Proj(call_begin, mode_X, i)); } /* Proj-Operationen in Filter-Operationen umwandeln und @@ -729,39 +739,39 @@ static void construct_call(ir_node * call) { if (get_irn_op(proj) != op_Proj) continue; if (skip_Proj(get_Proj_pred(proj)) != call) continue; if (get_Proj_pred(proj) == call) { - if (get_Proj_proj(proj) == 0) { /* memory */ - ir_node * filter; - - set_nodes_block(proj, post_block); - filter = exchange_proj(proj); - /* filter in die Liste der Phis aufnehmen */ - if (get_irn_link(filter) == NULL) { /* note CSE */ - set_irn_link(filter, get_irn_link(post_block)); - set_irn_link(post_block, filter); - } - fill_mem(n_callees, data, in); - set_Filter_cg_pred_arr(filter, n_callees, in); - } else if (get_Proj_proj(proj) == 1) { /* except */ - /* nothing: siehe oben */ - } else if (get_Proj_proj(proj) == 2) { /* results */ - /* nothing */ - } else if (get_Proj_proj(proj) == 3) { /* except_mem */ + if (get_Proj_proj(proj) == pn_Call_M_regular) { /* memory */ + ir_node * filter; + + set_nodes_block(proj, post_block); + filter = exchange_proj(proj); + /* filter in die Liste der Phis aufnehmen */ + if (get_irn_link(filter) == NULL) { /* note CSE */ + set_irn_link(filter, get_irn_link(post_block)); + set_irn_link(post_block, filter); + } + fill_mem(n_callees, data, in); + set_Filter_cg_pred_arr(filter, n_callees, in); + } else if (get_Proj_proj(proj) == pn_Call_X_except) { /* except */ + /* nothing: siehe oben */ + } else if (get_Proj_proj(proj) == pn_Call_T_result) { /* results */ + /* nothing */ + } else if (get_Proj_proj(proj) == pn_Call_M_except) { /* except_mem */ ir_node * filter; - set_nodes_block(proj, post_block); - assert(except_block); - set_irg_current_block(current_ir_graph, except_block); - filter = exchange_proj(proj); - /* filter in die Liste der Phis aufnehmen */ - if (get_irn_link(filter) == NULL) { /* note CSE */ - set_irn_link(filter, get_irn_link(except_block)); - set_irn_link(except_block, filter); - } - set_irg_current_block(current_ir_graph, post_block); - fill_except_mem(n_callees, data, in); - set_Filter_cg_pred_arr(filter, n_callees, in); + set_nodes_block(proj, post_block); + assert(except_block); + set_irg_current_block(current_ir_graph, except_block); + filter = exchange_proj(proj); + /* filter in die Liste der Phis aufnehmen */ + if (get_irn_link(filter) == NULL) { /* note CSE */ + set_irn_link(filter, get_irn_link(except_block)); + set_irn_link(except_block, filter); + } + set_irg_current_block(current_ir_graph, post_block); + fill_except_mem(n_callees, data, in); + set_Filter_cg_pred_arr(filter, n_callees, in); } else { - assert(0 && "not reached"); + assert(0 && "not reached"); } } else { /* result */ ir_node * filter; @@ -771,8 +781,8 @@ static void construct_call(ir_node * call) { filter = exchange_proj(proj); /* filter in die Liste der Phis aufnehmen */ if (get_irn_link(filter) == NULL) { /* not CSE */ - set_irn_link(filter, get_irn_link(post_block)); - set_irn_link(post_block, filter); + set_irn_link(filter, get_irn_link(post_block)); + set_irn_link(post_block, filter); } fill_result(get_Proj_proj(filter), n_callees, data, in, get_irn_mode(filter)); set_Filter_cg_pred_arr(filter, n_callees, in); @@ -818,15 +828,16 @@ void cg_construct(int arr_len, entity ** free_methods_arr) { /* construct calls */ for (i = get_irp_n_irgs() - 1; i >= 0; --i) { ir_node * node; - int n_callees; current_ir_graph = get_irp_irg(i); for (node = get_irn_link(get_irg_end(current_ir_graph)); node; node = get_irn_link(node)) { if (get_irn_op(node) == op_Call) { - n_callees = get_Call_n_callees(node); - if (n_callees > 1 || (n_callees == 1 && get_Call_callee(node, 0) != NULL)) { + int j, n_callees = get_Call_n_callees(node); + for (j = 0; j < n_callees; ++j) + if (get_entity_irg(get_Call_callee(node, j))) + break; + if (j < n_callees) /* There is an entity with a graph */ construct_call(node); - } } } } @@ -844,7 +855,9 @@ void cg_construct(int arr_len, entity ** free_methods_arr) { static void destruct_walker(ir_node * node, void * env) { if (get_irn_op(node) == op_Block) { remove_Block_cg_cfgpred_arr(node); - /* Do not turn Break into Jmp. Better: merge blocks right away. */ + /* Do not turn Break into Jmp. Better: merge blocks right away. + Well, but there are Breaks left. + See exc1 from ajacs-rts/Exceptions.java. */ if (get_Block_n_cfgpreds(node) == 1) { ir_node *pred = get_Block_cfgpred(node, 0); if (get_irn_op(pred) == op_Break) @@ -854,12 +867,12 @@ static void destruct_walker(ir_node * node, void * env) { set_irg_current_block(current_ir_graph, get_nodes_block(node)); exchange(node, new_Proj(get_Filter_pred(node), get_irn_mode(node), get_Filter_proj(node))); } else if (get_irn_op(node) == op_Break) { - //set_irg_current_block(current_ir_graph, get_nodes_block(node)); - //exchange(node, new_Jmp()); + set_irg_current_block(current_ir_graph, get_nodes_block(node)); + exchange(node, new_Jmp()); } else if (get_irn_op(node) == op_Call) { remove_Call_callee_arr(node); } else if (get_irn_op(node) == op_Proj) { - /* some ProjX end up in strage blocks. */ + /* some ProjX end up in strange blocks. */ set_nodes_block(node, get_nodes_block(get_Proj_pred(node))); } } @@ -870,14 +883,17 @@ void cg_destruct(void) { if (get_irp_ip_view_state() != ip_view_no) { for (i = get_irp_n_irgs() - 1; i >= 0; --i) { ir_graph * irg = get_irp_irg(i); - irg_walk_graph(irg, destruct_walker, clear_link, NULL); - set_irg_frame(irg, skip_Id(get_irg_frame(irg))); - set_irg_globals(irg, skip_Id(get_irg_globals(irg))); + irg_walk_graph(irg, destruct_walker, firm_clear_link, NULL); + + set_irg_frame (irg, skip_Id(get_irg_frame(irg))); + set_irg_globals (irg, skip_Id(get_irg_globals(irg))); set_irg_initial_mem(irg, skip_Id(get_irg_initial_mem(irg))); + set_irg_end_reg (irg, get_irg_end(irg)); + set_irg_end_except (irg, get_irg_end(irg)); + set_irg_callee_info_state(irg, irg_callee_info_none); - set_irg_end_reg(irg, get_irg_end(irg)); - set_irg_end_except(irg, get_irg_end(irg)); } + set_irp_ip_view(ip_view_no); } }