added Load/Store addres counter

[libfirm] / ir / st / st.c

diff --git a/ir/st/st.c b/ir/st/st.c
index ed7d501..e51d5a7 100644 (file)
--- a/ir/st/st.c
+++ b/ir/st/st.c
@@ -23,15 +23,24 @@
 #include "config.h"
 #endif
 
-# include "st.h"
+#include <assert.h>
 
-# include "irgwalk.h"
+#ifdef HAVE_STDIO_H
+# include <stdio.h>
+#endif
+#ifdef HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
+#ifdef HAVE_MALLOC_H
+# include <malloc.h>
+#endif
+#ifdef HAVE_ALLOCA_H
+# include <alloca.h>
+#endif
 
-#  include <stdio.h>
-# ifdef DEBUG_libfirm
-# endif /* def DEBUG_libfirm */
-#  include <stdlib.h>
-# include "misc.h"
+# include "st.h"
+# include "irgwalk.h"
+# include "xmalloc.h"
 
 /* init globals: */
 /*static*/ dtree_t *trees = 0;
@@ -116,9 +125,9 @@ static dt_t *new_dt (ir_graph *graph)
 
   res->n_blocks = n_blocks;
   res->graph    = graph;
-  res->blocks   = (ir_node**) calloc (n_blocks, sizeof (ir_node*));
-  res->idoms    = (ir_node**) calloc (n_blocks, sizeof (ir_node*));
-  res->masks    = (bs_t*)     calloc (n_blocks, sizeof (bs_t));
+  res->blocks   = xcalloc(n_blocks, sizeof(res->blocks[0]));
+  res->idoms    = xcalloc(n_blocks, sizeof(res->idoms[0]));
+  res->masks    = xcalloc(n_blocks, sizeof(res->masks[0]));
 
   assert (res && "no dt");
 
@@ -322,7 +331,7 @@ static void update_dominators (ir_node *block, void *env)
   /* check preds: */
   for (i = 0; i < n_ins; i ++)
     {
-      ir_node *in  = get_nodes_Block (get_irn_n (block, i));
+      ir_node *in  = get_nodes_block (get_irn_n (block, i));
       bs_t in_mask = get_mask  (dt, in);
 
       new_mask &= in_mask;
@@ -381,7 +390,7 @@ static ir_node *_get_idom (dt_t *dt, ir_node *block)
          {
                ir_node *ndom = 0;
 
-               pred = get_nodes_Block (get_irn_n (block, i));
+               pred = get_nodes_block (get_irn_n (block, i));
                ndom = _get_idom (dt, pred);
 
                if (ndom != idom)
@@ -435,7 +444,7 @@ ir_node *get_idom (ir_graph *g, ir_node *a)
 */
 dom_env_t *get_dom_env (ir_graph *graph, ir_node *a)
 {
-  dom_env_t *env = (dom_env_t*) calloc (1, sizeof (dom_env_t));
+  dom_env_t *env = xcalloc(1, sizeof(*env));
 
   env->graph   = graph;
   env->dt      = get_dominator_tree (graph);