X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fexternal%2Fread.c;h=955841385c3fd1bfef642c67b4524e4656664f49;hb=45ecc187cee7107c83c1f9618a1e1e586df73644;hp=44595fe60823c708e6cbc78214f565b58efa9616;hpb=c2833257101eb926edbfc67e52dd207d3ae73714;p=libfirm

diff --git a/ir/external/read.c b/ir/external/read.c
index 44595fe60..955841385 100644
--- a/ir/external/read.c
+++ b/ir/external/read.c
@@ -1,32 +1,65 @@
-/* -*- c -*- */
-
 /*
- * Project:     libFIRM
- * File name:   ir/external/read.c
- * Purpose:     Read descriptions of external effects
- * Author:      Florian
- * Modified by: Boris Boesler
- * Created:     11.10.2004
- * CVS-ID:      $Id$
- * Copyright:   (c) 1999-2004 Universität Karlsruhe
- * Licence:     This file is protected by GPL -  GNU GENERAL PUBLIC LICENSE.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
+ *
+ * This file is part of libFirm.
+ *
+ * This file may be distributed and/or modified under the terms of the
+ * GNU General Public License version 2 as published by the Free Software
+ * Foundation and appearing in the file LICENSE.GPL included in the
+ * packaging of this file.
+ *
+ * Licensees holding valid libFirm Professional Edition licenses may use
+ * this file in accordance with the libFirm Commercial License.
+ * Agreement provided with the Software.
+ *
+ * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+ * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE.
  */
 
+/**
+ * @file
+ * @brief     Read descriptions of external effects
+ * @author    Florian, Boris Boesler
+ * @date      11.10.2004
+ * @version   $Id$
+ */
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
-#define _GNU_SOURCE
+#include <stdlib.h>
 #include <string.h>
+#include <assert.h>
+
+#include <libxml/xmlmemory.h>
+#include <libxml/parser.h>
+#include <libxml/encoding.h>
 
-# include "read.h"
+#include "read_t.h"
+#include "read.h"
 #include "irprog.h"
 #include "irgraph.h"
+#include "pseudo_irg.h"
 #include "ircons.h"
 #include "irmode.h"
 #include "irdump.h"
 #include "irvrfy.h"
-#include "type.h"
+#include "typerep.h"
 #include "tv.h"
+#include "xmalloc.h"
+
+# define MY_ENCODING "ISO-8859-1"
+
+# define CHECK(ptr,msg)     assert (ptr && msg)
+
+# 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))
 
-#if 0
+
+#define VERBOSE_PRINTING 0
+
+#if VERBOSE_PRINTING
 # define VERBOSE_PRINT(s) fprintf s
 #else
 # define VERBOSE_PRINT(s)
@@ -42,7 +75,9 @@ static module_t *modules = NULL;
 /* @@@ HACK */
 static module_t *current_module = NULL;
 
