used enum values for Tuple creation

[libfirm] / ir / ana / irouts.c

diff --git a/ir/ana/irouts.c b/ir/ana/irouts.c
index 8722096..1bd48cd 100644 (file)
--- a/ir/ana/irouts.c
+++ b/ir/ana/irouts.c
@@ -31,7 +31,7 @@
 #include "irnode_t.h"
 #include "irgraph_t.h"     /* To access irg->outs field (which is private to this module)
                   without public access routine */
-#include "irprog.h"
+#include "irprog_t.h"
 #include "irgwalk.h"
 
 /**********************************************************************/
@@ -61,8 +61,8 @@ INLINE int get_Block_n_cfg_outs (ir_node *bl) {
   int i, n_cfg_outs = 0;
   assert(bl && (get_irn_op(bl) == op_Block));
   for (i = 0; i < (int)bl->out[0]; i++)
-    if ((get_irn_mode(bl->out[i+1]) == mode_X) &&
-    (get_irn_op(bl->out[i+1]) != op_End)) n_cfg_outs++;
+    if ((intern_get_irn_mode(bl->out[i+1]) == mode_X) &&
+    (intern_get_irn_op(bl->out[i+1]) != op_End)) n_cfg_outs++;
   return n_cfg_outs;
 }
 
@@ -71,8 +71,8 @@ INLINE ir_node *get_Block_cfg_out  (ir_node *bl, int pos) {
   int i, out_pos = 0;
   assert(bl && (get_irn_op(bl) == op_Block));
   for (i = 0; i < (int)bl->out[0]; i++)
-    if ((get_irn_mode(bl->out[i+1]) == mode_X)  &&
-    (get_irn_op(bl->out[i+1]) != op_End)) {
+    if ((intern_get_irn_mode(bl->out[i+1]) == mode_X)  &&
+    (intern_get_irn_op(bl->out[i+1]) != op_End)) {
       if (out_pos == pos) {
     ir_node *cfop = bl->out[i+1];
     return cfop->out[0+1];
@@ -122,8 +122,6 @@ void irg_out_block_walk2(ir_node *bl,
             void *env) {
   int i;
 
-  assert(get_irn_opcode(bl) == iro_Block);
-
   if(get_Block_block_visited(bl) < get_irg_block_visited(current_ir_graph)) {
     set_Block_block_visited(bl, get_irg_block_visited(current_ir_graph));
 
@@ -133,7 +131,6 @@ void irg_out_block_walk2(ir_node *bl,
     for(i = 0; i < get_Block_n_cfg_outs(bl); i++) {
       /* find the corresponding predecessor block. */
       ir_node *pred = get_Block_cfg_out(bl, i);
-      assert(get_irn_opcode(pred) == iro_Block);
       /* recursion */
       irg_out_block_walk2(pred, pre, post, env);
     }
@@ -150,12 +147,11 @@ void irg_out_block_walk(ir_node *node,
             irg_walk_func *pre, irg_walk_func *post,
             void *env) {
 
-  assert((get_irn_op(node) == op_Block) || (get_irn_mode(node) == mode_X));
+  assert((get_irn_op(node) == op_Block) || (intern_get_irn_mode(node) == mode_X));
 
   inc_irg_block_visited(current_ir_graph);
 
-  if (get_irn_mode(node) == mode_X) node = node->out[1];
-  assert(get_irn_opcode(node)  == iro_Block);
+  if (intern_get_irn_mode(node) == mode_X) node = node->out[1];
 
   irg_out_block_walk2(node, pre, post, env);
 
@@ -191,12 +187,12 @@ static int count_outs(ir_node *n) {
   set_irn_visited(n, get_irg_visited(current_ir_graph));
   n->out = (ir_node **) 1;     /* Space for array size. */
 
-  if ((get_irn_op(n) == op_Block)) start = 0; else start = -1;
-  irn_arity = get_irn_arity(n);
+  if ((intern_get_irn_op(n) == op_Block)) start = 0; else start = -1;
+  irn_arity = intern_get_irn_arity(n);
   res = irn_arity - start +1;  /* --1 or --0; 1 for array size. */
   for (i = start; i < irn_arity; i++) {
     /* Optimize Tuples.  They annoy if walking the cfg. */
-    succ = skip_Tuple(get_irn_n(n, i));
+    succ = skip_Tuple(intern_get_irn_n(n, i));
     set_irn_n(n, i, succ);
     /* count outs for successors */
     if (get_irn_visited(succ) < get_irg_visited(current_ir_graph))
@@ -222,10 +218,10 @@ static ir_node **set_out_edges(ir_node *n, ir_node **free) {
      edge. */
   n->out[0] = (ir_node *)0;
 
-  if (get_irn_op(n) == op_Block) start = 0; else start = -1;
-  irn_arity = get_irn_arity(n);
+  if (intern_get_irn_op(n) == op_Block) start = 0; else start = -1;
+  irn_arity = intern_get_irn_arity(n);
   for (i = start; i < irn_arity; i++) {
-    succ = get_irn_n(n, i);
+    succ = intern_get_irn_n(n, i);
     /* Recursion */
     if (get_irn_visited(succ) < get_irg_visited(current_ir_graph))
       free = set_out_edges(succ, free);
@@ -242,7 +238,7 @@ static INLINE void fix_start_proj(ir_graph *irg) {
   if (get_Block_n_cfg_outs(get_irg_start_block(irg))) {
     startbl = get_irg_start_block(irg);
     for (i = 0; i < get_irn_n_outs(startbl); i++)
-      if (get_irn_mode(get_irn_out(startbl, i)) == mode_X)
+      if (intern_get_irn_mode(get_irn_out(startbl, i)) == mode_X)
     proj = get_irn_out(startbl, i);
     if (get_irn_out(proj, 0) == startbl) {
       assert(get_irn_n_outs(proj) == 2);
@@ -260,6 +256,7 @@ void compute_outs(ir_graph *irg) {
 
   /* Update graph state */
   assert(get_irg_phase_state(current_ir_graph) != phase_building);
+  if (current_ir_graph->outs_state != no_outs) free_outs(current_ir_graph);
   current_ir_graph->outs_state = outs_consistent;
 
   /* This first iteration counts the overall number of out edges and the
@@ -317,14 +314,14 @@ static void node_arity_count(ir_node * node, void * env)
   int *anz = (int *) env, arity, i, start;
   ir_node *succ;
 
-  arity = 1 + get_irn_arity(node)
+  arity = 1 + intern_get_irn_arity(node)
             + ((is_Block(node)) ? 0 : 1);
   *anz += arity;
 
   start = (is_Block(node)) ? 0 : -1;
-  for(i = start; i < get_irn_arity(node); i++)
+  for(i = start; i < intern_get_irn_arity(node); i++)
     {
-      succ = get_irn_n(node, i);
+      succ = intern_get_irn_n(node, i);
       succ->out = (ir_node **)((int)succ->out + 1);
     }
 }
@@ -380,9 +377,9 @@ static void set_out_pointer(ir_node * node, void * env) {
   ir_node *succ;
   int start = (!is_Block(node)) ? -1 : 0;
 
-  for(i = start; i < get_irn_arity(node); i++)
+  for(i = start; i < intern_get_irn_arity(node); i++)
     {
-      succ = get_irn_n(node, i);
+      succ = intern_get_irn_n(node, i);
       succ->out[get_irn_n_outs(succ)+1] = node;
       succ->out[0] = (ir_node *) (get_irn_n_outs(succ) + 1);
     }
@@ -412,6 +409,8 @@ void compute_ip_outs(void) {
   int n_out_edges;
   ir_node **out_edges;
 
+  if (irp->outs_state != no_outs) free_ip_outs();
+
   global_count = n_out_edges = count_ip_outs();
   out_edges = (ir_node **) malloc (n_out_edges * sizeof(ir_node *));
   set_irp_ip_outedges(out_edges);
@@ -421,11 +420,12 @@ void compute_ip_outs(void) {
 void free_ip_outs(void)
 {
   ir_node **out_edges = get_irp_ip_outedges();
-  if(out_edges != NULL)
+  if (out_edges != NULL)
     {
       free(out_edges);
       set_irp_ip_outedges(NULL);
     }
+  irp->outs_state = no_outs;
 }