cleanup irouts

[libfirm] / ir / ir / irnode.c

diff --git a/ir/ir/irnode.c b/ir/ir/irnode.c
index 55cbfa2..9ea9fcd 100644 (file)
--- 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
@@ -167,7 +168,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) {
@@ -304,19 +304,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)
@@ -480,7 +493,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 +674,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 +905,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 +1244,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 +1396,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);