-static char *effect_string[] = {
+#if VERBOSE_PRINTING
+/* this is only used inside a VERBOSE_PRINT() call */
+static const char *effect_string[] = {
   "arg",
   "valref",
   "select",
@@ -55,16 +90,17 @@ static char *effect_string[] = {
   "raise",
   "ret"
 };
+#endif /* defined VERBOSE_PRINTING */
 
-static const char*
-getNodeModule (xmlNodePtr node)
+static ident*
+getNodeModuleIdent (xmlNodePtr node)
 {
   const char *mod_str = (const char*) xmlGetProp (node, BAD_CAST "module");
 
   if (NULL == mod_str) {
     return (NULL);
   } else {
-    const char *res = strdup (mod_str);
+    ident *res = new_id_from_str (mod_str);
     return (res);
   }
 }
@@ -74,39 +110,41 @@ getNodeProcName (xmlNodePtr node)
 {
   const char *proc_str = (const char*) xmlGetProp (node, BAD_CAST "procname");
   assert (proc_str);
-  return (strdup (proc_str));
+  return (proc_str);
 }
 
+# ifdef NEEDED
 static char*
 getNodeClassName (xmlNodePtr node)
 {
   char *proc_str = (char*) xmlGetProp (node, BAD_CAST "class");
   assert (proc_str);
-  return (strdup (proc_str));
+  return ( (proc_str));
 }
+# endif /* defined NEEDED */
 
 static const char*
 getNodeId (xmlNodePtr node)
 {
   const char *id_str = (const char*) xmlGetProp (node, BAD_CAST "id");
   assert (id_str);
-  return (strdup (id_str));
+  return (id_str);
 }
 
-static firmid_t
+static const char *
 getNodeRefId (xmlNodePtr node)
 {
-  firmid_t refid_str = (char*) xmlGetProp (node, BAD_CAST "refid");
+  const char *refid_str = (char*) xmlGetProp (node, BAD_CAST "refid");
   assert (refid_str);
-  return (strdup(refid_str));
+  return ((refid_str));
 }
 
-static firmid_t
+static const char*
 getNodeTypeId (xmlNodePtr node)
 {
-  firmid_t type_str = (char*) xmlGetProp (node, BAD_CAST "type");
+  const char *type_str = (char*) xmlGetProp (node, BAD_CAST "type");
   assert (type_str);
-  return (strdup(type_str));
+  return ((type_str));
 }
 
 static const char
@@ -114,7 +152,6 @@ static const char
 {
   const char *type_str = (char*) xmlGetProp (node, BAD_CAST "type");
   assert (type_str);
-
   return (type_str);
 }
 
@@ -129,7 +166,7 @@ getNodeOwnerStr (xmlNodePtr node)
 static const char
 *getNodeEntityStr (xmlNodePtr node)
 {
-  const char *ent_str = (char*) xmlGetProp (node, BAD_CAST "entity");
+  const char *ent_str = (char*) xmlGetProp (node, BAD_CAST "ir_entity");
   assert (ent_str);
 
   return (ent_str);
@@ -139,13 +176,14 @@ static const char
 /*
   was Public Interface
 */
+# ifdef NEEDED
 static
-type_t *getTypeByName (const char *name)
+type_t *getTypeByIdent (ident *id)
 {
-  type_t *curr = types;
+  type_t *curr = types; // @@@ TODO module -> types
 
   while (NULL != curr) {
-    if (0 == strcmp (name, curr->name)) {
+    if (id == curr -> type_ident) {
       return (curr);
     }
     curr = curr->prev;
@@ -153,14 +191,16 @@ type_t *getTypeByName (const char *name)
 
   return (NULL);
 }
+# endif /* defined NEEDED */
 
+# ifdef NEEDED
 static
-type_t *getTypeById (firmid_t id)
+type_t *getTypeById (ident *id)
 {
-  type_t *curr = types;
+  type_t *curr = types; // which ones?
 
   while (NULL != curr) {
-    if (0 == strcmp(id, curr->id)) {
+    if (id == curr -> id) {
       return (curr);
     }
     curr = curr->prev;
@@ -168,15 +208,17 @@ type_t *getTypeById (firmid_t id)
 
   return (NULL);
 }
+# endif /* defined NEEDED */
 
+# ifdef NEEDED
 static
-entity_t *getEntityByNames (const char *name, const char *tp_name)
+entity_t *getEntityByIdents (ident *name, ident *tp_ident)
 {
-  entity_t *curr = entities;
+  entity_t *curr = entities; // TODO module -> entities
 
   while (NULL != curr) {
-    if ((0 == strcmp (name, curr->name))
-	&& (0 == strcmp (tp_name, curr->tp_name))) {
+    if ((name == curr -> ent_ident)
+    && (tp_ident == curr -> tp_ident)) {
       return (curr);
     }
     curr = curr->prev;
@@ -184,14 +226,15 @@ entity_t *getEntityByNames (const char *name, const char *tp_name)
 
   return (NULL);
 }
+# endif /* defined NEEDED */
 
 static
-entity_t *getEntityById (firmid_t id)
+entity_t *getEntityById (ident *id)
 {
   entity_t *curr = entities;
 
   while (NULL != curr) {
-    if (0 == strcmp(id, curr->id)) {
+    if (id == curr -> id) {
       return (curr);
     }
     curr = curr->prev;
@@ -200,13 +243,14 @@ entity_t *getEntityById (firmid_t id)
   return (NULL);
 }
 
+# ifdef NEEDED
 static
-proc_t *getEffectByName (const char *procname)
+proc_t *getEffectByName (ident *proc_ident)
 {
   proc_t *curr_effs = procs;
 
   while (NULL != curr_effs) {
-    if (0 == strcmp (procname, curr_effs->procname)) {
+    if (proc_ident == curr_effs -> proc_ident) {
       return (curr_effs);
     }
     curr_effs = curr_effs->next;
@@ -214,7 +258,30 @@ proc_t *getEffectByName (const char *procname)
 
   return (NULL);
 }
+# endif /* defined NEEDED */
 
+static
+xmlNodePtr get_any_valid_child(xmlNodePtr elem)
+{
+  xmlNodePtr child;
+
+  assert(elem && "no element");
+  child = elem -> xmlChildrenNode;
+  while(child && (NODE_NAME (child, comment))) {
+    child = child -> next;
+  }
+  return(child);
+}
+
+static
+xmlNodePtr get_valid_child(xmlNodePtr elem)
+{
+  xmlNodePtr child;
+
+  child = get_any_valid_child(elem);
+  assert(child && "lost child in deep black forest");
+  return(child);
+}
 
 /*
  * parse XML structure and construct an additional structure
@@ -227,6 +294,7 @@ parseArg (xmlDocPtr doc, xmlNodePtr argelm)
   int num;
   char *num_str;
   eff_t *arg;
+  (void) doc;
 
   CHECK_NAME (argelm, arg);
   VERBOSE_PRINT ((stdout, "arg node \t0x%08x\n", (int) argelm));
@@ -239,20 +307,21 @@ parseArg (xmlDocPtr doc, xmlNodePtr argelm)
 
   typeid = getNodeTypeStr (argelm);
 
-  arg = NEW (eff_t);
+  arg = XMALLOC(eff_t);
   arg -> kind = eff_arg;
-  arg -> id = id;
+  arg -> id = new_id_from_str(id);
   arg -> effect.arg.num = num;
-  arg -> effect.arg.type = typeid;
+  arg -> effect.arg.type_ident = new_id_from_str(typeid);
 
   return (arg);
 }
 
-static eff_t
-*parseValref (xmlDocPtr doc, xmlNodePtr valelm)
+static eff_t*
+parseValref (xmlDocPtr doc, xmlNodePtr valelm)
 {
-  firmid_t ref_id;
+  const char *ref_id;
   eff_t *valref;
+  (void) doc;
 
   CHECK_NAME (valelm, valref);
   VERBOSE_PRINT ((stdout, "valref node \t0x%08x\n", (int) valelm));
@@ -260,29 +329,29 @@ static eff_t
   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 = ref_id;
+  valref-> id = new_id_from_str(ref_id);
 
   return (valref);
 }
 
-static eff_t
-*parseSelect (xmlDocPtr doc, xmlNodePtr selelm)
+static eff_t*
+parseSelect (xmlDocPtr doc, xmlNodePtr selelm)
 {
-  firmid_t entity_id = getNodeEntityStr (selelm);
+  ident *entity_id = new_id_from_str(getNodeEntityStr (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);
   VERBOSE_PRINT ((stdout, "select node \t0x%08x\n", (int) selelm));
 
   ent = getEntityById (entity_id);
-  assert(ent && "entity not found");
-  VERBOSE_PRINT ((stdout, "select entity %s\n", ent -> name));
+  assert(ent && "ir_entity not found");
+  VERBOSE_PRINT ((stdout, "select ir_entity %s\n", get_id_str(ent -> ent_ident)));
 
   child = selelm->xmlChildrenNode;
 
@@ -300,52 +369,64 @@ static eff_t
   return (sel);
 }
 
-static eff_t
-*parseLoad (xmlDocPtr doc, xmlNodePtr loadelm)
+static eff_t*
+parseLoad (xmlDocPtr doc, xmlNodePtr loadelm)
 {
-  firmid_t id;
+  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);
   VERBOSE_PRINT ((stdout, "load node \t0x%08x\n", (int) loadelm));
-  id = getNodeId (loadelm);
-
-  child = loadelm->xmlChildrenNode;
-
-  sel = parseSelect (doc, child);
+  id = new_id_from_str(getNodeId (loadelm));
+
+  child = get_valid_child(loadelm);
+  if(NODE_NAME (child, select)) {
+    sel = parseSelect (doc, child);
+    load-> effect.load.ent = sel-> effect.select.ent;
+    VERBOSE_PRINT ((stdout, "load ir_entity \t%s\n",
+            get_id_str(load -> effect.load.ent -> ent_ident)));
+  }
+  else {
+    sel = parseValref (doc, child);
+    load-> effect.load.ent = NULL;
+  }
 
   load-> id = id;
   load-> effect.load.ptrrefid = sel-> id;
-  load-> effect.load.ent = sel-> effect.select.ent;
-  VERBOSE_PRINT ((stdout,
-		  "load entity \t%s\n", load -> effect.load.ent -> name));
 
   free (sel);
 
   return (load);
 }
 
-static eff_t
-*parseStore (xmlDocPtr doc, xmlNodePtr storeelm)
+static eff_t*
+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);
   VERBOSE_PRINT ((stdout, "store node \t0x%08x\n", (int) storeelm));
 
-  child = storeelm->xmlChildrenNode;
-  sel = parseSelect (doc, child);
+  child = get_valid_child(storeelm);
+  if(NODE_NAME (child, select)) {
+    sel = parseSelect (doc, child);
+    store-> effect.store.ent = sel-> effect.select.ent;
+  }
+  else {
+    sel = parseValref (doc, child);
+    store-> effect.store.ent = NULL;
+  }
+
   child = child->next;
   valref = parseValref (doc, child);
 
-  store-> effect.store.ent = sel-> effect.select.ent;
   store-> effect.store.ptrrefid = sel-> id;
   store-> effect.store.valrefid = valref-> id;
 
@@ -355,20 +436,21 @@ static eff_t
   return (store);
 }
 
-static eff_t
-*parseAlloc (xmlDocPtr doc, xmlNodePtr allocelm)
+static eff_t*
+parseAlloc (xmlDocPtr doc, xmlNodePtr allocelm)
 {
-  firmid_t id;
-  firmid_t type_id;
-  eff_t *alloc = NEW (eff_t); /* ...! */
+  ident *id;
+  ident *type_id;
+  eff_t *alloc = XMALLOC(eff_t); /* ...! */
   alloc->kind = eff_alloc;
+  (void) doc;
 
   CHECK_NAME (allocelm, alloc);
   VERBOSE_PRINT ((stdout, "alloc node \t0x%08x\n", (int) allocelm));
-  id = getNodeId (allocelm);
-  VERBOSE_PRINT ((stdout, "alloc->id = \"%s\"\n", id));
-  type_id = getNodeTypeId (allocelm);
-  VERBOSE_PRINT ((stdout, "alloc->type_id = \"%s\"\n", type_id));
+  id = new_id_from_str(getNodeId (allocelm));
+  VERBOSE_PRINT ((stdout, "alloc->id = \"%s\"\n", get_id_str(id)));
+  type_id = new_id_from_str(getNodeTypeId (allocelm));
+  VERBOSE_PRINT ((stdout, "alloc->type_id = \"%s\"\n", get_id_str(type_id)));
 
   alloc-> id = id;
   alloc-> effect.alloc.tp_id = type_id;
@@ -376,24 +458,32 @@ static eff_t
   return (alloc);
 }
 
-static eff_t
-*parseCall (xmlDocPtr doc, xmlNodePtr callelm)
+static eff_t*
+parseCall (xmlDocPtr doc, xmlNodePtr callelm)
 {
-  firmid_t id;
+  ident *id;
   xmlNodePtr child;
   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);
   VERBOSE_PRINT ((stdout, "call node \t0x%08x\n", (int) callelm));
-  id = getNodeId (callelm);
-  VERBOSE_PRINT ((stdout, "call->id = \"%s\"\n", id));
+  id = new_id_from_str(getNodeId (callelm));
+  VERBOSE_PRINT ((stdout, "call->id = \"%s\"\n", get_id_str(id)));
+
+  child = get_valid_child(callelm);
+  if(NODE_NAME (child, select)) {
+    sel = parseSelect (doc, child);
+    call-> effect.call.ent = sel-> effect.select.ent;
+  }
+  else {
+    sel = parseValref (doc, child);
+    call-> effect.call.ent = NULL;
+  }
 
-  child = callelm->xmlChildrenNode;
-  sel = parseSelect (doc, child);
   arg = child = child->next;
   n_args = 0;
 
@@ -404,14 +494,13 @@ static eff_t
 
   call-> id = id;
   call-> effect.call.valrefid = sel-> id;
-  call-> effect.call.ent = sel-> effect.select.ent;
   call-> effect.call.n_args = n_args;
   call-> effect.call.args = NULL;
 
   free (sel);
 
   if (0 != n_args) {
-    firmid_t *args = (firmid_t*) malloc (n_args * sizeof (firmid_t) );
+    ident **args = XMALLOCN(ident*, n_args);
     int i = 0;
 
     while (NULL != arg) {
@@ -427,23 +516,23 @@ static eff_t
   return (call);
 }
 
-static eff_t
-*parseJoin (xmlDocPtr doc, xmlNodePtr joinelm)
+static eff_t*
+parseJoin (xmlDocPtr doc, xmlNodePtr joinelm)
 {
-  firmid_t id;
+  ident *id;
   int n_ins;
-  firmid_t *ins;
+  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);
   VERBOSE_PRINT ((stdout, "join node \t0x%08x\n", (int) joinelm));
-  id = getNodeId (joinelm);
-  VERBOSE_PRINT ((stdout, "join->id = \"%s\"\n", id));
+  id = new_id_from_str(getNodeId (joinelm));
+  VERBOSE_PRINT ((stdout, "join->id = \"%s\"\n", get_id_str(id)));
 
-  child = joinelm->xmlChildrenNode;
+  child = get_valid_child(joinelm);
   n_ins = 0;
 
   while (NULL != child) {
@@ -451,9 +540,9 @@ static eff_t
     child = child->next;
   }
 
-  ins = (firmid_t*) malloc (n_ins * sizeof (firmid_t) );
+  ins = XMALLOCN(ident*, n_ins);
   i = 0;
-  child = joinelm->xmlChildrenNode;
+  child = get_valid_child(joinelm);
 
   while (NULL != child) {
     eff_t *valref = parseValref (doc, child);
@@ -469,32 +558,33 @@ static eff_t
   return (join);
 }
 
-static eff_t
-*parseUnknown (xmlDocPtr doc, xmlNodePtr unknownelm)
+static eff_t*
+parseUnknown (xmlDocPtr doc, xmlNodePtr unknownelm)
 {
-  firmid_t id;
-  eff_t *unknown = NEW (eff_t);
+  ident *id;
+  eff_t *unknown = XMALLOC(eff_t);
   unknown->kind = eff_unknown;
+  (void) doc;
 
   CHECK_NAME (unknownelm, unknown);
   VERBOSE_PRINT ((stdout, "unknown node \t0x%08x\n", (int) unknownelm));
-  id = getNodeId (unknownelm);
+  id = new_id_from_str(getNodeId (unknownelm));
   unknown-> id = id;
 
   return (unknown);
 }
 
-static eff_t
-*parseReturn (xmlDocPtr doc, xmlNodePtr retelm)
+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);
   VERBOSE_PRINT ((stdout, "ret node \t0x%08x\n", (int) retelm));
 
-  child = retelm->xmlChildrenNode;
+  child = get_any_valid_child(retelm);
 
   if (child) {
     eff_t *valref = parseValref (doc, child);
@@ -507,26 +597,26 @@ static eff_t
   return (ret);
 }
 
-static eff_t
-*parseRaise (xmlDocPtr doc, xmlNodePtr raiseelm)
+static eff_t*
+parseRaise (xmlDocPtr doc, xmlNodePtr raiseelm)
 {
-  firmid_t tp_id;
+  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);
   VERBOSE_PRINT ((stdout, "raise node \t0x%08x\n", (int) raiseelm));
   tp_id = getNodeTypeId (raiseelm);
   VERBOSE_PRINT ((stdout, "raise->type = \"%s\"\n", tp_id));
-  child = raiseelm->xmlChildrenNode;
+  child = get_valid_child(raiseelm);
 
   assert (NULL != child);
 
   valref = parseValref (doc, child);
   raise-> effect.raise.valref = valref-> id;
-  raise-> effect.raise.tp_id = tp_id;
+  raise-> effect.raise.tp_id = new_id_from_str(tp_id);
   free (valref);
 
   return (raise);
@@ -542,36 +632,38 @@ static void
 parseType (xmlDocPtr doc, xmlNodePtr typeelm)
 {
   type_t *type;
-  firmid_t tp_id = getNodeId (typeelm);
+  const char *tp_id = getNodeId (typeelm);
   VERBOSE_PRINT ((stdout, "type node \t0x%08x (%s)\n", (int) typeelm, tp_id));
   VERBOSE_PRINT ((stdout, "type = \"%s\"\n", getNodeTypeStr (typeelm)));
+  (void) doc;
 
-  type = (type_t*) malloc (sizeof (type_t));
-  type->name = (char*) strdup (getNodeTypeStr (typeelm));
-  type->id = tp_id;
+  type = XMALLOC(type_t);
+  type -> type_ident = new_id_from_str(getNodeTypeStr (typeelm));
+  type -> id         = new_id_from_str(tp_id);
 
   type->prev = types;
   types = type;
 }
 
-/** parse an entity node and insert it into the list */
+/** parse an ir_entity node and insert it into the list */
 static void
 parseEntity (xmlDocPtr doc, xmlNodePtr entelm)
 {
-  entity_t *ent = NEW (entity_t);
+  entity_t *ent = XMALLOC(entity_t);
+  (void) doc;
 
   /* parse it */
-  firmid_t ent_id = getNodeId (entelm);
-  /* fprintf (stdout, "entity node \t0x%08x (%d)\n", (int) entelm, ent_id); */
+  const char *ent_id = getNodeId (entelm);
+  /* fprintf (stdout, "ir_entity node \t0x%08x (%d)\n", (int) entelm, ent_id); */
   VERBOSE_PRINT ((stdout, "ent  = \"%s.%s\"\n",
-		  getNodeTypeStr (entelm),
-		  getNodeEntityStr (entelm)));
+          getNodeTypeStr (entelm),
+          getNodeEntityStr (entelm)));
 
 
-  ent->name    = (char*) strdup (getNodeEntityStr (entelm));
-  ent->tp_name = (char*) strdup (getNodeTypeStr   (entelm));
-  ent -> owner = (char*) strdup (getNodeOwnerStr  (entelm));
-  ent->id = ent_id;
+  ent -> ent_ident = new_id_from_str (getNodeEntityStr (entelm));
+  ent -> tp_ident  = new_id_from_str (getNodeTypeStr   (entelm));
+  ent -> owner     = new_id_from_str (getNodeOwnerStr  (entelm));
+  ent -> id = new_id_from_str(ent_id);
 
   ent->prev = entities;
   entities = ent;
@@ -583,7 +675,7 @@ parseEffect (xmlDocPtr doc, xmlNodePtr effelm)
 {
   xmlNodePtr cur;
   const char *procname = getNodeProcName (effelm);
-  const char *typeid = getNodeTypeStr (effelm);
+  const char *ownerid = getNodeOwnerStr (effelm);
   proc_t *curr_effs = NULL;
   int i = 0;
   int n_effs = 0;
@@ -597,10 +689,10 @@ parseEffect (xmlDocPtr doc, xmlNodePtr effelm)
   }
   VERBOSE_PRINT ((stdout, "has %d effects\n", n_effs));
 
-  curr_effs = NEW (proc_t);
-  curr_effs->procname = procname;
-  curr_effs->typeid = typeid;
-  curr_effs->effs = (eff_t**) malloc (n_effs * sizeof (eff_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 = XMALLOCN(eff_t*, n_effs);
 
   cur = effelm -> xmlChildrenNode;
   while (NULL != cur) {
@@ -645,12 +737,12 @@ parseEffect (xmlDocPtr doc, xmlNodePtr effelm)
 
 
 static
-void read_extern (const char *filename)
+int read_extern (const char *filename)
 {
   /* xmlNsPtr ns = NULL; */           /* no namespace for us */
   xmlDocPtr doc;                /* whole document */
   xmlNodePtr cur;               /* current node */
-  const char *mod_str;
+  ident *mod_id;
   module_t *module;
 
   /* i've got no idea what the VERSION cast is all about. voodoo
@@ -658,7 +750,8 @@ void read_extern (const char *filename)
   LIBXML_TEST_VERSION xmlKeepBlanksDefault (0);
   VERBOSE_PRINT((stdout, "read file %s\n", filename));
   doc = xmlParseFile (filename);
-  CHECK (doc, "xmlParseFile");
+  if (! doc)
+    return 0;
 
   cur = xmlDocGetRootElement (doc);
   CHECK (cur, "xmlDocGetRootElement");
@@ -669,9 +762,10 @@ void read_extern (const char *filename)
     exit (EXIT_FAILURE);
   }
 
-  mod_str = getNodeModule (cur);
-  if (NULL != mod_str) {
-    VERBOSE_PRINT ((stdout, "effects for \"%s\"\n", mod_str));
+  mod_id = getNodeModuleIdent (cur);
+  if (NULL != mod_id) {
+    VERBOSE_PRINT ((stdout, "effects for \"%s\"\n",
+            get_id_str(mod_id)));
   }
   else {
     VERBOSE_PRINT ((stdout, "effects \t0x%08x\n", (int) cur));
@@ -682,7 +776,7 @@ void read_extern (const char *filename)
   while (cur != NULL) {
     if (NODE_NAME (cur, type)) {
       parseType (doc, cur);
-    } else if (NODE_NAME (cur, entity)) {
+    } else if (NODE_NAME (cur, ir_entity)) {
       parseEntity (doc, cur);
     } else if (NODE_NAME (cur, effect)) {
       parseEffect (doc, cur);
@@ -695,8 +789,8 @@ void read_extern (const char *filename)
     cur = cur->next;
   }
 
-  module = NEW(module_t);
-  module -> name = mod_str;
+  module = XMALLOC(module_t);
+  module -> id = mod_id;
   module -> types = types;
   module -> entities = entities;
   module -> procs = procs;
@@ -707,6 +801,8 @@ void read_extern (const char *filename)
 
   module -> next = modules;
   modules = module;
+
+  return 1;
 }
 
 /********************************************************************/
@@ -719,7 +815,6 @@ void freeArg (eff_t *arg)
 {
   VERBOSE_PRINT ((stdout, "free arg node \t0x%08x\n", (int) arg));
   free(arg);
-  return;
 }
 
 static
@@ -727,7 +822,6 @@ void freeValref (eff_t *valref)
 {
   VERBOSE_PRINT ((stdout, "free valref node \t0x%08x\n", (int) valref));
   free(valref);
-  return;
 }
 
 static
@@ -735,7 +829,6 @@ void freeSelect (eff_t *sel)
 {
   VERBOSE_PRINT ((stdout, "free select node \t0x%08x\n", (int) sel));
   free(sel);
-  return;
 }
 
 static
@@ -743,7 +836,6 @@ void freeLoad (eff_t *load)
 {
   VERBOSE_PRINT ((stdout, "free load node \t0x%08x\n", (int) load));
   free (load);
-  return;
 }
 
 static
@@ -751,7 +843,6 @@ void freeStore (eff_t *store)
 {
   VERBOSE_PRINT ((stdout, "free store node \t0x%08x\n", (int) store));
   free (store);
-  return;
 }
 
 static
@@ -759,7 +850,6 @@ void freeAlloc (eff_t *alloc)
 {
   VERBOSE_PRINT ((stdout, "free alloc node \t0x%08x\n", (int) alloc));
   free(alloc);
-  return;
 }
 
 static
@@ -768,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
@@ -777,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
@@ -785,7 +873,6 @@ void freeUnknown (eff_t *unknown)
 {
   VERBOSE_PRINT ((stdout, "free unknown node \t0x%08x\n", (int) unknown));
   free(unknown);
-  return;
 }
 
 static
@@ -793,7 +880,6 @@ void freeReturn (eff_t *ret)
 {
   VERBOSE_PRINT ((stdout, "free ret node \t0x%08x\n", (int) ret));
   free(ret);
-  return;
 }
 
 static
@@ -801,7 +887,6 @@ void freeRaise (eff_t *raise)
 {
   VERBOSE_PRINT ((stdout, "free raise node \t0x%08x\n", (int) raise));
   free (raise);
-  return;
 }
 
 
@@ -811,8 +896,9 @@ void freeProcEffs(proc_t *proc)
   int i;
   int num;
 
-  VERBOSE_PRINT ((stdout,
-		  "free effect for method \"%s\"\n", proc -> procname));
+  VERBOSE_PRINT ((stdout, "free effect for method \"%s\"\n",
+          get_id_str(proc -> proc_ident)));
+
   num = proc -> n_effs;
   for(i = 0; i < num; i++) {
     switch(proc -> effs[i] -> kind) {
@@ -856,8 +942,6 @@ void freeProcEffs(proc_t *proc)
   }
   free(proc -> effs);
   proc -> effs = NULL;
-  free((void*)proc -> procname);
-  proc -> procname = NULL;
 }
 
 static
@@ -865,8 +949,9 @@ void freeModuleProcs(module_t *module)
 {
   proc_t *next_proc, *proc;
 
-  VERBOSE_PRINT ((stdout,
-		  "free procs for module \"%s\"\n", module -> name));
+  VERBOSE_PRINT ((stdout, "free procs for module \"%s\"\n",
+          get_id_str(module -> id)));
+
   proc = module -> procs;
   while(proc) {
     next_proc = proc -> next;
@@ -884,7 +969,6 @@ void free_data(void)
   module = modules;
   while(module) {
     freeModuleProcs(module);
-    free((char*)module -> name);
     next_module = module -> next;
     free(module);
     module = next_module;
@@ -894,17 +978,18 @@ void free_data(void)
 /********************************************************************/
 
 static
-type_t *find_type_in_module(module_t *module, firmid_t typeid)
+type_t *find_type_in_module(module_t *module, ident *typeid)
 {
   type_t *type;
 
   for(type = module -> types; type; type = type -> prev) {
-    VERBOSE_PRINT((stdout, "test typeid %s\n", type -> id));
-    if(0 == strcmp(type -> id, typeid)) {
+    VERBOSE_PRINT((stdout, "test typeid %s\n", get_id_str(type -> id)));
+    if(type -> id == typeid) {
+      VERBOSE_PRINT((stdout, "found\n"));
       return(type);
     }
   }
-  VERBOSE_PRINT((stdout, "did not find type id %s\n", typeid));
+  VERBOSE_PRINT((stdout, "did not find type id %s\n", get_id_str(typeid)));
   return(NULL);
 }
 
@@ -917,13 +1002,13 @@ static void add_value_to_proc(proc_t *proc, eff_t *eff)
 }
 
 
-eff_t *find_valueid_in_proc_effects(firmid_t id, proc_t *proc)
+eff_t *find_valueid_in_proc_effects(ident *id, proc_t *proc)
 {
   eff_t *val;
 
   val = proc -> values;
   while(val) {
-    if(0 == strcmp(id, val -> id)) {
+    if(id == val -> id) {
       return(val);
     }
     val = val -> next;
@@ -936,7 +1021,8 @@ static void create_abstract_return(ir_graph *irg, proc_t *proc, eff_t *eff)
   ir_node *x;
   eff_t *eff_res;
 
-  VERBOSE_PRINT((stdout, "create effect:return in %s\n", proc -> procname));
+  VERBOSE_PRINT((stdout, "create effect:return in %s\n",
+         get_id_str(proc -> proc_ident)));
   if(NO_ID == eff -> effect.ret.ret_id) {
     /* return void */
     x = new_Return (get_store(), 0, NULL);
@@ -965,13 +1051,13 @@ static void create_abstract_return(ir_graph *irg, proc_t *proc, eff_t *eff)
 static void create_abstract_arg(ir_graph *irg, proc_t *proc, eff_t *eff)
 {
   ir_node *arg;
-  entity *ent;
+  ir_entity *ent;
   ir_mode *mode;
-  type *typ;
+  ir_type *typ;
   int num;
 
   VERBOSE_PRINT((stdout, "create effect:arg %d in %s\n",
-		 eff -> effect.arg.num, proc -> procname));
+         eff -> effect.arg.num, get_id_str(proc -> proc_ident)));
   ent = get_irg_entity(irg);
   typ = get_entity_type(ent);
 
@@ -991,24 +1077,38 @@ static void create_abstract_arg(ir_graph *irg, proc_t *proc, eff_t *eff)
 static void create_abstract_load(ir_graph *irg, proc_t *proc, eff_t *eff)
 {
   ir_node *sel, *load;
-  entity *ent;
+  ir_entity *ent;
   ir_mode *mode;
   eff_t *addr;
+  (void) irg;
 
-  VERBOSE_PRINT((stdout, "create load in %s\n", proc -> procname));
+  VERBOSE_PRINT((stdout, "create load in %s\n",
+         get_id_str(proc -> proc_ident)));
 
-  ent = eff -> effect.load.ent -> f_ent;
-  VERBOSE_PRINT((stdout, "load from %s\n", get_entity_name(ent)));
+  if(eff -> effect.load.ent) {
+    ent = eff -> effect.load.ent -> f_ent;
+    VERBOSE_PRINT((stdout, "load from %s\n", get_entity_name(ent)));
+  }
+  else {
+    VERBOSE_PRINT((stdout, "store to memory\n"));
+    ent = NULL;
+  }
 
   addr = find_valueid_in_proc_effects(eff -> effect.load.ptrrefid, proc);
   assert(addr && "no address for load");
-  /* if addr is Unknown, set propper mode */
+  /* if addr is Unknown, set proper mode */
   if(iro_Unknown == get_irn_opcode(addr -> firmnode)) {
     set_irn_mode(addr -> firmnode, mode_P);
   }
 
-  sel = new_simpleSel(get_store(), addr -> firmnode, ent);
-  mode = get_type_mode(get_entity_type(ent));
+  if(ent) {
+    sel = new_simpleSel(get_store(), addr -> firmnode, ent);
+    mode = get_type_mode(get_entity_type(ent));
+  }
+  else {
+    sel = addr -> firmnode;
+    mode = mode_ANY;
+  }
   load = new_Load(get_store(), sel, mode);
   set_store(new_Proj(load, mode_M, 0));
   eff -> firmnode = new_Proj(load, mode, 2);
@@ -1020,13 +1120,21 @@ static void create_abstract_load(ir_graph *irg, proc_t *proc, eff_t *eff)
 static void create_abstract_store(ir_graph *irg, proc_t *proc, eff_t *eff)
 {
   ir_node *sel, *store;
-  entity *ent;
+  ir_entity *ent;
   eff_t *addr, *val;
+  (void) irg;
 
-  VERBOSE_PRINT((stdout, "create store in %s\n", proc -> procname));
+  VERBOSE_PRINT((stdout, "create store in %s\n",
+         get_id_str(proc -> proc_ident)));
 
-  ent = eff -> effect.store.ent -> f_ent;
-  VERBOSE_PRINT((stdout, "store to %s\n", get_entity_name(ent)));
+  if(eff -> effect.store.ent) {
+    ent = eff -> effect.store.ent -> f_ent;
+    VERBOSE_PRINT((stdout, "store to ir_entity %s\n", get_entity_name(ent)));
+  }
+  else {
+    VERBOSE_PRINT((stdout, "store to memory\n"));
+    ent = NULL;
+  }
 
   addr = find_valueid_in_proc_effects(eff -> effect.store.ptrrefid, proc);
   assert(addr && "no address for store");
@@ -1042,7 +1150,12 @@ static void create_abstract_store(ir_graph *irg, proc_t *proc, eff_t *eff)
     set_irn_mode(val -> firmnode, get_type_mode(get_entity_type(ent)));
   }
 
-  sel = new_simpleSel(get_store(), addr -> firmnode, ent);
+  if(ent) {
+    sel = new_simpleSel(get_store(), addr -> firmnode, ent);
+  }
+  else {
+    sel = addr -> firmnode;
+  }
   store = new_Store(get_store(), sel, val -> firmnode);
   set_store(new_Proj(store, mode_M, 0));
   eff -> firmnode = store;
@@ -1051,20 +1164,22 @@ static void create_abstract_store(ir_graph *irg, proc_t *proc, eff_t *eff)
 
 static void create_abstract_alloc(ir_graph *irg, proc_t *proc, eff_t *eff)
 {
-  type *ftype;
+  ir_type *ftype;
   ir_node *alloc;
   type_t *xtype;
   symconst_symbol sym;
+  (void) irg;
 
-  VERBOSE_PRINT((stdout, "create alloc in %s\n", proc -> procname));
+  VERBOSE_PRINT((stdout, "create alloc in %s\n",
+         get_id_str(proc -> proc_ident)));
 
   xtype = find_type_in_module(current_module, eff -> effect.alloc.tp_id);
   assert(xtype && "type not found");
   ftype = xtype -> f_tp;
 
   sym.type_p = ftype;
-  alloc = new_Alloc(get_store(), new_SymConst(sym, symconst_size), ftype,
-		    heap_alloc);
+  alloc = new_Alloc(get_store(), new_SymConst(mode_Is, sym, symconst_type_size), ftype,
+            heap_alloc);
   set_store(new_Proj(alloc, mode_M, 0));
   eff -> firmnode = new_Proj(alloc, mode_P, 2);
 
@@ -1075,8 +1190,10 @@ static void create_abstract_alloc(ir_graph *irg, proc_t *proc, eff_t *eff)
 static void create_abstract_unknown(ir_graph *irg, proc_t *proc, eff_t *eff)
 {
   ir_node *unknown;
+  (void) irg;
 
-  VERBOSE_PRINT((stdout, "create unknown in %s\n", proc -> procname));
+  VERBOSE_PRINT((stdout, "create unknown in %s\n",
+         get_id_str(proc -> proc_ident)));
 
   unknown = new_Unknown(mode_ANY);
   eff -> firmnode = unknown;
@@ -1088,66 +1205,229 @@ static void create_abstract_unknown(ir_graph *irg, proc_t *proc, eff_t *eff)
 static void create_abstract_call(ir_graph *irg, proc_t *proc, eff_t *eff)
 {
   ir_node *sel, *call;
-  entity *ent;
+  ir_entity *ent;
   eff_t *addr;
   ir_node **irns;
   int i, num;
-  type *mtype;
+  ir_type *mtype;
+  int mik; /* is method somehow known? */
+  (void) irg;
 
-  VERBOSE_PRINT((stdout, "create call in %s\n", proc -> procname));
+  VERBOSE_PRINT((stdout, "create call in %s\n",
+         get_id_str(proc -> proc_ident)));
 
-  ent = eff -> effect.call.ent -> f_ent;
-  VERBOSE_PRINT((stdout, "call %s\n", get_entity_name(ent)));
+  if(eff -> effect.call.ent) {
+    ent = eff -> effect.call.ent -> f_ent;
+    VERBOSE_PRINT((stdout, "call %s\n", get_entity_name(ent)));
+  }
+  else {
+    ent = NULL;
+    VERBOSE_PRINT((stdout, "call something in memory\n"));
+  }
 
   addr = find_valueid_in_proc_effects(eff -> effect.call.valrefid, proc);
   assert(addr && "no address for load");
-  /* if addr is Unknown, set propper mode */
+  /* if addr is Unknown, set proper mode */
   if(iro_Unknown == get_irn_opcode(addr -> firmnode)) {
     set_irn_mode(addr -> firmnode, mode_P);
   }
 
-  /* the address */
-  sel = new_simpleSel(get_store(), addr -> firmnode, ent);
-  /* mthod type */
-  mtype = get_entity_type(ent);
+  if(ent) {
+    /* the address */
+    sel = new_simpleSel(get_store(), addr -> firmnode, ent);
+    /* method type */
+    mtype = get_entity_type(ent);
+    mik = 1;
+  }
+  else {
+    /* the address */
+    sel = addr -> firmnode;
+    /* method type */
+    mtype = get_unknown_type();
+    mik = 0;
+  }
+
   /* the args */
   num = eff -> effect.call.n_args;
   VERBOSE_PRINT((stdout, "number of args given: %d\n", num));
-  VERBOSE_PRINT((stdout, "number of args expected: %d\n",
-		 get_method_n_params(mtype)));
+  if(mik) {
+    VERBOSE_PRINT((stdout, "number of args expected: %d\n",
+           get_method_n_params(mtype)));
+  }
   irns = alloca(num * sizeof(ir_node*));
   for(i = 0; i < num; i++) {
     irns[i] = find_valueid_in_proc_effects(eff -> effect.call.args[i], proc)
       -> firmnode;
     if(iro_Unknown == get_irn_opcode(irns[i])) {
-      set_irn_mode(irns[i], get_type_mode(get_method_param_type(mtype, i)));
+      if(mik) {
+    set_irn_mode(irns[i], get_type_mode(get_method_param_type(mtype, i)));
+      }
+      else {
+    set_irn_mode(irns[i], mode_ANY);
+      }
     }
   }
-  call = new_Call(get_store(), sel, num, irns, get_entity_type(ent));
+  call = new_Call(get_store(), sel, num, irns, mtype);
   set_store(new_Proj(call, mode_M, 0));
-  // eff -> firmnode = new_Proj(store, mode, 2);
-  eff -> firmnode = call;
+  if(mik && (0 != get_method_n_ress(mtype))) {
+    eff -> firmnode = new_Proj(call,
+                   get_type_mode(get_method_res_type(mtype, 0)),
+                   0);
+    add_value_to_proc(proc, eff); /* result can be accessed */
+  }
+  else {
+    eff -> firmnode = NULL; /* result can not be accessed */
+  }
+}
 
-  add_value_to_proc(proc, eff);
+static void create_abstract_join (ir_graph *irg, proc_t *proc, eff_t *eff)
+{
+  ir_node **ins    = NULL;
+  ir_node *unknown = NULL;
+  ir_node *cond    = NULL;
+  ir_node *block   = NULL;
+  ir_node *c_block = NULL;
+  ir_node *phi     = NULL;
+  ir_mode *join_md = mode_ANY;
+  int n_ins = -1;
+  int i;
+  (void) irg;
+
+  VERBOSE_PRINT((stdout, "create join in %s\n",
+         get_id_str(proc -> proc_ident)));
+
+  assert (eff_join == eff->kind);
+
+  n_ins = eff->effect.join.n_ins;
+
+  /* seems like current_block is not always mature at this point */
+  mature_immBlock (get_cur_block ());
+
+  block = get_cur_block ();     /* remember this so we can put the ProjXs into it */
+
+  /* jump based on an unknown condition so all values are possible */
+  unknown = new_Unknown (mode_Iu);
+  cond    = new_Cond (unknown);
+
+  c_block   = new_immBlock ();  /* for the Phi after the branch(es) */
+
+  ins = XMALLOCN(ir_node*, n_ins);
+  for (i = 0; i < n_ins; i ++) {
+    ir_node *projX   = NULL;
+    ir_node *s_block = NULL;
+    ir_node *jmp     = NULL;
+    eff_t *in_eff;
+
+    /* make sure the projX is in the 'switch' block */
+    set_cur_block (block);
+    projX   = new_Proj (cond, mode_X, (long) i);
+
+    /* this also sets current_block, so the rest of the code ends up there: */
+    s_block = new_immBlock ();
+
+    add_immBlock_pred (s_block, projX);
+    mature_immBlock (s_block);
+
+    in_eff = find_valueid_in_proc_effects (eff->effect.join.ins [i], proc);
+
+    ins [i] = in_eff->firmnode;
+
+    /* need to find a suitable mode for the Phi node */
+    if (mode_ANY != get_irn_mode (ins [i])) {
+      join_md = get_irn_mode (ins [i]);
+    }
+
+    jmp = new_Jmp ();
+    add_immBlock_pred (c_block, jmp);
+  }
+
+  set_cur_block (c_block);
+
+  phi = new_Phi (n_ins, ins, join_md);
+
+  mature_immBlock (c_block);
+  free (ins);
+
+  eff->firmnode = phi;
+
+  add_value_to_proc (proc, eff);
 }
 
+static void create_abstract_raise (ir_graph *irg, proc_t *proc, eff_t *eff)
+{
+  ir_node *block   = NULL;
+  ir_node *unknown = NULL;
+  ir_node *cond    = NULL;
 
-static void create_abstract_firm(module_t *module, proc_t *proc, entity *fent)
+  /* seems like current_block is not always mature at this point */
+  mature_immBlock (get_cur_block ());
+  block = get_cur_block ();     /* remember this so we can put the ProjXs into it */
+
+  /* jump based on an unknown condition so both values are possible */
+  unknown = new_Unknown (mode_Iu);
+  cond    = new_Cond (unknown);
+
+  /* one branch for 'throw-exception' case */
+  {
+    ir_node *projX = new_Proj (cond, mode_X, 1L);
+    ir_node *b_exc = new_immBlock ();
+    ir_node *obj   = NULL;
+    ir_node *thrw  = NULL;
+    eff_t *thrw_eff = NULL;
+
+    add_immBlock_pred (b_exc, projX);
+
+    thrw_eff = find_valueid_in_proc_effects (eff->effect.raise.valref, proc);
+    obj = thrw_eff->firmnode;
+
+    thrw = new_Raise (get_store (), obj);
+    /* exc-jump to end block */
+    thrw = new_Proj (thrw, mode_X, 0L);
+
+    add_immBlock_pred (get_irg_end_block (irg), thrw);
+    mature_immBlock (get_cur_block ());
+  }
+
+  set_cur_block (block);     /* back to the first block */
+
+  /* one branch for 'non-exception' case */
+  {
+    ir_node *projX = new_Proj (cond, mode_X, 0);
+    new_immBlock ();            /* also sets current_block */
+    add_immBlock_pred (get_cur_block (), projX);
+    mature_immBlock (get_cur_block ());
+    /* continue building in current_block */
+  }
+
+}
+
+static void create_abstract_firm(module_t *module, proc_t *proc, ir_entity *fent)
 {
   eff_t *eff;
   ir_graph *irg;
   int i, num;
+  (void) module;
+
+  /* test ir_entity */
+  assert(visibility_external_allocated == get_entity_visibility(fent)
+     && peculiarity_existent == get_entity_peculiarity(fent)
+     && "not an abstract ir_entity");
+  /* create irg in ir_entity */
+  irg = new_pseudo_ir_graph(fent, 0);
+  set_irg_inline_property(irg, irg_inline_forbidden);
+
+  /* @@@ If the spec says so: */
+  set_entity_visibility(fent, visibility_local);
 
-  /* create irg in entity */
-  irg = new_ir_graph(fent, 0);
+  VERBOSE_PRINT((stdout, "create effects for %s\n",
+         get_id_str(proc -> proc_ident)));
 
-  VERBOSE_PRINT((stdout, "create effects for %s\n", proc -> procname));
   /* create effects in irg */
   num = proc -> n_effs;
   for(i = 0; i < num; i++) {
     eff = proc -> effs[i];
     VERBOSE_PRINT((stdout,
-		   "create effect \"%s\"\n", effect_string[(int)eff -> kind]));
+           "create effect \"%s\"\n", effect_string[(int)eff -> kind]));
     switch(eff -> kind) {
     case eff_ret:
       create_abstract_return(irg, proc, eff);
@@ -1170,13 +1450,19 @@ static void create_abstract_firm(module_t *module, proc_t *proc, entity *fent)
     case eff_call:
       create_abstract_call(irg, proc, eff);
       break;
+    case eff_join:
+      create_abstract_join(irg, proc, eff);
+      break;
+    case eff_raise:
+      create_abstract_raise(irg, proc, eff);
+      break;
     default:
       assert(0 && "effect not implemented");
       break;
     }
   }
 
-  /* close irg in entity */
+  /* close irg in ir_entity */
   /* Now we can mature the end block as all it's predecessors are known. */
   mature_immBlock (get_irg_end_block(irg));
 
@@ -1184,7 +1470,7 @@ static void create_abstract_firm(module_t *module, proc_t *proc, entity *fent)
   VERBOSE_PRINT((stdout, "verify graph\n"));
   irg_vrfy(irg);
   VERBOSE_PRINT((stdout, "finalize construction\n"));
-  finalize_cons (irg);
+  irg_finalize_cons (irg);
 }
 
 /********************************************************************/
@@ -1193,28 +1479,31 @@ static void assign_firm_entity(module_t *module, entity_t *xmlent)
 {
   int i, num;
   type_t *typ;
-  type *type;
-  entity *ent;
+  ir_type *type;
+  ir_entity *ent;
+
+  VERBOSE_PRINT((stdout, "assign ir_entity %s to typeid %s\n",
+         get_id_str(xmlent -> ent_ident),
+         get_id_str(xmlent -> owner)));
 
-  VERBOSE_PRINT((stdout, "assign entity %s to typeid %s\n",
-		 xmlent -> name, xmlent -> owner));
   typ = find_type_in_module(module, xmlent -> owner);
   assert(typ && "class not found in module");
   type = typ -> f_tp;
-  assert(is_class_type(type));
+  assert(is_Class_type(type));
 
   num = get_class_n_members(type);
   ent = NULL;
   for(i = 0; i < num; i++) {
     ent = get_class_member(type, i);
-    VERBOSE_PRINT((stdout, "compare entity %s and %s\n",
-		   xmlent -> name, get_entity_name(ent)));
-    if(0 == strcmp(get_entity_name(ent), xmlent -> name)) {
+    VERBOSE_PRINT((stdout, "compare ir_entity %s and %s\n",
+           get_id_str(xmlent -> ent_ident), get_entity_name(ent)));
+
+    if(get_entity_ident(ent) == xmlent -> ent_ident) {
       break;
     }
     ent = NULL;
   }
-  assert(ent && "did not find a entity");
+  assert(ent && "did not find a ir_entity");
 
   xmlent -> f_ent = ent;
 }
@@ -1224,26 +1513,27 @@ static void assign_firm_entity(module_t *module, entity_t *xmlent)
 static void assign_firm_type(type_t *xmltype)
 {
   int i;
-  type *typ = NULL;
+  ir_type *typ = NULL;
   int num;
 
-  VERBOSE_PRINT((stdout, "assign type %s\n", xmltype -> name));
+  VERBOSE_PRINT((stdout, "assign firm type to type %s\n",
+                 get_id_str(xmltype -> type_ident)));
+
   /* is it global type? */
   typ = get_glob_type();
-  if(0 == strcmp(xmltype -> name, get_type_name(typ))) {
+  if(xmltype -> type_ident == get_type_ident(typ)) {
     /* yes */
     xmltype -> f_tp = typ;
     VERBOSE_PRINT((stdout, "is global type %s\n", get_type_name(typ)));
-  }
-  else {
+  } else {
     num = get_irp_n_types();
     for(i = 0; i < num; i++) {
       typ = get_irp_type(i);
       VERBOSE_PRINT((stdout, "test type %s\n", get_type_name(typ)));
-      if(0 == strcmp(xmltype -> name, get_type_name(typ))) {
-	VERBOSE_PRINT((stdout, "found type %s\n", get_type_name(typ)));
-	xmltype -> f_tp = typ;
-	break;
+      if(xmltype -> type_ident == get_type_ident(typ)) {
+        VERBOSE_PRINT((stdout, "found type %s\n", get_type_name(typ)));
+        xmltype -> f_tp = typ;
+        break;
       }
       typ = NULL;
     }
@@ -1256,28 +1546,28 @@ static
 void create_abstract_proc_effect(module_t *module, proc_t *proc)
 {
   int i, num;
-  type *class_typ = NULL;
+  ir_type *class_typ = NULL;
   type_t *type;
-  entity *fent;
+  ir_entity *fent;
 
   /* find the class of a procedure */
-  VERBOSE_PRINT((stdout, "do find typeid %s\n", proc -> typeid));
-  type = find_type_in_module(module, proc -> typeid);
+  VERBOSE_PRINT((stdout, "do find owner id %s\n", get_id_str(proc -> ownerid)));
+  type = find_type_in_module(module, proc -> ownerid);
   assert(type && "class not found in module");
 
   class_typ = get_glob_type();
   VERBOSE_PRINT((stdout, "test type %s\n", get_type_name(class_typ)));
-  if(0 != strcmp(type -> name, get_type_name(class_typ))) {
+  if(type -> type_ident != get_type_ident(class_typ)) {
     /* find module as class */
     num = get_irp_n_types();
     for(i = 0; i < num; i++) {
       class_typ = get_irp_type(i);
       VERBOSE_PRINT((stdout, "test type %s\n", get_type_name(class_typ)));
-      if(is_class_type(class_typ)
-	 && (0 == strcmp(type -> name, get_type_name(class_typ)))) {
-	/* found class type */
-	VERBOSE_PRINT((stdout, "found type %s\n", get_type_name(class_typ)));
-	break;
+      if (is_Class_type(class_typ)
+         && (type -> type_ident == get_type_ident(class_typ))) {
+        /* found class type */
+        VERBOSE_PRINT((stdout, "found type %s\n", get_type_name(class_typ)));
+        break;
       }
       class_typ = NULL;
     }
@@ -1286,28 +1576,40 @@ void create_abstract_proc_effect(module_t *module, proc_t *proc)
     VERBOSE_PRINT((stdout, "found global type %s\n", get_type_name(class_typ)));
   }
   assert(class_typ && "type not found");
-  assert(is_class_type(class_typ) && "is not a class type");
+  assert(is_Class_type(class_typ) && "is not a class type");
   type -> f_tp = class_typ;
 
-  /* find entity for procedure in class */
-  VERBOSE_PRINT((stdout, "find method %s\n", proc -> procname));
+  /* find ir_entity for procedure in class */
+  VERBOSE_PRINT((stdout, "find method %s\n",
+         get_id_str(proc -> proc_ident)));
+
   num = get_class_n_members(class_typ);
   fent = NULL;
   for(i = 0; i < num; i++) {
     fent = get_class_member(class_typ, i);
     VERBOSE_PRINT((stdout, "test proc %s\n", get_entity_name(fent)));
-    if(0 == strcmp(proc -> procname, get_entity_name(fent))) {
-      VERBOSE_PRINT((stdout, "found proc %s\n", proc -> procname));
+    if(proc -> proc_ident == get_entity_ident(fent)) {
+      VERBOSE_PRINT((stdout, "found proc %s\n",
+             get_id_str(proc -> proc_ident)));
       /* @@@ TODO check args types - not in xml yet */
       /* create Firm stuff */
       create_abstract_firm(module, proc, fent);
-      break;
+      return;
     }
     else {
       fent = NULL;
     }
   }
-  assert(fent && "procedure not found in class");
+
+  /* fail */
+  fprintf(stderr,
+      "method %s not found\nNo effects generated\nCandidates are:\n",
+      get_id_str(proc -> proc_ident));
+  for(i = 0; i < num; i++) {
+    fent = get_class_member(class_typ, i);
+    fprintf(stderr, "%s\n", get_entity_name(fent));
+  }
+  //assert(fent && "procedure not found in class");
 }
 
 static
@@ -1317,33 +1619,34 @@ void create_abstract_module(module_t *module)
   type_t *type;
   entity_t *ent;
 
-  VERBOSE_PRINT((stdout,
-		 "create an abstraction for module %s\n", module -> name));
+  VERBOSE_PRINT((stdout, "create an abstraction for module %s\n",
+         get_id_str(module -> id)));
 
-  VERBOSE_PRINT((stdout, "--handle types for module %s\n", module -> name));
+  VERBOSE_PRINT((stdout, "--handle types for module\n"));
   for(type = module -> types; type; type = type -> prev) {
     assign_firm_type(type);
   }
 
-  VERBOSE_PRINT((stdout, "--handle entities for module %s\n", module -> name));
+  VERBOSE_PRINT((stdout, "--handle entities for module\n"));
   /* @@@ TODO */
   for(ent = module -> entities; ent; ent = ent -> prev) {
     assign_firm_entity(module, ent);
   }
 
-  VERBOSE_PRINT((stdout, "--handle procs for module %s\n", module -> name));
+  VERBOSE_PRINT((stdout, "--handle procs for module\n"));
   for(proc = module -> procs; proc; proc = proc -> next) {
     create_abstract_proc_effect(module, proc);
   }
 }
 
 
-void create_abstraction(const char *filename)
+int create_abstraction(const char *filename)
 {
   module_t *module;
 
   /* read and parse XML file */
-  read_extern(filename);
+  if (! read_extern(filename))
+    return 0;
 
   /* finished reading and parsing here */
   /* build FIRM graphs */
@@ -1357,13 +1660,90 @@ void create_abstraction(const char *filename)
 
   /* free data structures */
   free_data();
+
+  types = NULL;
+  entities = NULL;
+  procs = NULL;
+  modules = NULL;
+
+  return 1;
+}
+
+
+void free_abstraction(void) {
+  int i, n_pseudo_irgs = get_irp_n_pseudo_irgs();
+  for (i = 0; i < n_pseudo_irgs; ++i) {
+    ir_graph *p_irg = get_irp_pseudo_irg(i);
+    set_entity_visibility(get_irg_entity(p_irg), visibility_external_allocated);
+    // @@@ free_pseudo_ir_graph(p_irg);
+  }
 }
 
+
 /********************************************************************/
 
 
 /*
  * $Log$
+ * Revision 1.27  2007/02/02 12:38:35  matze
+ * entity is ir_entity now
+ *
+ * Revision 1.26  2006/12/15 12:37:40  matze
+ * fix warnings
+ *
+ * Revision 1.25  2006/06/09 11:26:35  firm
+ * renamed type to ir_type
+ *
+ * Revision 1.24  2006/05/29 13:34:49  beck
+ * renamed symconst_size to symconst_type_size
+ *
+ * Revision 1.22  2005/08/16 10:18:35  beck
+ * create_abstraction() now returns an error code if the file could not
+ * be opened.
+ *
+ * Revision 1.21  2005/03/10 10:05:38  goetz
+ * chanmged method name
+ *
+ * Revision 1.20  2005/01/05 14:28:35  beck
+ * renames all is_x*_type() functions to is_X*_type() to prevent name clash with EDG frontend
+ *
+ * Revision 1.19  2004/12/10 15:14:34  beck
+ * used xmalloc instead of malloc
+ *
+ * Revision 1.18  2004/12/02 16:21:42  beck
+ * fixed config.h include
+ *
+ * Revision 1.17  2004/11/23 14:17:31  liekweg
+ * fenced out currently unneeded static functions
+ *
+ * Revision 1.16  2004/11/11 12:24:52  goetz
+ * fixes
+ *
+ * Revision 1.15  2004/11/11 09:28:32  goetz
+ * treat pseudo irgs special
+ * parse 'local' from xml files
+ *
+ * Revision 1.14  2004/11/10 14:42:00  boesler
+ * be more helpful if a method does not exist
+ *
+ * Revision 1.13  2004/11/05 14:00:53  liekweg
+ * added raise
+ *
+ * Revision 1.12  2004/11/02 14:30:31  liekweg
+ * fixed multi-input join (thx, Boris) --flo
+ *
+ * Revision 1.11  2004/10/29 18:51:53  liekweg
+ * Added Join
+ *
+ * Revision 1.10  2004/10/25 13:52:24  boesler
+ * seperated read.h (public interface) and read_t.h (types)
+ *
+ * Revision 1.9  2004/10/22 13:51:35  boesler
+ * prohibit inlining of pseudo ir_graphs
+ *
+ * Revision 1.8  2004/10/22 13:13:27  boesler
+ * replaced char* by idents, minor fix in Firm codegen for call
+ *
  * Revision 1.7  2004/10/21 15:31:55  boesler
  * added lots of stuff:
  * - build abstract syntax trees