Clean up new_const_code_irg() a bit.

[libfirm] / ir / ir / irnode.c

diff --git a/ir/ir/irnode.c b/ir/ir/irnode.c
index a82224d..0358e49 100644 (file)
--- a/ir/ir/irnode.c
+++ b/ir/ir/irnode.c
@@ -23,14 +23,11 @@
  * @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 <string.h>
-#endif
+#include <string.h>
 
+#include "pset_new.h"
 #include "ident.h"
 #include "irnode_t.h"
 #include "irgraph_t.h"
@@ -46,6 +43,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
@@ -181,6 +180,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;
 }
@@ -445,11 +447,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);
 }
 
@@ -457,14 +459,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);
 }
@@ -492,43 +494,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);
@@ -719,11 +684,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);
 }
 
@@ -898,7 +863,6 @@ ir_node *get_End_keepalive(const ir_node *end, int pos) {
 }
 
 void add_End_keepalive(ir_node *end, ir_node *ka) {
-       ir_graph *irg = get_irn_irg(end);
        assert(is_End(end));
        add_irn_n(end, ka);
 }
@@ -955,11 +919,48 @@ found:
                end->in[1 + END_KEEPALIVE_OFFSET + idx] = old;
                edges_notify_edge(end, idx, old, NULL, irg);
        }
+       /* now n - 1 keeps, 1 block input */
        ARR_RESIZE(ir_node *, end->in, (n - 1) + 1 + END_KEEPALIVE_OFFSET);
 }
 
-void
-free_End(ir_node *end) {
+/* remove Bads, NoMems and doublets from the keep-alive set */
+void remove_End_Bads_and_doublets(ir_node *end) {
+       pset_new_t keeps;
+       int        idx, n = get_End_n_keepalives(end);
+       ir_graph   *irg;
+
+       if (n <= 0)
+               return;
+
+       irg = get_irn_irg(end);
+       pset_new_init(&keeps);
+
+       for (idx = n - 1; idx >= 0; --idx) {
+               ir_node *ka = get_End_keepalive(end, idx);
+
+               if (is_Bad(ka) || is_NoMem(ka) || pset_new_contains(&keeps, ka)) {
+                       /* remove the edge */
+                       edges_notify_edge(end, idx, NULL, ka, irg);
+
+                       if (idx != n - 1) {
+                               /* exchange with the last one */
+                               ir_node *old = end->in[1 + END_KEEPALIVE_OFFSET + n - 1];
+                               edges_notify_edge(end, n - 1, NULL, old, irg);
+                               end->in[1 + END_KEEPALIVE_OFFSET + idx] = old;
+                               edges_notify_edge(end, idx, old, NULL, irg);
+                       }
+                       --n;
+               } else {
+                       pset_new_insert(&keeps, ka);
+               }
+       }
+       /* n keeps, 1 block input */
+       ARR_RESIZE(ir_node *, end->in, n + 1 + END_KEEPALIVE_OFFSET);
+
+       pset_new_destroy(&keeps);
+}
+
+void free_End(ir_node *end) {
        assert(is_End(end));
        end->kind = k_BAD;
        DEL_ARR_F(end->in);