remove MacroBlock concept

[libfirm] / ir / be / beinfo.c

diff --git a/ir/be/beinfo.c b/ir/be/beinfo.c
index 1783e9a..f4a88c7 100644 (file)
--- a/ir/be/beinfo.c
+++ b/ir/be/beinfo.c
@@ -29,8 +29,10 @@
 #include "beinfo.h"
 #include "bearch.h"
 #include "benode.h"
+#include "besched.h"
 #include "irgwalk.h"
 #include "irnode_t.h"
+#include "irdump_t.h"
 #include "error.h"
 
 static copy_attr_func  old_phi_copy_attr;
@@ -41,10 +43,10 @@ void be_info_new_node(ir_node *node)
        backend_info_t *info;
 
        /* Projs need no be info, their tuple holds all information */
-       if (is_Proj(node))
+       if (is_Proj(node))
                return;
 
-       obst = be_get_birg_obst(current_ir_graph);
+       obst = be_get_be_obst(current_ir_graph);
        info = OALLOCZ(obst, backend_info_t);
 
        assert(node->backend_info == NULL);
@@ -62,24 +64,35 @@ void be_info_new_node(ir_node *node)
        }
 }
 
-static void new_Phi_copy_attr(const ir_node *old_node, ir_node *new_node)
+static void new_Phi_copy_attr(ir_graph *irg, const ir_node *old_node,
+                              ir_node *new_node)
 {
        backend_info_t *old_info = be_get_info(old_node);
        backend_info_t *new_info = be_get_info(new_node);
 
        *new_info = *old_info;
 
-       old_phi_copy_attr(old_node, new_node);
+       old_phi_copy_attr(irg, old_node, new_node);
 }
 
-int be_infos_equal(const backend_info_t *info1, const backend_info_t *info2)
+int be_nodes_equal(ir_node *node1, ir_node *node2)
 {
-       int             len   = ARR_LEN(info1->out_infos);
-       int             i;
+       const backend_info_t *info1 = be_get_info(node1);
+       const backend_info_t *info2 = be_get_info(node2);
+       int                   len   = ARR_LEN(info1->out_infos);
+       int                   arity = get_irn_arity(node1);
+       int                   i;
 
        if (ARR_LEN(info2->out_infos) != len)
                return false;
 
+       assert(arity == get_irn_arity(node2));
+
+       for (i = 0; i < arity; ++i) {
+               if (info1->in_reqs[i] != info2->in_reqs[i])
+                       return false;
+       }
+
        for (i = 0; i < len; ++i) {
                const reg_out_info_t *out1 = &info1->out_infos[i];
                const reg_out_info_t *out2 = &info2->out_infos[i];
@@ -92,13 +105,6 @@ int be_infos_equal(const backend_info_t *info1, const backend_info_t *info2)
        return true;
 }
 
-int be_nodes_equal(const ir_node *node1, const ir_node *node2)
-{
-       backend_info_t *info1 = be_get_info(node1);
-       backend_info_t *info2 = be_get_info(node2);
-       return be_infos_equal(info1, info2);
-}
-
 static void init_walker(ir_node *node, void *data)
 {
        (void) data;
@@ -121,9 +127,31 @@ void be_info_init(void)
        op_Phi->ops.dump_node = be_dump_phi_reg_reqs;
 }
 
+/**
+ * Edge hook to dump the schedule edges.
+ */
+static void sched_edge_hook(FILE *F, ir_node *irn)
+{
+       if (is_Proj(irn))
+               return;
+       if (get_irn_irg(irn)->be_data == NULL)
+               return;
+
+       if (sched_is_scheduled(irn) && sched_has_prev(irn)) {
+               ir_node *prev = sched_prev(irn);
+               fprintf(F, "edge:{sourcename:\"");
+               PRINT_NODEID(irn);
+               fprintf(F, "\" targetname:\"");
+               PRINT_NODEID(prev);
+               fprintf(F, "\" color:magenta}\n");
+       }
+}
+
 void be_info_init_irg(ir_graph *irg)
 {
        irg_walk_anchors(irg, init_walker, NULL, NULL);
+
+       set_dump_node_edge_hook(sched_edge_hook);
 }
 
 void be_info_free(void)