beinsn: Do not store, whether insn operands are constrained.

[libfirm] / ir / be / beinfo.c

diff --git a/ir/be/beinfo.c b/ir/be/beinfo.c
index c1a04fa..05f1b95 100644 (file)
--- a/ir/be/beinfo.c
+++ b/ir/be/beinfo.c
@@ -20,13 +20,13 @@
 /**
  * @file
  * @author      Matthias Braun
- * @version     $Id$
  */
 #include "config.h"
 
 #include <stdbool.h>
 
 #include "beinfo.h"
+#include "beirg.h"
 #include "bearch.h"
 #include "benode.h"
 #include "besched.h"
@@ -37,16 +37,16 @@
 
 static copy_attr_func old_phi_copy_attr;
 
-void be_info_new_node(ir_node *node)
+void be_info_new_node(ir_graph *irg, ir_node *node)
 {
        struct obstack *obst;
        backend_info_t *info;
 
-       /* Projs need no be info, their tuple holds all information */
+       /* Projs need no be info, all info is fetched from their predecessor */
        if (is_Proj(node))
                return;
 
-       obst = be_get_be_obst(current_ir_graph);
+       obst = be_get_be_obst(irg);
        info = OALLOCZ(obst, backend_info_t);
 
        assert(node->backend_info == NULL);
@@ -57,17 +57,15 @@ void be_info_new_node(ir_node *node)
         * backend graphs
         */
        switch (get_irn_opcode(node)) {
-       case iro_Bad:
        case iro_Block:
        case iro_Dummy:
-       case iro_End:
        case iro_NoMem:
-       case iro_Unknown:
-               info->flags |= arch_irn_flags_not_scheduled;
-               break;
        case iro_Anchor:
        case iro_Pin:
        case iro_Sync:
+       case iro_Bad:
+       case iro_End:
+       case iro_Unknown:
                info->flags |= arch_irn_flags_not_scheduled;
                info->out_infos = NEW_ARR_D(reg_out_info_t, obst, 1);
                memset(info->out_infos, 0, 1 * sizeof(info->out_infos[0]));
@@ -127,8 +125,9 @@ int be_nodes_equal(const ir_node *node1, const ir_node *node2)
 
 static void init_walker(ir_node *node, void *data)
 {
+       ir_graph *irg = get_irn_irg(node);
        (void) data;
-       be_info_new_node(node);
+       be_info_new_node(irg, node);
 }
 
 static bool initialized = false;
@@ -150,20 +149,20 @@ void be_info_init(void)
 /**
  * Edge hook to dump the schedule edges.
  */
-static void sched_edge_hook(FILE *F, ir_node *irn)
+static void sched_edge_hook(FILE *F, const 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");
+       if (sched_is_scheduled(irn) && !is_Block(irn)) {
+               ir_node *const prev = sched_prev(irn);
+               if (!sched_is_begin(prev)) {
+                       fprintf(F, "edge:{sourcename: ");
+                       print_nodeid(F, irn);
+                       fprintf(F, " targetname: ");
+                       print_nodeid(F, prev);
+                       fprintf(F, " color:magenta}\n");
+               }
        }
 }
 
@@ -177,7 +176,7 @@ void be_info_init_irg(ir_graph *irg)
 void be_info_free(void)
 {
        if (!initialized)
-               panic("be_info_free called without prior init");
+               panic("called without prior init");
 
        assert(op_Phi->ops.copy_attr == new_phi_copy_attr);
        op_Phi->ops.copy_attr = old_phi_copy_attr;
@@ -186,9 +185,3 @@ void be_info_free(void)
        assert(op_Phi->ops.dump_node == be_dump_phi_reg_reqs);
        op_Phi->ops.dump_node = NULL;
 }
-
-int be_info_initialized(const ir_graph *irg)
-{
-       (void) irg;
-       return initialized;
-}