X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firnode.c;h=30aee7e0f3e80f41f74e9b88a90eb2a8b71b1b69;hb=01c4c27c4b7824dd0020f6fd2218edbe9ab40548;hp=55cbfa29cc830f477573e9368270e7e0a1878667;hpb=60ade3bddea81d39496893b501d60ced4c264cc7;p=libfirm diff --git a/ir/ir/irnode.c b/ir/ir/irnode.c index 55cbfa29c..30aee7e0f 100644 --- a/ir/ir/irnode.c +++ b/ir/ir/irnode.c @@ -50,6 +50,7 @@ in the in array */ #define CALL_PARAM_OFFSET (n_Call_max+1) #define BUILTIN_PARAM_OFFSET (n_Builtin_max+1) +#define ASM_PARAM_OFFSET (n_ASM_max+1) #define SEL_INDEX_OFFSET (n_Sel_max+1) #define RETURN_RESULT_OFFSET (n_Return_max+1) #define END_KEEPALIVE_OFFSET 0 @@ -94,57 +95,17 @@ ir_relation get_inversed_relation(ir_relation relation) return code; } -/** - * Indicates, whether additional data can be registered to ir nodes. - * If set to 1, this is not possible anymore. - */ -static int forbid_new_data = 0; - -unsigned firm_add_node_size = 0; - - -unsigned firm_register_additional_node_data(unsigned size) -{ - assert(!forbid_new_data && "Too late to register additional node data"); - - if (forbid_new_data) - return 0; - - return firm_add_node_size += size; -} - - -void init_irnode(void) -{ - /* Forbid the addition of new data to an ir node. */ - forbid_new_data = 1; -} - -struct struct_align { - char c; - struct s { - int i; - float f; - double d; - } s; -}; - ir_node *new_ir_node(dbg_info *db, ir_graph *irg, ir_node *block, ir_op *op, ir_mode *mode, int arity, ir_node *const *in) { - ir_node *res; - unsigned align = offsetof(struct struct_align, s) - 1; - unsigned add_node_size = (firm_add_node_size + align) & ~align; - size_t node_size = offsetof(ir_node, attr) + op->attr_size + add_node_size; - char *p; int i; assert(irg); assert(op); assert(mode); - p = (char*)obstack_alloc(irg->obst, node_size); - memset(p, 0, node_size); - res = (ir_node *)(p + add_node_size); + + size_t const node_size = offsetof(ir_node, attr) + op->attr_size; + ir_node *const res = (ir_node*)OALLOCNZ(irg->obst, char, node_size); res->kind = k_ir_node; res->op = op; @@ -167,7 +128,6 @@ ir_node *new_ir_node(dbg_info *db, ir_graph *irg, ir_node *block, ir_op *op, res->in[0] = block; set_irn_dbg_info(res, db); - res->out = NULL; res->node_nr = get_irp_new_node_nr(); for (i = 0; i < EDGE_KIND_LAST; ++i) { @@ -183,7 +143,7 @@ ir_node *new_ir_node(dbg_info *db, ir_graph *irg, ir_node *block, ir_op *op, edges_notify_edge(res, i - 1, res->in[i], NULL, irg); hook_new_node(irg, res); - if (get_irg_phase_state(irg) == phase_backend) { + if (irg_is_constrained(irg, IR_GRAPH_CONSTRAINT_BACKEND)) { be_info_new_node(irg, res); } @@ -304,19 +264,32 @@ ir_node *(get_irn_dep)(const ir_node *node, int pos) return get_irn_dep_(node, pos); } -void (set_irn_dep)(ir_node *node, int pos, ir_node *dep) +void set_irn_dep(ir_node *node, int pos, ir_node *dep) { - set_irn_dep_(node, pos, dep); + ir_node *old; + ir_graph *irg; + + assert(node->deps && "dependency array node yet allocated. use add_irn_dep()"); + assert(pos >= 0 && pos < (int)ARR_LEN(node->deps) && "dependency index out of range"); + assert(dep != NULL); + old = node->deps[pos]; + node->deps[pos] = dep; + irg = get_irn_irg(node); + if (edges_activated_kind(irg, EDGE_KIND_DEP)) + edges_notify_edge_kind(node, pos, dep, old, EDGE_KIND_DEP, irg); } void add_irn_dep(ir_node *node, ir_node *dep) { + ir_graph *irg; assert(dep != NULL); if (node->deps == NULL) { node->deps = NEW_ARR_F(ir_node *, 0); } ARR_APP1(ir_node*, node->deps, dep); - edges_notify_edge_kind(node, ARR_LEN(node->deps)-1, dep, NULL, EDGE_KIND_DEP, get_irn_irg(node)); + irg = get_irn_irg(node); + if (edges_activated_kind(irg, EDGE_KIND_DEP)) + edges_notify_edge_kind(node, ARR_LEN(node->deps)-1, dep, NULL, EDGE_KIND_DEP, irg); } void delete_irn_dep(ir_node *node, ir_node *dep) @@ -463,16 +436,6 @@ unsigned (get_irn_idx)(const ir_node *node) return get_irn_idx_(node); } -int get_irn_pred_pos(ir_node *node, ir_node *arg) -{ - int i; - for (i = get_irn_arity(node) - 1; i >= 0; i--) { - if (get_irn_n(node, i) == arg) - return i; - } - return -1; -} - ir_node *(get_nodes_block)(const ir_node *node) { return get_nodes_block_(node); @@ -480,7 +443,7 @@ ir_node *(get_nodes_block)(const ir_node *node) void set_nodes_block(ir_node *node, ir_node *block) { - assert(node->op != op_Block); + assert(!is_Block(node)); set_irn_n(node, -1, block); } @@ -661,21 +624,21 @@ void set_End_keepalives(ir_node *end, int n, ir_node *in[]) void remove_End_keepalive(ir_node *end, ir_node *irn) { int n = get_End_n_keepalives(end); - int i, idx; ir_graph *irg; - idx = -1; - for (i = n -1; i >= 0; --i) { + int idx = -1; + for (int i = n;;) { + if (i-- == 0) + return; + ir_node *old_ka = end->in[1 + END_KEEPALIVE_OFFSET + i]; /* find irn */ if (old_ka == irn) { idx = i; - goto found; + break; } } - return; -found: irg = get_irn_irg(end); /* remove the edge */ @@ -892,10 +855,10 @@ ir_node **get_Call_param_arr(ir_node *node) return &get_irn_in(node)[CALL_PARAM_OFFSET + 1]; } -size_t get_Call_n_params(const ir_node *node) +int get_Call_n_params(const ir_node *node) { assert(is_Call(node)); - return (size_t) (get_irn_arity(node) - CALL_PARAM_OFFSET); + return get_irn_arity(node) - CALL_PARAM_OFFSET; } ir_node *get_Call_param(const ir_node *node, int pos) @@ -1231,10 +1194,15 @@ void set_Tuple_pred(ir_node *node, int pos, ir_node *pred) set_irn_n(node, pos, pred); } -size_t get_ASM_n_input_constraints(const ir_node *node) +int get_ASM_n_inputs(const ir_node *node) { assert(is_ASM(node)); - return ARR_LEN(node->attr.assem.input_constraints); + return get_irn_arity(node) - ASM_PARAM_OFFSET; +} + +ir_node *get_ASM_input(const ir_node *node, int pos) +{ + return get_irn_n(node, ASM_PARAM_OFFSET + pos); } size_t get_ASM_n_output_constraints(const ir_node *node) @@ -1378,11 +1346,6 @@ ir_node *skip_Id(ir_node *node) } } -int (is_strictConv)(const ir_node *node) -{ - return is_strictConv_(node); -} - int (is_SymConst_addr_ent)(const ir_node *node) { return is_SymConst_addr_ent_(node); @@ -1564,5 +1527,19 @@ ir_switch_table *ir_switch_table_duplicate(ir_graph *irg, return res; } +bool only_used_by_keepalive(const ir_node *node) +{ + foreach_out_edge(node, edge) { + ir_node *succ = get_edge_src_irn(edge); + if (is_End(succ)) + continue; + if (is_Proj(succ) && only_used_by_keepalive(succ)) + return true; + /* found a real user */ + return false; + } + return true; +} + /* include generated code */ #include "gen_irnode.c.inl"