X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Fircgcons.c;h=4d47d2fd293fe8afac75c04affd3fe0dddb09324;hb=e570f00fb465d212dde403160e97ab45d36d1d7e;hp=4e6f2cdd78a05380f8b1c5e01e7719899106d535;hpb=071a25888579c12f2975cec66c844e043ab9a8e9;p=libfirm diff --git a/ir/ir/ircgcons.c b/ir/ir/ircgcons.c index 4e6f2cdd7..4d47d2fd2 100644 --- a/ir/ir/ircgcons.c +++ b/ir/ir/ircgcons.c @@ -10,7 +10,9 @@ * Copyright: (c) 2002-2003 Universität Karlsruhe * Licence: This file protected by GPL - GNU GENERAL PUBLIC LICENSE. */ - +#ifdef HAVE_CONFIG_H +# include +#endif #include #include @@ -21,25 +23,25 @@ #include "ircons.h" #include "irgmod.h" #include "irgwalk.h" -#include "irflag.h" +#include "irflag_t.h" + +// # define CATE_jni /* Datenstruktur für jede Methode */ typedef struct { - int count; + int count; /* GL: anzahl aufrufer */ bool open; /* offene Methode (mit unbekanntem Aufrufer) */ ir_node * reg, * mem, ** res; /* EndReg, Mem und Rückgabewerte */ ir_node * except, * except_mem; /* EndExcept und Mem für Ausnahmeabbruch */ } 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 */ return data; } - /* Die Anzahl der Aufrufer jeder Methode zählen (irg_data_t->count), und die * offenen Methoden (mit unbekannten Vorgänger) markieren. */ static void caller_init(int arr_length, entity ** free_methods) { @@ -61,8 +63,10 @@ static void caller_init(int arr_length, entity ** free_methods) { entity * ent = get_Call_callee(call, j); if (ent) { irg_data_t * data = get_entity_link(ent); +# ifndef CATE_jni assert(get_entity_irg(ent) && data); ++data->count; +# endif /* ndef CATE_jni */ } } } @@ -147,7 +151,6 @@ static ir_node * exchange_proj(ir_node * proj) { ir_node * filter; assert(get_irn_op(proj) == op_Proj); filter = new_Filter(get_Proj_pred(proj), get_irn_mode(proj), get_Proj_proj(proj)); - assert(get_Proj_proj(proj) == get_Filter_proj(filter)); /* XXX:SID */ /* Die Proj- (Id-) Operation sollte im gleichen Grundblock stehen, wie die * Filter-Operation. */ set_nodes_Block(proj, get_nodes_Block(filter)); @@ -159,7 +162,7 @@ static ir_node * exchange_proj(ir_node * proj) { /* Echt neue Block-Operation erzeugen. CSE abschalten! */ static ir_node * create_Block(int n, ir_node ** in) { /* Turn off optimizations so that blocks are not merged again. */ - int rem_opt = get_optimize(); + int rem_opt = get_opt_optimize(); ir_node * block; set_optimize(0); block = new_Block(n, in); @@ -172,6 +175,18 @@ static void prepare_irg_end(ir_graph * irg, irg_data_t * data); static void prepare_irg_end_except(ir_graph * irg, irg_data_t * data); +/* If we use new_Unknown we get the Unknown of a graph. This can + * cause cycles we don't want to see, as Unknwon is in the Start Block + * or the procedure. Use unknown of outermost irg where the start + * block has no predecessors. */ +static INLINE ir_node *get_cg_Unknown(ir_mode *m) { + assert((get_Block_n_cfgpreds(get_irg_start_block(get_irp_main_irg())) == 1) && + (get_nodes_block(get_Block_cfgpred(get_irg_start_block(get_irp_main_irg()), 0)) == + get_irg_start_block(get_irp_main_irg()))); + return new_r_Unknown(get_irp_main_irg(), m); +} + + /* IRG vorbereiten. Proj-Operationen der Start-Operation in Filter-Operationen * umwandeln. Die künstlichen Steuerzusammenflüsse EndReg und EndExcept * einfügen. An der Start-Operation hängt nach dem Aufruf eine Liste der @@ -221,10 +236,10 @@ static void prepare_irg(ir_graph * irg, irg_data_t * data) { /* Unbekannten Aufrufer sofort eintragen. */ if (data->open) { - set_Block_cg_cfgpred(start_block, 0, new_Unknown()); + set_Block_cg_cfgpred(start_block, 0, get_cg_Unknown(mode_X)); for (proj = get_irn_link(get_irg_start(irg)); proj; proj = get_irn_link(proj)) { if (get_irn_op(proj) == op_Filter) { - set_Filter_cg_pred(proj, 0, new_Unknown()); + set_Filter_cg_pred(proj, 0, get_cg_Unknown(get_irn_mode(proj))); } } data->count = 1; @@ -239,12 +254,13 @@ static void prepare_irg(ir_graph * irg, irg_data_t * data) { /* Künstlicher Steuerzusammenfluss EndReg einfügen. */ static void prepare_irg_end(ir_graph * irg, irg_data_t * data) { - ir_node * end_block = get_irg_end_block(irg); - ir_node * end = get_irg_end(irg); - ir_node ** ret_arr = NULL; + ir_node * end_block = get_irg_end_block(irg); + ir_node * end = get_irg_end(irg); + ir_node **ret_arr = NULL; + ir_node **cfgpred_arr = get_Block_cfgpred_arr(end_block); int i, j; int n_ret = 0; - ir_node ** cfgpred_arr = get_Block_cfgpred_arr(end_block); + for (i = get_Block_n_cfgpreds(end_block) - 1; i >= 0; --i) { if (get_irn_op(cfgpred_arr[i]) == op_Return) { if (ret_arr) { @@ -256,26 +272,31 @@ static void prepare_irg_end(ir_graph * irg, irg_data_t * data) { ++n_ret; } } + if (n_ret > 0) { int n_res = get_method_n_ress(get_entity_type(get_irg_ent(irg))); ir_node ** in = NEW_ARR_F(ir_node *, n_ret); + /* block */ for (i = n_ret - 1; i >= 0; --i) { set_irg_current_block(irg, get_nodes_Block(ret_arr[i])); in[i] = new_Jmp(); } create_Block(n_ret, in); + /* end */ data->reg = new_EndReg(); + /* mem */ for (i = n_ret - 1; i >= 0; --i) { in[i] = get_Return_mem(ret_arr[i]); } data->mem = new_Phi(n_ret, in, mode_M); - /* This Phi is a merge, therefor needs not be kept alive. + /* This Phi is a merge, therefore needs not be kept alive. It might be optimized away, though. */ if (get_End_keepalive(end, get_End_n_keepalives(end)-1 ) == data->mem) set_End_keepalive(end, get_End_n_keepalives(end)-1, new_Bad()); + /* res */ data->res = NEW_ARR_F(ir_node *, n_res); for (j = n_res - 1; j >= 0; --j) { @@ -291,8 +312,10 @@ static void prepare_irg_end(ir_graph * irg, irg_data_t * data) { else /* All preds are Bad */ data->res[j] = new_Bad(); } + DEL_ARR_F(in); } + if (ret_arr) DEL_ARR_F(ret_arr); } @@ -373,9 +396,12 @@ static void move_phis(ir_node * from_block, ir_node * to_block) { /* Rekursiv die Operation "node" und alle ihre Vorgänger aus dem Block - * "from_block" nach "to_block" verschieben. */ + * "from_block" nach "to_block" verschieben. + * Verschiebe ebenfalls die Projs aus diesen Operationen. */ static void move_nodes(ir_node * from_block, ir_node * to_block, ir_node * node) { int i; + ir_node *proj; + for (i = get_irn_arity(node) - 1; i >= 0; --i) { ir_node * pred = get_irn_n(node, i); if (get_nodes_Block(pred) == from_block) { @@ -383,6 +409,14 @@ static void move_nodes(ir_node * from_block, ir_node * to_block, ir_node * node) } } set_nodes_Block(node, to_block); + + /* Move projs of this node. */ + proj = get_irn_link(node); + for (; proj; proj = skip_Id(get_irn_link(proj))) { + if (get_irn_op(proj) != op_Proj && get_irn_op(proj) != op_Filter) continue; + if ((get_nodes_Block(proj) == from_block) && (skip_Proj(get_irn_n(proj, 0)) == node)) + set_nodes_Block(proj, to_block); + } } @@ -390,14 +424,16 @@ static void move_nodes(ir_node * from_block, ir_node * to_block, ir_node * node) * Start-Block auf den Aufrufer hinzufügen. */ static void construct_start(entity * caller, entity * callee, 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), * filter; + irg_data_t *data = get_entity_link(callee); + ir_graph *irg = get_entity_irg(callee); + ir_node *start = get_irg_start(irg); + ir_node *filter; 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)))); + set_Block_cg_cfgpred(get_nodes_Block(start), data->count, exec); for (filter = get_irn_link(start); filter; filter = get_irn_link(filter)) { if (get_irn_op(filter) != op_Filter) continue; @@ -410,13 +446,13 @@ static void construct_start(entity * caller, entity * callee, /* "frame_base" wird nur durch Unknown dargestellt. Man kann ihn aber * auch explizit darstellen, wenn sich daraus Vorteile für die * Datenflussanalyse ergeben. */ - set_Filter_cg_pred(filter, data->count, new_Unknown()); + set_Filter_cg_pred(filter, data->count, get_cg_Unknown(get_irn_mode(filter))); break; case pns_globals: /* "globals" wird nur durch Unknown dargestellt. Man kann ihn aber auch * explizit darstellen, wenn sich daraus Vorteile für die * Datenflussanalyse ergeben. */ - set_Filter_cg_pred(filter, data->count, new_Unknown()); + set_Filter_cg_pred(filter, data->count, get_cg_Unknown(get_irn_mode(filter))); break; default: /* not reached */ @@ -443,7 +479,7 @@ static void fill_mem(int length, irg_data_t * data[], ir_node * in[]) { in[i] = new_Bad(); } } else { /* unknown */ - in[i] = new_Unknown(); + in[i] = get_cg_Unknown(mode_M); } } } @@ -461,7 +497,7 @@ static void fill_except_mem(int length, irg_data_t * data[], ir_node * in[]) { in[i] = new_Bad(); } } else { /* unknown */ - in[i] = new_Unknown(); + in[i] = get_cg_Unknown(mode_M); } } } @@ -469,7 +505,7 @@ static void fill_except_mem(int length, irg_data_t * data[], ir_node * in[]) { /* Abhängigkeiten für ein Ergebnis über alle aufgerufenen Methoden * bestimmen. */ -static void fill_result(int pos, int length, irg_data_t * data[], ir_node * in[]) { +static void fill_result(int pos, int length, irg_data_t * data[], ir_node * in[], ir_mode *m) { int i; for (i = 0; i < length; ++i) { if (data[i]) { /* explicit */ @@ -479,7 +515,7 @@ static void fill_result(int pos, int length, irg_data_t * data[], ir_node * in[] in[i] = new_Bad(); } } else { /* unknown */ - in[i] = new_Unknown(); + in[i] = get_cg_Unknown(m); } } } @@ -556,8 +592,6 @@ static void construct_call(ir_node * call) { /* Operationen verschieben */ move_phis(post_block, pre_block); move_nodes(post_block, pre_block, call); - /* @@@ GL Wer setzt die Laenge des PostBlock cgfpred array auf 1? - GL: na, dieser Befehl... generiert neuen array. */ set_irn_in(post_block, 1, &jmp); /* Wiederverwendete Daten initialisieren. */ @@ -584,7 +618,7 @@ static void construct_call(ir_node * call) { in[i] = new_Bad(); } } else { /* unknown */ - in[i] = new_Unknown(); + in[i] = get_cg_Unknown(mode_X); } } set_interprocedural_view(0); @@ -596,7 +630,6 @@ static void construct_call(ir_node * call) { if ((proj = get_except(call)) != NULL) { int preds = 0; bool exc_to_end = false; -#if 1 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 @@ -606,11 +639,10 @@ static void construct_call(ir_node * call) { if (is_outermost_graph(current_ir_graph)) { except_block = get_irg_end_block(current_ir_graph); } else { - irg_data_t * data = get_entity_link(get_irg_ent(current_ir_graph)); - except_block = get_nodes_block(data->except); + irg_data_t * tmp_data = get_entity_link(get_irg_ent(current_ir_graph)); + except_block = get_nodes_block(tmp_data->except); } } else -#endif { except_block = create_Block(1, &proj); set_nodes_Block(proj, except_block); @@ -636,7 +668,7 @@ static void construct_call(ir_node * call) { in[i] = new_Bad(); } } else { /* unknown */ - in[i] = new_Unknown(); + in[i] = get_cg_Unknown(mode_X); } } @@ -669,11 +701,15 @@ static void construct_call(ir_node * call) { /* Proj-Operationen in Filter-Operationen umwandeln und * interprozedurale Vorgänger einfügen. */ set_irg_current_block(current_ir_graph, post_block); - for (proj = get_irn_link(call); proj && get_irn_op(proj) == op_Proj; proj = get_irn_link(proj)) { + for (proj = get_irn_link(call); proj; proj = get_irn_link(proj)) { + 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 */ - /* memory */ - ir_node * filter = exchange_proj(proj); + 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)); @@ -684,10 +720,11 @@ static void construct_call(ir_node * call) { } else if (get_Proj_proj(proj) == 1) { /* except */ /* nothing: siehe oben */ } else if (get_Proj_proj(proj) == 2) { /* results */ - set_nodes_Block(proj, pre_block); + /* nothing */ } else if (get_Proj_proj(proj) == 3) { /* except_mem */ - /* except_mem */ - ir_node * filter; + 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); @@ -702,15 +739,18 @@ static void construct_call(ir_node * call) { } else { assert(0 && "not reached"); } - } else { - /* result */ - ir_node * filter = exchange_proj(proj); + } else { /* result */ + ir_node * filter; + + assert(is_Proj(get_Proj_pred(proj)) && get_Proj_pred(get_Proj_pred(proj)) == call); + 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 */ + if (get_irn_link(filter) == NULL) { /* not CSE */ 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); + fill_result(get_Proj_proj(filter), n_callees, data, in, get_irn_mode(filter)); set_Filter_cg_pred_arr(filter, n_callees, in); } } @@ -796,5 +836,6 @@ void cg_destruct(void) { irg_walk_graph(irg, destruct_walker, clear_link, NULL); set_irg_frame(irg, skip_nop(get_irg_frame(irg))); set_irg_globals(irg, skip_nop(get_irg_globals(irg))); + set_irg_callee_info_state(irg, irg_callee_info_none); } }