X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fexternal%2Fread.c;h=955841385c3fd1bfef642c67b4524e4656664f49;hb=80cebecbcc1cfcc311c781f112da1712b25d4fca;hp=582c8c4cf7fa40ae99dcb3d8ff70d7aac91bc6c1;hpb=76b96857d89ee4ae89bae0c15d7fef34f3bea58c;p=libfirm

diff --git a/ir/external/read.c b/ir/external/read.c
index 582c8c4cf..955841385 100644
--- a/ir/external/read.c
+++ b/ir/external/read.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -56,8 +56,6 @@
 # define NODE_NAME(n, m) (0 == xmlStrcmp (n->name, (const xmlChar*) #m))
 # define CHECK_NAME(n, m) assert (0 == xmlStrcmp (n->name, (const xmlChar*) #m))
 
-# define NEW(T)     (T*)xmalloc(sizeof (T))
-
 
 #define VERBOSE_PRINTING 0
 
@@ -309,7 +307,7 @@ parseArg (xmlDocPtr doc, xmlNodePtr argelm)
 
   typeid = getNodeTypeStr (argelm);
 
-  arg = NEW (eff_t);
+  arg = XMALLOC(eff_t);
   arg -> kind = eff_arg;
   arg -> id = new_id_from_str(id);
   arg -> effect.arg.num = num;
@@ -331,7 +329,7 @@ parseValref (xmlDocPtr doc, xmlNodePtr valelm)
   ref_id = getNodeRefId (valelm);
   VERBOSE_PRINT ((stdout, "val->refid = \"%s\"\n", ref_id));
 
-  valref = NEW (eff_t);
+  valref = XMALLOC(eff_t);
   valref->kind = eff_valref;
   valref-> id = new_id_from_str(ref_id);
 
@@ -345,7 +343,7 @@ parseSelect (xmlDocPtr doc, xmlNodePtr selelm)
   entity_t *ent;
   xmlNodePtr child;
   eff_t *valref = NULL;
-  eff_t *sel = NEW (eff_t);
+  eff_t *sel = XMALLOC(eff_t);
   sel->kind = eff_select;
 
   CHECK_NAME (selelm, select);
@@ -377,7 +375,7 @@ parseLoad (xmlDocPtr doc, xmlNodePtr loadelm)
   ident *id;
   xmlNodePtr child;
   eff_t *sel;
-  eff_t *load = NEW (eff_t);
+  eff_t *load = XMALLOC(eff_t);
   load->kind = eff_load;
 
   CHECK_NAME (loadelm, load);
@@ -410,7 +408,7 @@ parseStore (xmlDocPtr doc, xmlNodePtr storeelm)
   xmlNodePtr child;
   eff_t *sel;
   eff_t *valref;
-  eff_t *store = NEW (eff_t);
+  eff_t *store = XMALLOC(eff_t);
   store->kind = eff_store;
 
   CHECK_NAME (storeelm, store);
