bearch: Remove unnecessary indirection to access arch_no_register_req.

[libfirm] / ir / ir / irnode.c

diff --git a/ir/ir/irnode.c b/ir/ir/irnode.c
index e4bd620..30aee7e 100644 (file)
--- a/ir/ir/irnode.c
+++ b/ir/ir/irnode.c
@@ -95,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;
@@ -168,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) {
@@ -184,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);
        }
 
@@ -477,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);
@@ -1578,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"