X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firnode.c;h=ec5d4d965f12d651b69b267a3f0ed2c39c1d7f20;hb=9d4418286f646ab308f4a2d0ae00a4839a80fbf8;hp=d6b9289b00a2fedfb8c22ef480c1fc95d46c1121;hpb=158ab9a16500b4a7650c4059f0a8586af6e8ca78;p=libfirm diff --git a/ir/ir/irnode.c b/ir/ir/irnode.c index d6b9289b0..ec5d4d965 100644 --- a/ir/ir/irnode.c +++ b/ir/ir/irnode.c @@ -23,9 +23,7 @@ * @author Martin Trapp, Christian Schaefer, Goetz Lindenmaier, Michael Beck * @version $Id$ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #ifdef HAVE_STRING_H # include @@ -46,6 +44,8 @@ #include "irhooks.h" #include "irtools.h" +#include "beinfo.h" + /* some constants fixing the positions of nodes predecessors in the in array */ #define CALL_PARAM_OFFSET 2 @@ -138,7 +138,9 @@ new_ir_node(dbg_info *db, ir_graph *irg, ir_node *block, ir_op *op, ir_mode *mod char *p; int i; - assert(irg && op && mode); + assert(irg); + assert(op); + assert(mode); p = obstack_alloc(irg->obst, node_size); memset(p, 0, node_size); res = (ir_node *)(p + firm_add_node_size); @@ -179,6 +181,9 @@ new_ir_node(dbg_info *db, ir_graph *irg, ir_node *block, ir_op *op, ir_mode *mod edges_notify_edge(res, i - 1, res->in[i], NULL, irg); hook_new_node(irg, res); + if (get_irg_phase_state(irg) == phase_backend) { + be_info_new_node(res); + } return res; } @@ -443,11 +448,11 @@ ident *get_irn_opident(const ir_node *node) { return node->op->name; } -unsigned long (get_irn_visited)(const ir_node *node) { +ir_visited_t (get_irn_visited)(const ir_node *node) { return _get_irn_visited(node); } -void (set_irn_visited)(ir_node *node, unsigned long visited) { +void (set_irn_visited)(ir_node *node, ir_visited_t visited) { _set_irn_visited(node, visited); } @@ -455,14 +460,14 @@ void (mark_irn_visited)(ir_node *node) { _mark_irn_visited(node); } -int (irn_not_visited)(const ir_node *node) { - return _irn_not_visited(node); -} - int (irn_visited)(const ir_node *node) { return _irn_visited(node); } +int (irn_visited_else_mark)(ir_node *node) { + return _irn_visited_else_mark(node); +} + void (set_irn_link)(ir_node *node, void *link) { _set_irn_link(node, link); } @@ -481,7 +486,7 @@ op_pin_state (is_irn_pinned_in_irg) (const ir_node *node) { void set_irn_pinned(ir_node *node, op_pin_state state) { /* due to optimization an opt may be turned into a Tuple */ - if (get_irn_op(node) == op_Tuple) + if (is_Tuple(node)) return; assert(node && get_op_pinned(get_irn_op(node)) >= op_pin_state_exc_pinned); @@ -490,43 +495,6 @@ void set_irn_pinned(ir_node *node, op_pin_state state) { node->attr.except.pin_state = state; } -#ifdef DO_HEAPANALYSIS -/* Access the abstract interpretation information of a node. - Returns NULL if no such information is available. */ -struct abstval *get_irn_abst_value(ir_node *n) { - return n->av; -} -/* Set the abstract interpretation information of a node. */ -void set_irn_abst_value(ir_node *n, struct abstval *os) { - n->av = os; -} -struct section *firm_get_irn_section(ir_node *n) { - return n->sec; -} -void firm_set_irn_section(ir_node *n, struct section *s) { - n->sec = s; -} -#else -/* Dummies needed for firmjni. */ -struct abstval *get_irn_abst_value(ir_node *n) { - (void) n; - return NULL; -} -void set_irn_abst_value(ir_node *n, struct abstval *os) { - (void) n; - (void) os; -} -struct section *firm_get_irn_section(ir_node *n) { - (void) n; - return NULL; -} -void firm_set_irn_section(ir_node *n, struct section *s) { - (void) n; - (void) s; -} -#endif /* DO_HEAPANALYSIS */ - - /* Outputs a unique number for this node */ long get_irn_node_nr(const ir_node *node) { assert(node); @@ -717,11 +685,11 @@ void set_Block_matured(ir_node *node, int matured) { node->attr.block.is_matured = matured; } -unsigned long (get_Block_block_visited)(const ir_node *node) { +ir_visited_t (get_Block_block_visited)(const ir_node *node) { return _get_Block_block_visited(node); } -void (set_Block_block_visited)(ir_node *node, unsigned long visit) { +void (set_Block_block_visited)(ir_node *node, ir_visited_t visit) { _set_Block_block_visited(node, visit); } @@ -730,10 +698,6 @@ void (mark_Block_block_visited)(ir_node *node) { _mark_Block_block_visited(node); } -int (Block_not_block_visited)(const ir_node *node) { - return _Block_not_block_visited(node); -} - int (Block_block_visited)(const ir_node *node) { return _Block_block_visited(node); } @@ -901,7 +865,6 @@ ir_node *get_End_keepalive(const ir_node *end, int pos) { void add_End_keepalive(ir_node *end, ir_node *ka) { assert(is_End(end)); - assert((is_Phi(ka) || is_Proj(ka) || is_Block(ka) || is_irn_keep(ka)) && "Only Phi, Block or Keep nodes can be kept alive!"); add_irn_n(end, ka); } @@ -1146,10 +1109,13 @@ set_SymConst_kind(ir_node *node, symconst_kind kind) { } ir_type * -get_SymConst_type(ir_node *node) { +get_SymConst_type(const ir_node *node) { + /* the cast here is annoying, but we have to compensate for + the skip_tip() */ + ir_node *irn = (ir_node *)node; assert(is_SymConst(node) && (SYMCONST_HAS_TYPE(get_SymConst_kind(node)))); - return node->attr.symc.sym.type_p = skip_tid(node->attr.symc.sym.type_p); + return irn->attr.symc.sym.type_p = skip_tid(irn->attr.symc.sym.type_p); } void @@ -1332,7 +1298,7 @@ set_Call_ptr(ir_node *node, ir_node *ptr) { ir_node ** get_Call_param_arr(ir_node *node) { assert(is_Call(node)); - return (ir_node **)&get_irn_in(node)[CALL_PARAM_OFFSET + 1]; + return &get_irn_in(node)[CALL_PARAM_OFFSET + 1]; } int @@ -1501,6 +1467,7 @@ void set_##OP##_resmode(ir_node *node, ir_mode *mode) { \ BINOP(Add) +BINOP(Carry) BINOP(Sub) UNOP(Minus) BINOP(Mul) @@ -2203,101 +2170,33 @@ ir_node *get_Filter_cg_pred(ir_node *node, int pos) { /* Mux support */ ir_node *get_Mux_sel(const ir_node *node) { - if (is_Psi(node)) { - assert(get_irn_arity(node) == 3); - return get_Psi_cond(node, 0); - } assert(is_Mux(node)); return node->in[1]; } void set_Mux_sel(ir_node *node, ir_node *sel) { - if (is_Psi(node)) { - assert(get_irn_arity(node) == 3); - set_Psi_cond(node, 0, sel); - } else { - assert(is_Mux(node)); - node->in[1] = sel; - } + assert(is_Mux(node)); + node->in[1] = sel; } ir_node *get_Mux_false(const ir_node *node) { - if (is_Psi(node)) { - assert(get_irn_arity(node) == 3); - return get_Psi_default(node); - } assert(is_Mux(node)); return node->in[2]; } void set_Mux_false(ir_node *node, ir_node *ir_false) { - if (is_Psi(node)) { - assert(get_irn_arity(node) == 3); - set_Psi_default(node, ir_false); - } else { - assert(is_Mux(node)); - node->in[2] = ir_false; - } + assert(is_Mux(node)); + node->in[2] = ir_false; } ir_node *get_Mux_true(const ir_node *node) { - if (is_Psi(node)) { - assert(get_irn_arity(node) == 3); - return get_Psi_val(node, 0); - } assert(is_Mux(node)); return node->in[3]; } void set_Mux_true(ir_node *node, ir_node *ir_true) { - if (is_Psi(node)) { - assert(get_irn_arity(node) == 3); - set_Psi_val(node, 0, ir_true); - } else { - assert(is_Mux(node)); - node->in[3] = ir_true; - } -} - -/* Psi support */ -ir_node *get_Psi_cond(const ir_node *node, int pos) { - assert(is_Psi(node)); - assert(pos < get_Psi_n_conds(node)); - return get_irn_n(node, 2 * pos); -} - -void set_Psi_cond(ir_node *node, int pos, ir_node *cond) { - assert(is_Psi(node)); - assert(pos < get_Psi_n_conds(node)); - set_irn_n(node, 2 * pos, cond); -} - -ir_node *get_Psi_val(const ir_node *node, int pos) { - assert(is_Psi(node)); - assert(pos < get_Psi_n_conds(node)); - return get_irn_n(node, 2 * pos + 1); -} - -void set_Psi_val(ir_node *node, int pos, ir_node *val) { - assert(is_Psi(node)); - assert(pos < get_Psi_n_conds(node)); - set_irn_n(node, 2 * pos + 1, val); -} - -ir_node *get_Psi_default(const ir_node *node) { - int def_pos = get_irn_arity(node) - 1; - assert(is_Psi(node)); - return get_irn_n(node, def_pos); -} - -void set_Psi_default(ir_node *node, ir_node *val) { - int def_pos = get_irn_arity(node); - assert(is_Psi(node)); - set_irn_n(node, def_pos, val); -} - -int (get_Psi_n_conds)(const ir_node *node) { - return _get_Psi_n_conds(node); + assert(is_Mux(node)); + node->in[3] = ir_true; } /* CopyB support */ @@ -2515,7 +2414,7 @@ get_irn_irg(const ir_node *node) { node = get_irn_n(node, -1); if (is_Bad(node)) /* sometimes bad is predecessor of nodes instead of block: in case of optimization */ node = get_irn_n(node, -1); - assert(get_irn_op(node) == op_Block); + assert(is_Block(node)); return node->attr.block.irg; } @@ -2582,14 +2481,28 @@ restart: /* returns operand of node if node is a Cast */ ir_node *skip_Cast(ir_node *node) { - if (get_irn_op(node) == op_Cast) + if (is_Cast(node)) + return get_Cast_op(node); + return node; +} + +/* returns operand of node if node is a Cast */ +const ir_node *skip_Cast_const(const ir_node *node) { + if (is_Cast(node)) return get_Cast_op(node); return node; } +/* returns operand of node if node is a Pin */ +ir_node *skip_Pin(ir_node *node) { + if (is_Pin(node)) + return get_Pin_op(node); + return node; +} + /* returns operand of node if node is a Confirm */ ir_node *skip_Confirm(ir_node *node) { - if (get_irn_op(node) == op_Confirm) + if (is_Confirm(node)) return get_Confirm_value(node); return node; } @@ -2699,6 +2612,11 @@ int return _is_Add(node); } +int +(is_Carry)(const ir_node *node) { + return _is_Carry(node); +} + int (is_And)(const ir_node *node) { return _is_And(node); @@ -2744,11 +2662,6 @@ int return _is_Not(node); } -int -(is_Psi)(const ir_node *node) { - return _is_Psi(node); -} - int (is_Id)(const ir_node *node) { return _is_Id(node); @@ -2834,7 +2747,7 @@ int return _is_Sel(node); } -/* returns true if node is a Mux node or a Psi with only one condition. */ +/* returns true if node is a Mux node. */ int (is_Mux)(const ir_node *node) { return _is_Mux(node);