X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Fircons.c;h=02903caa7397b62ccf6669eb5f22979912e2d1dd;hb=b78bdd4d94de46de4156272e6dbfe44e97933a5b;hp=8252ee661d3d0d8cce81a3a5fbc244df827f8dbe;hpb=d9cea2827cb2fa616cbd7d0770c9f9f7146fb6a5;p=libfirm diff --git a/ir/ir/ircons.c b/ir/ir/ircons.c index 8252ee661..02903caa7 100644 --- a/ir/ir/ircons.c +++ b/ir/ir/ircons.c @@ -16,29 +16,30 @@ #endif #ifdef HAVE_ALLOCA_H -#include +# include #endif #ifdef HAVE_MALLOC_H -#include +# include #endif #ifdef HAVE_STRING_H -#include +# include #endif -# include "irprog_t.h" -# include "irgraph_t.h" -# include "irnode_t.h" -# include "irmode_t.h" -# include "ircons_t.h" -# include "firm_common_t.h" -# include "irvrfy.h" -# include "irop_t.h" -# include "iropt_t.h" -# include "irgmod.h" -# include "array.h" -# include "irbackedge_t.h" -# include "irflag_t.h" -# include "iredges_t.h" +#include "irprog_t.h" +#include "irgraph_t.h" +#include "irnode_t.h" +#include "irmode_t.h" +#include "ircons_t.h" +#include "firm_common_t.h" +#include "irvrfy.h" +#include "irop_t.h" +#include "iropt_t.h" +#include "irgmod.h" +#include "array.h" +#include "irbackedge_t.h" +#include "irflag_t.h" +#include "iredges_t.h" +#include "irflag_t.h" #if USE_EXPLICIT_PHI_IN_STACK /* A stack needed for the automatic Phi node construction in constructor @@ -164,7 +165,7 @@ new_d_##instr (dbg_info *db, ir_node *op1, ir_node *op2, ir_mode *mode) { \ #define NEW_D_UNOP(instr) \ ir_node * \ new_d_##instr (dbg_info *db, ir_node *op, ir_mode *mode) { \ - return new_bd_Minus(db, current_ir_graph->current_block, op, mode); \ + return new_bd_##instr(db, current_ir_graph->current_block, op, mode); \ } @@ -250,7 +251,7 @@ new_bd_Phi (dbg_info *db, ir_node *block, int arity, ir_node **in, ir_mode *mode /* Memory Phis in endless loops must be kept alive. As we can't distinguish these easily we keep all of them alive. */ if ((res->op == op_Phi) && (mode == mode_M)) - add_End_keepalive(irg->end, res); + add_End_keepalive(get_irg_end(irg), res); return res; } @@ -260,7 +261,7 @@ new_bd_Const_type (dbg_info *db, ir_node *block, ir_mode *mode, tarval *con, ir_ ir_node *res; ir_graph *irg = current_ir_graph; - res = new_ir_node (db, irg, irg->start_block, op_Const, mode, 0, NULL); + res = new_ir_node (db, irg, get_irg_start_block(irg), op_Const, mode, 0, NULL); res->attr.con.tv = con; set_Const_type(res, tp); /* Call method because of complex assertion. */ res = optimize_node (res); @@ -629,13 +630,13 @@ new_bd_SymConst (dbg_info *db, ir_node *block, symconst_symbol value, } static ir_node * -new_bd_Sync (dbg_info *db, ir_node *block, int arity, ir_node **in) +new_bd_Sync (dbg_info *db, ir_node *block) { ir_node *res; ir_graph *irg = current_ir_graph; - res = new_ir_node(db, irg, block, op_Sync, mode_M, arity, in); - res = optimize_node(res); + res = new_ir_node(db, irg, block, op_Sync, mode_M, -1, NULL); + /* no need to call optimize node here, Sync are always created with no predecessors */ IRN_VRFY_IRG(res, irg); return res; } @@ -662,7 +663,7 @@ new_bd_Unknown (ir_mode *m) ir_node *res; ir_graph *irg = current_ir_graph; - res = new_ir_node(NULL, irg, irg->start_block, op_Unknown, m, 0, NULL); + res = new_ir_node(NULL, irg, get_irg_start_block(irg), op_Unknown, m, 0, NULL); res = optimize_node(res); return res; } @@ -690,7 +691,7 @@ new_bd_EndReg (dbg_info *db, ir_node *block) ir_graph *irg = current_ir_graph; res = new_ir_node(db, irg, block, op_EndReg, mode_T, -1, NULL); - irg->end_reg = res; + set_irg_end_reg(irg, res); IRN_VRFY_IRG(res, irg); return res; } @@ -702,7 +703,7 @@ new_bd_EndExcept (dbg_info *db, ir_node *block) ir_graph *irg = current_ir_graph; res = new_ir_node(db, irg, block, op_EndExcept, mode_T, -1, NULL); - irg->end_except = res; + set_irg_end_except(irg, res); IRN_VRFY_IRG (res, irg); return res; } @@ -760,6 +761,31 @@ new_bd_Mux (dbg_info *db, ir_node *block, return res; } +static ir_node * +new_bd_Psi (dbg_info *db, ir_node *block, + int arity, ir_node *cond[], ir_node *vals[], ir_mode *mode) +{ + ir_node **in; + ir_node *res; + ir_graph *irg = current_ir_graph; + int i; + + NEW_ARR_A(ir_node *, in, 2 * arity + 1); + + for (i = 0; i < arity; ++i) { + in[2 * i] = cond[i]; + in[2 * i + 1] = vals[i]; + } + in[2 * i] = vals[i]; + + res = new_ir_node(db, irg, block, op_Psi, mode, 2 * arity + 1, in); + assert(res); + + res = optimize_node(res); + IRN_VRFY_IRG(res, irg); + return res; +} + static ir_node * new_bd_CopyB (dbg_info *db, ir_node *block, ir_node *store, ir_node *dst, ir_node *src, ir_type *data_type) @@ -1215,41 +1241,48 @@ new_rd_SymConst (dbg_info *db, ir_graph *irg, ir_node *block, symconst_symbol va ir_node *new_rd_SymConst_addr_ent (dbg_info *db, ir_graph *irg, entity *symbol, ir_type *tp) { symconst_symbol sym = {(ir_type *)symbol}; - return new_rd_SymConst_type(db, irg, irg->start_block, sym, symconst_addr_ent, tp); + return new_rd_SymConst_type(db, irg, get_irg_start_block(irg), sym, symconst_addr_ent, tp); } ir_node *new_rd_SymConst_addr_name (dbg_info *db, ir_graph *irg, ident *symbol, ir_type *tp) { symconst_symbol sym = {(ir_type *)symbol}; - return new_rd_SymConst_type(db, irg, irg->start_block, sym, symconst_addr_name, tp); + return new_rd_SymConst_type(db, irg, get_irg_start_block(irg), sym, symconst_addr_name, tp); } ir_node *new_rd_SymConst_type_tag (dbg_info *db, ir_graph *irg, ir_type *symbol, ir_type *tp) { symconst_symbol sym = {symbol}; - return new_rd_SymConst_type(db, irg, irg->start_block, sym, symconst_type_tag, tp); + return new_rd_SymConst_type(db, irg, get_irg_start_block(irg), sym, symconst_type_tag, tp); } ir_node *new_rd_SymConst_size (dbg_info *db, ir_graph *irg, ir_type *symbol, ir_type *tp) { symconst_symbol sym = {symbol}; - return new_rd_SymConst_type(db, irg, irg->start_block, sym, symconst_size, tp); + return new_rd_SymConst_type(db, irg, get_irg_start_block(irg), sym, symconst_type_size, tp); +} + +ir_node *new_rd_SymConst_align (dbg_info *db, ir_graph *irg, ir_type *symbol, ir_type *tp) { + symconst_symbol sym = {symbol}; + return new_rd_SymConst_type(db, irg, get_irg_start_block(irg), sym, symconst_type_align, tp); } ir_node * -new_rd_Sync (dbg_info *db, ir_graph *irg, ir_node *block, int arity, ir_node **in) +new_rd_Sync (dbg_info *db, ir_graph *irg, ir_node *block, int arity, ir_node *in[]) { ir_node *res; ir_graph *rem = current_ir_graph; + int i; current_ir_graph = irg; - res = new_bd_Sync(db, block, arity, in); + res = new_bd_Sync(db, block); current_ir_graph = rem; + for (i = 0; i < arity; ++i) add_Sync_pred(res, in[i]); + return res; } ir_node * -new_rd_Bad (ir_graph *irg) -{ - return irg->bad; +new_rd_Bad (ir_graph *irg) { + return get_irg_bad(irg); } ir_node * @@ -1298,7 +1331,7 @@ new_rd_EndReg (dbg_info *db, ir_graph *irg, ir_node *block) ir_node *res; res = new_ir_node(db, irg, block, op_EndReg, mode_T, -1, NULL); - irg->end_reg = res; + set_irg_end_reg(irg, res); IRN_VRFY_IRG(res, irg); return res; } @@ -1309,7 +1342,7 @@ new_rd_EndExcept (dbg_info *db, ir_graph *irg, ir_node *block) ir_node *res; res = new_ir_node(db, irg, block, op_EndExcept, mode_T, -1, NULL); - irg->end_except = res; + set_irg_end_except(irg, res); IRN_VRFY_IRG (res, irg); return res; } @@ -1343,7 +1376,7 @@ new_rd_Filter (dbg_info *db, ir_graph *irg, ir_node *block, ir_node *arg, ir_mod ir_node * new_rd_NoMem (ir_graph *irg) { - return irg->no_mem; + return get_irg_no_mem(irg); } ir_node * @@ -1360,6 +1393,20 @@ new_rd_Mux (dbg_info *db, ir_graph *irg, ir_node *block, return res; } +ir_node * +new_rd_Psi (dbg_info *db, ir_graph *irg, ir_node *block, + int arity, ir_node *cond[], ir_node *vals[], ir_mode *mode) +{ + ir_node *res; + ir_graph *rem = current_ir_graph; + + current_ir_graph = irg; + res = new_bd_Psi(db, block, arity, cond, vals, mode); + current_ir_graph = rem; + + return res; +} + ir_node *new_rd_CopyB(dbg_info *db, ir_graph *irg, ir_node *block, ir_node *store, ir_node *dst, ir_node *src, ir_type *data_type) { @@ -1572,7 +1619,7 @@ ir_node *new_r_Free (ir_graph *irg, ir_node *block, ir_node *store, ir_node *ptr, ir_node *size, ir_type *free_type, where_alloc where) { return new_rd_Free(NULL, irg, block, store, ptr, size, free_type, where); } -ir_node *new_r_Sync (ir_graph *irg, ir_node *block, int arity, ir_node **in) { +ir_node *new_r_Sync (ir_graph *irg, ir_node *block, int arity, ir_node *in[]) { return new_rd_Sync(NULL, irg, block, arity, in); } ir_node *new_r_Proj (ir_graph *irg, ir_node *block, ir_node *arg, @@ -1623,6 +1670,10 @@ ir_node *new_r_Mux (ir_graph *irg, ir_node *block, ir_node *sel, ir_node *ir_false, ir_node *ir_true, ir_mode *mode) { return new_rd_Mux(NULL, irg, block, sel, ir_false, ir_true, mode); } +ir_node *new_r_Psi (ir_graph *irg, ir_node *block, + int arity, ir_node *conds[], ir_node *vals[], ir_mode *mode) { + return new_rd_Psi(NULL, irg, block, arity, conds, vals, mode); +} ir_node *new_r_CopyB(ir_graph *irg, ir_node *block, ir_node *store, ir_node *dst, ir_node *src, ir_type *data_type) { return new_rd_CopyB(NULL, irg, block, store, dst, src, data_type); @@ -1938,8 +1989,8 @@ phi_merge (ir_node *block, int pos, ir_mode *mode, ir_node **nin, int ins) /* Now we now the value for "pos" and can enter it in the array with all known local variables. Attention: this might be a pointer to - a node, that later will be allocated!!! See new_rd_Phi_in. - If this is called in mature, after some set_value in the same block, + a node, that later will be allocated!!! See new_rd_Phi_in(). + If this is called in mature, after some set_value() in the same block, the proper value must not be overwritten: The call order get_value (makes Phi0, put's it into graph_arr) @@ -2134,7 +2185,7 @@ new_rd_Phi_in (ir_graph *irg, ir_node *block, ir_mode *mode, /* Memory Phis in endless loops must be kept alive. As we can't distinguish these easily we keep all of them alive. */ if ((res->op == op_Phi) && (mode == mode_M)) - add_End_keepalive(irg->end, res); + add_End_keepalive(get_irg_end(irg), res); } return res; @@ -2171,15 +2222,14 @@ static INLINE ir_node ** new_frag_arr (ir_node *n) arr[0] = new_Proj(n, mode_M, pn_Call_M_except); else if (get_irn_op(n) == op_CopyB) arr[0] = new_Proj(n, mode_M, pn_CopyB_M_except); - else if (get_irn_op(n) == op_Bound) - arr[0] = new_Proj(n, mode_M, pn_Bound_M_except); else { assert((pn_Quot_M == pn_DivMod_M) && (pn_Quot_M == pn_Div_M) && (pn_Quot_M == pn_Mod_M) && (pn_Quot_M == pn_Load_M) && (pn_Quot_M == pn_Store_M) && - (pn_Quot_M == pn_Alloc_M) ); + (pn_Quot_M == pn_Alloc_M) && + (pn_Quot_M == pn_Bound_M)); arr[0] = new_Proj(n, mode_M, pn_Alloc_M); } set_optimize(opt); @@ -2245,8 +2295,8 @@ get_r_frag_value_internal (ir_node *block, ir_node *cfOp, int pos, ir_mode *mode res = frag_arr[pos]; if (!res) { if (block->attr.block.graph_arr[pos]) { - /* There was a set_value after the cfOp and no get_value before that - set_value. We must build a Phi node now. */ + /* There was a set_value() after the cfOp and no get_value before that + set_value(). We must build a Phi node now. */ if (block->attr.block.matured) { int ins = get_irn_arity(block); ir_node **nin; @@ -2539,19 +2589,19 @@ new_d_Phi (dbg_info *db, int arity, ir_node **in, ir_mode *mode) ir_node * new_d_Const (dbg_info *db, ir_mode *mode, tarval *con) { - return new_bd_Const(db, current_ir_graph->start_block, mode, con); + return new_bd_Const(db, get_irg_start_block(current_ir_graph), mode, con); } ir_node * new_d_Const_long(dbg_info *db, ir_mode *mode, long value) { - return new_bd_Const_long(db, current_ir_graph->start_block, mode, value); + return new_bd_Const_long(db, get_irg_start_block(current_ir_graph), mode, value); } ir_node * new_d_Const_type (dbg_info *db, ir_mode *mode, tarval *con, ir_type *tp) { - return new_bd_Const_type(db, current_ir_graph->start_block, mode, con, tp); + return new_bd_Const_type(db, get_irg_start_block(current_ir_graph), mode, con, tp); } @@ -2790,21 +2840,21 @@ new_d_Sel (dbg_info *db, ir_node *store, ir_node *objptr, int n_index, ir_node * ir_node * new_d_SymConst_type (dbg_info *db, symconst_symbol value, symconst_kind kind, ir_type *tp) { - return new_bd_SymConst_type (db, current_ir_graph->start_block, + return new_bd_SymConst_type (db, get_irg_start_block(current_ir_graph), value, kind, tp); } ir_node * new_d_SymConst (dbg_info *db, symconst_symbol value, symconst_kind kind) { - return new_bd_SymConst (db, current_ir_graph->start_block, + return new_bd_SymConst (db, get_irg_start_block(current_ir_graph), value, kind); } ir_node * -new_d_Sync (dbg_info *db, int arity, ir_node** in) +new_d_Sync (dbg_info *db, int arity, ir_node *in[]) { - return new_bd_Sync (db, current_ir_graph->current_block, arity, in); + return new_rd_Sync (db, current_ir_graph, current_ir_graph->current_block, arity, in); } @@ -2876,6 +2926,12 @@ new_d_Mux (dbg_info *db, ir_node *sel, ir_node *ir_false, sel, ir_false, ir_true, mode); } +ir_node * +new_d_Psi (dbg_info *db,int arity, ir_node *conds[], ir_node *vals[], ir_mode *mode) { + return new_bd_Psi (db, current_ir_graph->current_block, + arity, conds, vals, mode); +} + ir_node *new_d_CopyB(dbg_info *db,ir_node *store, ir_node *dst, ir_node *src, ir_type *data_type) { ir_node *res; @@ -3021,18 +3077,47 @@ get_store (void) return get_r_value_internal (current_ir_graph->current_block, 0, mode_M); } -/* set the current store */ +/* set the current store: handles automatic Sync construction for Load nodes */ void set_store (ir_node *store) { - /* GL: one could call set_value instead */ + ir_node *load, *pload, *pred, *in[2]; + assert(get_irg_phase_state (current_ir_graph) == phase_building); + + if (get_opt_auto_create_sync()) { + /* handle non-volatile Load nodes by automatically creating Sync's */ + load = skip_Proj(store); + if (is_Load(load) && get_Load_volatility(load) == volatility_non_volatile) { + pred = get_Load_mem(load); + + if (is_Sync(pred)) { + /* a Load after a Sync: move it up */ + ir_node *mem = skip_Proj(get_Sync_pred(pred, 0)); + + set_Load_mem(load, get_memop_mem(mem)); + add_Sync_pred(pred, store); + store = pred; + } + else { + pload = skip_Proj(pred); + if (is_Load(pload) && get_Load_volatility(pload) == volatility_non_volatile) { + /* a Load after a Load: create a new Sync */ + set_Load_mem(load, get_Load_mem(pload)); + + in[0] = pred; + in[1] = store; + store = new_Sync(2, in); + } + } + } + } current_ir_graph->current_block->attr.block.graph_arr[0] = store; } void keep_alive (ir_node *ka) { - add_End_keepalive(current_ir_graph->end, ka); + add_End_keepalive(get_irg_end(current_ir_graph), ka); } /* --- Useful access routines --- */ @@ -3058,16 +3143,10 @@ init_cons(uninitialized_local_variable_func_t *func) default_initialize_local_variable = func; } -/* call for each graph */ -void -irg_finalize_cons (ir_graph *irg) { - irg->phase_state = phase_high; -} - void irp_finalize_cons (void) { - int i, n_irgs = get_irp_n_irgs(); - for (i = 0; i < n_irgs; i++) { + int i; + for (i = get_irp_n_irgs() - 1; i >= 0; --i) { irg_finalize_cons(get_irp_irg(i)); } irp->phase_state = phase_high; @@ -3205,7 +3284,7 @@ ir_node *new_Free (ir_node *store, ir_node *ptr, ir_node *size, ir_type *free_type, where_alloc where) { return new_d_Free(NULL, store, ptr, size, free_type, where); } -ir_node *new_Sync (int arity, ir_node **in) { +ir_node *new_Sync (int arity, ir_node *in[]) { return new_d_Sync(NULL, arity, in); } ir_node *new_Proj (ir_node *arg, ir_mode *mode, long proj) { @@ -3250,6 +3329,9 @@ ir_node *new_NoMem (void) { ir_node *new_Mux (ir_node *sel, ir_node *ir_false, ir_node *ir_true, ir_mode *mode) { return new_d_Mux(NULL, sel, ir_false, ir_true, mode); } +ir_node *new_Psi (int arity, ir_node *conds[], ir_node *vals[], ir_mode *mode) { + return new_d_Psi(NULL, arity, conds, vals, mode); +} ir_node *new_CopyB(ir_node *store, ir_node *dst, ir_node *src, ir_type *data_type) { return new_d_CopyB(NULL, store, dst, src, data_type); }