X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fst%2Fst.c;h=e51d5a71887520f7eae4b6ff20f811e88fb440ac;hb=e53178f1b87eded7e79d3de42e4cee9d0b43c9e0;hp=e0edbc9c3d25378d6b66e4872af228538c0edbc4;hpb=c246cf7524ad78ed0f8de4f4b1439e2812f3df79;p=libfirm

diff --git a/ir/st/st.c b/ir/st/st.c
index e0edbc9c3..e51d5a718 100644
--- a/ir/st/st.c
+++ b/ir/st/st.c
@@ -23,14 +23,20 @@
 #include "config.h"
 #endif
 
-# include <stdio.h>
+#include <assert.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 "st.h"
 # include "irgwalk.h"
@@ -119,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");
 
@@ -438,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);