make libfirm faster

[libfirm] / ir / ana / irdom.c

diff --git a/ir/ana/irdom.c b/ir/ana/irdom.c
index 773943a..6eee300 100644 (file)
--- a/ir/ana/irdom.c
+++ b/ir/ana/irdom.c
@@ -1,22 +1,28 @@
-/* Copyright (C) 2002 by Universitaet Karlsruhe
-** All rights reserved.
-**
-** Authors:  Goetz Lindenmaier
-**
-** irdom.c --- Dominator tree.
-**
-*/
-
-/* $Id$ */
+/*
+ * Project:     libFIRM
+ * File name:   ir/ana/irdom.c
+ * Purpose:     Construct and access dominator tree.
+ * Author:      Goetz Lindenmaier
+ * Modified by:
+ * Created:     2.2002
+ * CVS-ID:      $Id$
+ * Copyright:   (c) 2002-2003 Universität Karlsruhe
+ * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "irouts.h"
 
+#include "irgwalk.h"
 #include "irdom_t.h"
 #include "irgraph_t.h"   /* To access state field. */
 #include "irnode_t.h"
 
 /**********************************************************************/
-/** Accessing the dominator datastructures                           **/
+/** Accessing the dominator data structures                          **/
 /**********************************************************************/
 
 ir_node *get_Block_idom(ir_node *bl) {
@@ -69,7 +75,7 @@ void set_Block_dom_depth(ir_node *bl, int depth) {
 /**  **/
 /**********************************************************************/
 
-void count_and_init_blocks(ir_node *bl, void *env) {
+static void count_and_init_blocks(ir_node *bl, void *env) {
   int *n_blocks = (int *) env;
   (*n_blocks) ++;
 
@@ -106,8 +112,8 @@ typedef struct {
 
 /* Walks Blocks along the out datastructure.  If recursion started with
    Start block misses control dead blocks. */
-void init_tmp_dom_info(ir_node *bl, tmp_dom_info *parent,
-                      tmp_dom_info *tdi_list, int* used) {
+static void init_tmp_dom_info(ir_node *bl, tmp_dom_info *parent,
+                             tmp_dom_info *tdi_list, int* used) {
   tmp_dom_info *tdi;
   int i;
 
@@ -117,8 +123,6 @@ void init_tmp_dom_info(ir_node *bl, tmp_dom_info *parent,
   mark_Block_block_visited(bl);
   set_Block_pre_num(bl, *used);
 
-  //printf(" used: %d ", *used); DDMN(bl);
-
   tdi = &tdi_list[*used];
   ++(*used);
 
@@ -137,7 +141,6 @@ void init_tmp_dom_info(ir_node *bl, tmp_dom_info *parent,
   }
 }
 
-
 static void
 dom_compress (tmp_dom_info *v)
 {
@@ -153,7 +156,7 @@ dom_compress (tmp_dom_info *v)
 
 /* if V is a root, return v, else return the vertex u, not being the
    root, with minimum u->semi on the path from v to its root. */
-inline static tmp_dom_info*
+INLINE static tmp_dom_info*
 dom_eval (tmp_dom_info *v)
 {
   if (!v->ancestor) return v;
@@ -162,7 +165,7 @@ dom_eval (tmp_dom_info *v)
 }
 
 /* make V W's ancestor */
-inline static void
+INLINE static void
 dom_link (tmp_dom_info *v, tmp_dom_info *w)
 {
   w->ancestor = v;
@@ -186,8 +189,6 @@ void compute_doms(ir_graph *irg) {
   n_blocks = 0;
   irg_block_walk(get_irg_end(current_ir_graph), count_and_init_blocks, NULL, &n_blocks);
 
-  //printf("n_blocks is %d\n", n_blocks);
-
   /* Memory for temporary information. */
   tdi_list = (tmp_dom_info *) calloc(n_blocks, sizeof(tmp_dom_info));
 
@@ -195,32 +196,31 @@ void compute_doms(ir_graph *irg) {
   if (current_ir_graph->outs_state != outs_consistent)
     compute_outs(current_ir_graph);
 
-  /** Initialize the temporary information, add link to parent.  We don't do
+/**
       this with a standard walker as passing the parent to the sons isn't
       simple. **/
   used = 0;
   inc_irg_block_visited(current_ir_graph);
   init_tmp_dom_info(get_irg_start_block(current_ir_graph), NULL, tdi_list, &used);
   /* If not all blocks are reachable from Start by out edges this assertion
-     fails. */
-  //assert(used == n_blocks && "Precondition for dom construction violated");
+     fails.
+     assert(used == n_blocks && "Precondition for dom construction violated"); */
   n_blocks = used;
 
-  //printf("used is %d\n", used);
-
 
   for (i = n_blocks-1; i > 0; i--) {  /* Don't iterate the root, it's done. */
+    int irn_arity;
     tmp_dom_info *w = &tdi_list[i];
     tmp_dom_info *v;
 
-    //printf(" cfgpreds: %d ", get_Block_n_cfgpreds(w->block)); DDMN(w->block);
-
     /* Step 2 */
-    for (j = 0;  j < get_irn_arity(w->block);  j++) {
+    irn_arity = intern_get_irn_arity(w->block);
+    for (j = 0;  j < irn_arity;  j++) {
       ir_node *pred = get_nodes_Block(get_Block_cfgpred(w->block, j));
       tmp_dom_info *u;
 
-      if ((is_Bad(get_Block_cfgpred(w->block, j))) || (get_Block_pre_num (pred) == -1))
+      if ((is_Bad(get_Block_cfgpred(w->block, j))) ||
+         (get_Block_pre_num (pred) == -1))
        continue;       /* control-dead */
 
       u = dom_eval (&tdi_list[get_Block_pre_num(pred)]);
@@ -261,7 +261,7 @@ void compute_doms(ir_graph *irg) {
   }
 
   /* clean up */
-  // free(tdi_list);
+  /*  free(tdi_list); @@@ does not work !!?? */
   current_ir_graph = rem;
 }