@@ -443,7 +441,7 @@ parseAlloc (xmlDocPtr doc, xmlNodePtr allocelm)
 {
   ident *id;
   ident *type_id;
-  eff_t *alloc = NEW (eff_t); /* ...! */
+  eff_t *alloc = XMALLOC(eff_t); /* ...! */
   alloc->kind = eff_alloc;
   (void) doc;
 
@@ -468,7 +466,7 @@ parseCall (xmlDocPtr doc, xmlNodePtr callelm)
   eff_t *sel;
   xmlNodePtr arg;
   int n_args;
-  eff_t *call = NEW (eff_t);
+  eff_t *call = XMALLOC(eff_t);
   call->kind = eff_call;
 
   CHECK_NAME (callelm, call);
@@ -502,7 +500,7 @@ parseCall (xmlDocPtr doc, xmlNodePtr callelm)
   free (sel);
 
   if (0 != n_args) {
-    ident **args = (ident**) xmalloc(n_args * sizeof(ident*));
+    ident **args = XMALLOCN(ident*, n_args);
     int i = 0;
 
     while (NULL != arg) {
@@ -526,7 +524,7 @@ parseJoin (xmlDocPtr doc, xmlNodePtr joinelm)
   ident **ins;
   int i;
   xmlNodePtr child;
-  eff_t *join = NEW (eff_t);
+  eff_t *join = XMALLOC(eff_t);
   join->kind = eff_join;
 
   CHECK_NAME (joinelm, join);
@@ -542,7 +540,7 @@ parseJoin (xmlDocPtr doc, xmlNodePtr joinelm)
     child = child->next;
   }
 
-  ins = (ident **) xmalloc (n_ins * sizeof (ident *) );
+  ins = XMALLOCN(ident*, n_ins);
   i = 0;
   child = get_valid_child(joinelm);
 
@@ -564,7 +562,7 @@ static eff_t*
 parseUnknown (xmlDocPtr doc, xmlNodePtr unknownelm)
 {
   ident *id;
-  eff_t *unknown = NEW (eff_t);
+  eff_t *unknown = XMALLOC(eff_t);
   unknown->kind = eff_unknown;
   (void) doc;
 
@@ -580,7 +578,7 @@ static eff_t*
 parseReturn (xmlDocPtr doc, xmlNodePtr retelm)
 {
   xmlNodePtr child;
-  eff_t *ret = NEW (eff_t);
+  eff_t *ret = XMALLOC(eff_t);
   ret->kind = eff_ret;
 
   CHECK_NAME (retelm, ret);
@@ -605,7 +603,7 @@ parseRaise (xmlDocPtr doc, xmlNodePtr raiseelm)
   const char *tp_id;
   eff_t *valref;
   xmlNodePtr child;
-  eff_t *raise = NEW (eff_t);
+  eff_t *raise = XMALLOC(eff_t);
   raise->kind = eff_raise;
 
   CHECK_NAME (raiseelm, raise);
@@ -639,7 +637,7 @@ parseType (xmlDocPtr doc, xmlNodePtr typeelm)
   VERBOSE_PRINT ((stdout, "type = \"%s\"\n", getNodeTypeStr (typeelm)));
   (void) doc;
 
-  type = (type_t*) xmalloc (sizeof (type_t));
+  type = XMALLOC(type_t);
   type -> type_ident = new_id_from_str(getNodeTypeStr (typeelm));
   type -> id         = new_id_from_str(tp_id);
 
@@ -651,7 +649,7 @@ parseType (xmlDocPtr doc, xmlNodePtr typeelm)
 static void
 parseEntity (xmlDocPtr doc, xmlNodePtr entelm)
 {
-  entity_t *ent = NEW (entity_t);
+  entity_t *ent = XMALLOC(entity_t);
   (void) doc;
 
   /* parse it */
@@ -691,10 +689,10 @@ parseEffect (xmlDocPtr doc, xmlNodePtr effelm)
   }
   VERBOSE_PRINT ((stdout, "has %d effects\n", n_effs));
 
-  curr_effs = NEW (proc_t);
+  curr_effs = XMALLOC(proc_t);
   curr_effs -> proc_ident = new_id_from_str(procname);
   curr_effs -> ownerid = new_id_from_str(ownerid);
-  curr_effs->effs = (eff_t**) xmalloc (n_effs * sizeof (eff_t*));
+  curr_effs->effs = XMALLOCN(eff_t*, n_effs);
 
   cur = effelm -> xmlChildrenNode;
   while (NULL != cur) {
@@ -791,7 +789,7 @@ int read_extern (const char *filename)
     cur = cur->next;
   }
 
-  module = NEW(module_t);
+  module = XMALLOC(module_t);
   module -> id = mod_id;
   module -> types = types;
   module -> entities = entities;
@@ -817,7 +815,6 @@ void freeArg (eff_t *arg)
 {
   VERBOSE_PRINT ((stdout, "free arg node \t0x%08x\n", (int) arg));
   free(arg);
-  return;
 }
 
 static
@@ -825,7 +822,6 @@ void freeValref (eff_t *valref)
 {
   VERBOSE_PRINT ((stdout, "free valref node \t0x%08x\n", (int) valref));
   free(valref);
-  return;
 }
 
 static
@@ -833,7 +829,6 @@ void freeSelect (eff_t *sel)
 {
   VERBOSE_PRINT ((stdout, "free select node \t0x%08x\n", (int) sel));
   free(sel);
-  return;
 }
 
 static
@@ -841,7 +836,6 @@ void freeLoad (eff_t *load)
 {
   VERBOSE_PRINT ((stdout, "free load node \t0x%08x\n", (int) load));
   free (load);
-  return;
 }
 
 static
@@ -849,7 +843,6 @@ void freeStore (eff_t *store)
 {
   VERBOSE_PRINT ((stdout, "free store node \t0x%08x\n", (int) store));
   free (store);
-  return;
 }
 
 static
@@ -857,7 +850,6 @@ void freeAlloc (eff_t *alloc)
 {
   VERBOSE_PRINT ((stdout, "free alloc node \t0x%08x\n", (int) alloc));
   free(alloc);
-  return;
 }
 
 static
@@ -866,7 +858,6 @@ void freeCall (eff_t *call)
   VERBOSE_PRINT ((stdout, "free call node \t0x%08x\n", (int) call));
   free(call -> effect.call.args);
   free(call);
-  return;
 }
 
 static
@@ -875,7 +866,6 @@ void freeJoin (eff_t *join)
   VERBOSE_PRINT ((stdout, "free join node \t0x%08x\n", (int) join));
   free(join -> effect.join.ins);
   free(join);
-  return;
 }
 
 static
@@ -883,7 +873,6 @@ void freeUnknown (eff_t *unknown)
 {
   VERBOSE_PRINT ((stdout, "free unknown node \t0x%08x\n", (int) unknown));
   free(unknown);
-  return;
 }
 
 static
@@ -891,7 +880,6 @@ void freeReturn (eff_t *ret)
 {
   VERBOSE_PRINT ((stdout, "free ret node \t0x%08x\n", (int) ret));
   free(ret);
-  return;
 }
 
 static
@@ -899,7 +887,6 @@ void freeRaise (eff_t *raise)
 {
   VERBOSE_PRINT ((stdout, "free raise node \t0x%08x\n", (int) raise));
   free (raise);
-  return;
 }
 
 
@@ -1324,7 +1311,7 @@ static void create_abstract_join (ir_graph *irg, proc_t *proc, eff_t *eff)
 
   c_block   = new_immBlock ();  /* for the Phi after the branch(es) */
 
-  ins = (ir_node**) xmalloc (n_ins * sizeof (ir_node*));
+  ins = XMALLOCN(ir_node*, n_ins);
   for (i = 0; i < n_ins; i ++) {
     ir_node *projX   = NULL;
     ir_node *s_block = NULL;
@@ -1359,7 +1346,6 @@ static void create_abstract_join (ir_graph *irg, proc_t *proc, eff_t *eff)
   phi = new_Phi (n_ins, ins, join_md);
 
   mature_immBlock (c_block);
-  memset (ins, 0x00, n_ins * sizeof (ir_node*));
   free (ins);
 
   eff->firmnode = phi;