merge kaps
[libfirm] / ir / ir / irio.c
index 8b03b94..c1b6e9d 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2009 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2011 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
 #include "config.h"
 
 #include <string.h>
+#include <ctype.h>
+#include <stdbool.h>
+#include <stdarg.h>
 
 #include "irio.h"
 
 #include "irnode_t.h"
 #include "irprog.h"
 #include "irgraph_t.h"
+#include "irprintf.h"
 #include "ircons.h"
 #include "irgmod.h"
 #include "irflag_t.h"
 #include "tv.h"
 #include "array.h"
 #include "error.h"
+#include "typerep.h"
 #include "adt/set.h"
+#include "adt/obst.h"
 
 #define SYMERROR ((unsigned) ~0)
 
 typedef struct io_env_t
 {
+       int c;                /**< currently read char */
        FILE *file;
-       set *idset;               /**< id_entry set, which maps from file ids to new Firm elements */
+       set *idset;           /**< id_entry set, which maps from file ids to new Firm elements */
        int ignoreblocks;
-       int line, col;
+       const char *inputname;
+       int line;
        ir_type **fixedtypes;
+       struct obstack obst;
+       ir_graph *irg;
 } io_env_t;
 
-typedef struct lex_state_t
-{
-       long offs;
-       int line, col;
-} lex_state_t;
-
 typedef enum typetag_t
 {
        tt_align,
        tt_allocation,
        tt_builtin,
-       tt_cond_kind,
        tt_cond_jmp_predicate,
        tt_initializer,
        tt_iro,
        tt_keyword,
+       tt_mode_sort,
        tt_mode_arithmetic,
-       tt_peculiarity,
        tt_pin_state,
        tt_tpo,
        tt_type_state,
-       tt_variability,
-       tt_visibility,
-       tt_volatility
+       tt_volatility,
+       tt_linkage,
+       tt_segment,
+       tt_visibility
 } typetag_t;
 
 typedef enum keyword_t
 {
        kw_constirg,
        kw_entity,
-       kw_frametype,
        kw_irg,
        kw_mode,
        kw_modes,
-       kw_valuetype,
        kw_type,
-       kw_typegraph
+       kw_typegraph,
+       kw_program,
+       kw_segment_type
 } keyword_t;
 
 typedef struct symbol_t
@@ -107,15 +111,6 @@ typedef struct id_entry
 /** The symbol table, a set of symbol_t elements. */
 static set *symtbl;
 
-
-/**
- * Calculate a hash value for a string.
- */
-static unsigned string_hash(const char *str, int len)
-{
-       return str[0] * 27893 ^ str[len-1] * 81 ^ str[len >> 1];
-}
-
 /**
  * Compare two symbol table entries.
  */
@@ -138,6 +133,25 @@ static int id_cmp(const void *elt, const void *key, size_t size)
        return entry->id - keyentry->id;
 }
 
+static void __attribute__((format(printf, 2, 3)))
+parse_error(io_env_t *env, const char *fmt, ...)
+{
+       va_list ap;
+       int     line = env->line;
+
+       /* workaround read_c "feature" that a '\n' triggers the line++
+        * instead of the character after the '\n' */
+       if (env->c == '\n') {
+               line--;
+       }
+
+       fprintf(stderr, "%s:%d: error ", env->inputname, line);
+
+       va_start(ap, fmt);
+       vfprintf(stderr, fmt, ap);
+       va_end(ap);
+}
+
 /** Initializes the symbol table. May be called more than once without problems. */
 static void symtbl_init(void)
 {
@@ -149,44 +163,63 @@ static void symtbl_init(void)
 
        symtbl = new_set(symbol_cmp, 256);
 
-#define INSERT(s, tt, cod)                                       \
+#define INSERT(tt, s, cod)                                       \
        key.str = (s);                                               \
        key.typetag = (tt);                                          \
        key.code = (cod);                                            \
-       set_insert(symtbl, &key, sizeof(key), string_hash(s, sizeof(s)-1) + tt * 17)
-
-#define INSERTENUM(tt, e) INSERT(#e, tt, e)
-#define INSERTKEYWORD(k) INSERT(#k, tt_keyword, kw_##k)
-
-       INSERT("array", tt_tpo, tpo_array);
-       INSERT("class", tt_tpo, tpo_class);
-       INSERT("method", tt_tpo, tpo_method);
-       INSERT("pointer", tt_tpo, tpo_pointer);
-       INSERT("primitive", tt_tpo, tpo_primitive);
-       INSERT("struct", tt_tpo, tpo_struct);
-       INSERT("union", tt_tpo, tpo_union);
-       INSERT("Unknown", tt_tpo, tpo_unknown);
+       set_insert(symtbl, &key, sizeof(key), firm_fnv_hash_str(s) + tt * 17)
+
+#define INSERTENUM(tt, e) INSERT(tt, #e, e)
+#define INSERTKEYWORD(k) INSERT(tt_keyword, #k, kw_##k)
+
+       INSERT(tt_tpo, "array", tpo_array);
+       INSERT(tt_tpo, "class", tpo_class);
+       INSERT(tt_tpo, "method", tpo_method);
+       INSERT(tt_tpo, "pointer", tpo_pointer);
+       INSERT(tt_tpo, "primitive", tpo_primitive);
+       INSERT(tt_tpo, "struct", tpo_struct);
+       INSERT(tt_tpo, "union", tpo_union);
+       INSERT(tt_tpo, "Unknown", tpo_unknown);
+
+       INSERT(tt_mode_sort, "auxiliary", irms_auxiliary);
+       INSERT(tt_mode_sort, "control_flow", irms_control_flow);
+       INSERT(tt_mode_sort, "memory", irms_memory);
+       INSERT(tt_mode_sort, "internal_boolean", irms_internal_boolean);
+       INSERT(tt_mode_sort, "reference", irms_reference);
+       INSERT(tt_mode_sort, "int_number", irms_int_number);
+       INSERT(tt_mode_sort, "float_number", irms_float_number);
+
+       INSERT(tt_segment, "global", IR_SEGMENT_GLOBAL);
+       INSERT(tt_segment, "thread_local", IR_SEGMENT_THREAD_LOCAL);
+       INSERT(tt_segment, "constructors", IR_SEGMENT_CONSTRUCTORS);
+       INSERT(tt_segment, "destructors", IR_SEGMENT_DESTRUCTORS);
+
+       INSERT(tt_linkage, "constant", IR_LINKAGE_CONSTANT);
+       INSERT(tt_linkage, "weak", IR_LINKAGE_WEAK);
+       INSERT(tt_linkage, "garbage_collect", IR_LINKAGE_GARBAGE_COLLECT);
+       INSERT(tt_linkage, "merge", IR_LINKAGE_MERGE);
+       INSERT(tt_linkage, "hidden_user", IR_LINKAGE_HIDDEN_USER);
+
+       INSERT(tt_visibility, "local", ir_visibility_local);
+       INSERT(tt_visibility, "external", ir_visibility_external);
+       INSERT(tt_visibility, "default", ir_visibility_default);
+       INSERT(tt_visibility, "private", ir_visibility_private);
 
        INSERTKEYWORD(constirg);
        INSERTKEYWORD(entity);
-       INSERTKEYWORD(frametype);
        INSERTKEYWORD(irg);
        INSERTKEYWORD(mode);
        INSERTKEYWORD(modes);
-       INSERTKEYWORD(valuetype);
        INSERTKEYWORD(type);
        INSERTKEYWORD(typegraph);
+       INSERTKEYWORD(program);
+       INSERTKEYWORD(segment_type);
 
 #include "gen_irio_lex.inl"
 
        INSERTENUM(tt_align, align_non_aligned);
        INSERTENUM(tt_align, align_is_aligned);
 
-       INSERTENUM(tt_allocation, allocation_automatic);
-       INSERTENUM(tt_allocation, allocation_parameter);
-       INSERTENUM(tt_allocation, allocation_dynamic);
-       INSERTENUM(tt_allocation, allocation_static);
-
        INSERTENUM(tt_builtin, ir_bk_trap);
        INSERTENUM(tt_builtin, ir_bk_debugbreak);
        INSERTENUM(tt_builtin, ir_bk_return_address);
@@ -202,9 +235,6 @@ static void symtbl_init(void)
        INSERTENUM(tt_builtin, ir_bk_outport);
        INSERTENUM(tt_builtin, ir_bk_inner_trampoline);
 
-       INSERTENUM(tt_cond_kind, dense);
-       INSERTENUM(tt_cond_kind, fragmentary);
-
        INSERTENUM(tt_cond_jmp_predicate, COND_JMP_PRED_NONE);
        INSERTENUM(tt_cond_jmp_predicate, COND_JMP_PRED_TRUE);
        INSERTENUM(tt_cond_jmp_predicate, COND_JMP_PRED_FALSE);
@@ -222,10 +252,6 @@ static void symtbl_init(void)
        INSERTENUM(tt_mode_arithmetic, irma_ieee754);
        INSERTENUM(tt_mode_arithmetic, irma_float_BCD);
 
-       INSERTENUM(tt_peculiarity, peculiarity_description);
-       INSERTENUM(tt_peculiarity, peculiarity_inherited);
-       INSERTENUM(tt_peculiarity, peculiarity_existent);
-
        INSERTENUM(tt_pin_state, op_pin_state_floats);
        INSERTENUM(tt_pin_state, op_pin_state_pinned);
        INSERTENUM(tt_pin_state, op_pin_state_exc_pinned);
@@ -234,15 +260,6 @@ static void symtbl_init(void)
        INSERTENUM(tt_type_state, layout_undefined);
        INSERTENUM(tt_type_state, layout_fixed);
 
-       INSERTENUM(tt_variability, variability_uninitialized);
-       INSERTENUM(tt_variability, variability_initialized);
-       INSERTENUM(tt_variability, variability_part_constant);
-       INSERTENUM(tt_variability, variability_constant);
-
-       INSERTENUM(tt_visibility, visibility_local);
-       INSERTENUM(tt_visibility, visibility_external_visible);
-       INSERTENUM(tt_visibility, visibility_external_allocated);
-
        INSERTENUM(tt_volatility, volatility_non_volatile);
        INSERTENUM(tt_volatility, volatility_is_volatile);
 
@@ -251,6 +268,28 @@ static void symtbl_init(void)
 #undef INSERT
 }
 
+static const char *get_segment_name(ir_segment_t segment)
+{
+       switch (segment) {
+       case IR_SEGMENT_GLOBAL:       return "global";
+       case IR_SEGMENT_THREAD_LOCAL: return "thread_local";
+       case IR_SEGMENT_CONSTRUCTORS: return "constructors";
+       case IR_SEGMENT_DESTRUCTORS:  return "destructors";
+       }
+       return "INVALID_SEGMENT";
+}
+
+static const char *get_visibility_name(ir_visibility visibility)
+{
+       switch (visibility) {
+       case ir_visibility_local:    return "local";
+       case ir_visibility_external: return "external";
+       case ir_visibility_default:  return "default";
+       case ir_visibility_private:  return "private";
+       }
+       return "INVALID_VISIBILITY";
+}
+
 /** Returns the according symbol value for the given string and tag, or SYMERROR if none was found. */
 static unsigned symbol(const char *str, typetag_t typetag)
 {
@@ -259,7 +298,7 @@ static unsigned symbol(const char *str, typetag_t typetag)
        key.str = str;
        key.typetag = typetag;
 
-       entry = set_find(symtbl, &key, sizeof(key), string_hash(str, strlen(str)) + typetag * 17);
+       entry = (symbol_t*)set_find(symtbl, &key, sizeof(key), firm_fnv_hash_str(str) + typetag * 17);
        return entry ? entry->code : SYMERROR;
 }
 
@@ -268,7 +307,7 @@ static void *get_id(io_env_t *env, long id)
        id_entry key, *entry;
        key.id = id;
 
-       entry = set_find(env->idset, &key, sizeof(key), (unsigned) id);
+       entry = (id_entry*)set_find(env->idset, &key, sizeof(key), (unsigned) id);
        return entry ? entry->elem : NULL;
 }
 
@@ -280,13 +319,75 @@ static void set_id(io_env_t *env, long id, void *elem)
        set_insert(env->idset, &key, sizeof(key), (unsigned) id);
 }
 
+static void write_long(io_env_t *env, long value)
+{
+       fprintf(env->file, "%ld ", value);
+}
+
+static void write_int(io_env_t *env, int value)
+{
+       fprintf(env->file, "%d ", value);
+}
+
+static void write_unsigned(io_env_t *env, unsigned value)
+{
+       fprintf(env->file, "%u ", value);
+}
+
+static void write_entity_ref(io_env_t *env, ir_entity *entity)
+{
+       write_long(env, get_entity_nr(entity));
+}
+
+static void write_type_ref(io_env_t *env, ir_type *type)
+{
+       write_long(env, get_type_nr(type));
+}
+
+static void write_string(io_env_t *env, const char *string)
+{
+       const char *c;
+       fputc('"', env->file);
+       for (c = string; *c != '\0'; ++c) {
+               switch (*c) {
+               case '\n':
+                       fputc('\\', env->file);
+                       fputc('n', env->file);
+                       break;
+               case '"':
+               case '\\':
+                       fputc('\\', env->file);
+                       /* FALLTHROUGH */
+               default:
+                       fputc(*c, env->file);
+                       break;
+               }
+       }
+       fputc('"', env->file);
+}
+
+static void write_ident(io_env_t *env, ident *id)
+{
+       write_string(env, get_id_str(id));
+       fputc(' ', env->file);
+}
+
+static void write_ident_null(io_env_t *env, ident *id)
+{
+       if (id == NULL) {
+               fputs("NULL ", env->file);
+       } else {
+               write_ident(env, id);
+       }
+}
+
 static void write_mode(io_env_t *env, ir_mode *mode)
 {
        fputs(get_mode_name(mode), env->file);
        fputc(' ', env->file);
 }
 
-static void write_tarval(io_env_t *env, tarval *tv)
+static void write_tarval(io_env_t *env, ir_tarval *tv)
 {
        char buf[1024];
        write_mode(env, get_tarval_mode(tv));
@@ -295,17 +396,8 @@ static void write_tarval(io_env_t *env, tarval *tv)
        fputc(' ', env->file);
 }
 
-static void write_align(io_env_t *env, ir_node *irn)
+static void write_align(io_env_t *env, ir_align align)
 {
-       ir_align align;
-
-       if (is_Load(irn))
-               align = get_Load_align(irn);
-       else if (is_Store(irn))
-               align = get_Store_align(irn);
-       else
-               panic("Invalid optype for write_align");
-
        fputs(get_align_name(align), env->file);
        fputc(' ', env->file);
 }
@@ -316,16 +408,20 @@ static void write_builtin_kind(io_env_t *env, ir_node *irn)
        fputc(' ', env->file);
 }
 
-static void write_cond_kind(io_env_t *env, ir_node *irn)
+static void write_cond_jmp_predicate(io_env_t *env, ir_node *irn)
 {
-       fputs(get_cond_kind_name(get_Cond_kind(irn)), env->file);
+       fputs(get_cond_jmp_predicate_name(get_Cond_jmp_pred(irn)), env->file);
        fputc(' ', env->file);
 }
 
-static void write_cond_jmp_predicate(io_env_t *env, ir_node *irn)
+static void write_list_begin(io_env_t *env)
 {
-       fputs(get_cond_jmp_predicate_name(get_Cond_jmp_pred(irn)), env->file);
-       fputc(' ', env->file);
+       fputs("[", env->file);
+}
+
+static void write_list_end(io_env_t *env)
+{
+       fputs("] ", env->file);
 }
 
 static void write_initializer(io_env_t *env, ir_initializer_t *ini)
@@ -336,30 +432,28 @@ static void write_initializer(io_env_t *env, ir_initializer_t *ini)
        fputs(get_initializer_kind_name(ini_kind), f);
        fputc(' ', f);
 
-       switch (ini_kind)
-       {
-               case IR_INITIALIZER_CONST:
-                       fprintf(f, "%ld ", get_irn_node_nr(get_initializer_const_value(ini)));
-                       break;
+       switch (ini_kind) {
+       case IR_INITIALIZER_CONST:
+               write_long(env, get_irn_node_nr(get_initializer_const_value(ini)));
+               break;
 
-               case IR_INITIALIZER_TARVAL:
-                       write_tarval(env, get_initializer_tarval_value(ini));
-                       break;
+       case IR_INITIALIZER_TARVAL:
+               write_tarval(env, get_initializer_tarval_value(ini));
+               break;
 
-               case IR_INITIALIZER_NULL:
-                       break;
+       case IR_INITIALIZER_NULL:
+               break;
 
-               case IR_INITIALIZER_COMPOUND:
-               {
-                       unsigned i, n = get_initializer_compound_n_entries(ini);
-                       fprintf(f, "%d ", n);
-                       for (i = 0; i < n; i++)
-                               write_initializer(env, get_initializer_compound_value(ini, i));
-                       break;
-               }
+       case IR_INITIALIZER_COMPOUND: {
+               size_t i, n = get_initializer_compound_n_entries(ini);
+               ir_fprintf(f, "%zu ", n);
+               for (i = 0; i < n; ++i)
+                       write_initializer(env, get_initializer_compound_value(ini, i));
+               break;
+       }
 
-               default:
-                       panic("Unknown initializer kind");
+       default:
+               panic("Unknown initializer kind");
        }
 }
 
@@ -369,32 +463,21 @@ static void write_pin_state(io_env_t *env, ir_node *irn)
        fputc(' ', env->file);
 }
 
-static void write_volatility(io_env_t *env, ir_node *irn)
+static void write_volatility(io_env_t *env, ir_volatility vol)
 {
-       ir_volatility vol;
-
-       if (is_Load(irn))
-               vol = get_Load_volatility(irn);
-       else if (is_Store(irn))
-               vol = get_Store_volatility(irn);
-       else
-               panic("Invalid optype for write_volatility");
-
        fputs(get_volatility_name(vol), env->file);
        fputc(' ', env->file);
 }
 
 static void export_type_common(io_env_t *env, ir_type *tp)
 {
-       fprintf(env->file, "\t%s %ld %s \"%s\" %u %u %s %s ",
-                       is_frame_type(tp) ? "frametype" : is_value_param_type(tp) ? "valuetype" : "type",
-                       get_type_nr(tp),
-                       get_type_tpop_name(tp),
-                       get_type_name(tp),
-                       get_type_size_bytes(tp),
-                       get_type_alignment_bytes(tp),
-                       get_type_state_name(get_type_state(tp)),
-                       get_visibility_name(get_type_visibility(tp)));
+       fprintf(env->file, "\ttype %ld %s %u %u %s %u ",
+               get_type_nr(tp),
+               get_type_tpop_name(tp),
+               get_type_size_bytes(tp),
+               get_type_alignment_bytes(tp),
+               get_type_state_name(get_type_state(tp)),
+               tp->flags);
 }
 
 static void export_type_pre(io_env_t *env, ir_type *tp)
@@ -402,41 +485,42 @@ static void export_type_pre(io_env_t *env, ir_type *tp)
        FILE *f = env->file;
 
        /* skip types to be handled by post walker */
-       switch (get_type_tpop_code(tp))
-       {
-               case tpo_array:
-               case tpo_method:
-               case tpo_pointer:
-                       return;
-               default:
-                       break;
+       switch (get_type_tpop_code(tp)) {
+       case tpo_array:
+       case tpo_method:
+       case tpo_pointer:
+               return;
+       default:
+               break;
        }
 
        export_type_common(env, tp);
 
-       switch (get_type_tpop_code(tp))
-       {
-               case tpo_class:
-                       /* TODO: inheritance stuff not supported yet */
-                       printf("Inheritance of classes not supported yet!\n");
-                       break;
-
-               case tpo_primitive:
-                       write_mode(env, get_type_mode(tp));
-                       break;
-
-               case tpo_struct:
-                       break;
-
-               case tpo_union:
-                       break;
-
-               case tpo_unknown:
-                       break;
-
-               default:
-                       printf("export_type_pre: Unknown type code \"%s\".\n", get_type_tpop_name(tp));
-                       break;
+       switch (get_type_tpop_code(tp)) {
+       case tpo_uninitialized:
+               panic("invalid type found");
+
+       case tpo_class:
+               write_ident_null(env, get_compound_ident(tp));
+               break;
+
+       case tpo_primitive:
+               write_mode(env, get_type_mode(tp));
+               break;
+
+       case tpo_union:
+       case tpo_struct:
+       case tpo_enumeration:
+               write_ident_null(env, get_compound_ident(tp));
+               break;
+
+       case tpo_array:
+       case tpo_method:
+       case tpo_pointer:
+       case tpo_code:
+       case tpo_none:
+       case tpo_unknown:
+               break;
        }
        fputc('\n', f);
 }
@@ -444,113 +528,140 @@ static void export_type_pre(io_env_t *env, ir_type *tp)
 static void export_type_post(io_env_t *env, ir_type *tp)
 {
        FILE *f = env->file;
-       int i, n, nparams, nresults;
+       size_t i;
 
        /* skip types already handled by pre walker */
-       switch (get_type_tpop_code(tp))
-       {
-               case tpo_class:
-               case tpo_primitive:
-               case tpo_struct:
-               case tpo_union:
-               case tpo_unknown:
-                       return;
-               default:
-                       break;
+       switch (get_type_tpop_code(tp)) {
+       case tpo_class:
+       case tpo_primitive:
+       case tpo_struct:
+       case tpo_union:
+       case tpo_unknown:
+       case tpo_uninitialized:
+       case tpo_code:
+       case tpo_none:
+               return;
+       case tpo_array:
+       case tpo_method:
+       case tpo_pointer:
+       case tpo_enumeration:
+               break;
        }
 
        export_type_common(env, tp);
 
-       switch (get_type_tpop_code(tp))
-       {
-               case tpo_array:
-                       n = get_array_n_dimensions(tp);
-                       fprintf(f, "%i %ld ", n, get_type_nr(get_array_element_type(tp)));
-                       for (i = 0; i < n; i++) {
-                               ir_node *lower = get_array_lower_bound(tp, i);
-                               ir_node *upper = get_array_upper_bound(tp, i);
-
-                               if (is_Const(lower))
-                                       fprintf(f, "%ld ", get_tarval_long(get_Const_tarval(lower)));
-                               else
-                                       panic("Lower array bound is not constant");
-
-                               if (is_Const(upper))
-                                       fprintf(f, "%ld ", get_tarval_long(get_Const_tarval(upper)));
-                               else if (is_Unknown(upper))
-                                       fputs("unknown ", f);
-                               else
-                                       panic("Upper array bound is not constant");
-                       }
-                       break;
+       switch (get_type_tpop_code(tp)) {
+       case tpo_array: {
+               size_t n = get_array_n_dimensions(tp);
+               ir_fprintf(f, "%zu %ld ", n, get_type_nr(get_array_element_type(tp)));
+               for (i = 0; i < n; i++) {
+                       ir_node *lower = get_array_lower_bound(tp, i);
+                       ir_node *upper = get_array_upper_bound(tp, i);
+
+                       if (is_Const(lower))
+                               write_long(env, get_tarval_long(get_Const_tarval(lower)));
+                       else
+                               panic("Lower array bound is not constant");
+
+                       if (is_Const(upper))
+                               write_long(env, get_tarval_long(get_Const_tarval(upper)));
+                       else if (is_Unknown(upper))
+                               fputs("unknown ", f);
+                       else
+                               panic("Upper array bound is not constant");
+               }
+               break;
+       }
 
-               case tpo_method:
-                       nparams  = get_method_n_params(tp);
-                       nresults = get_method_n_ress(tp);
-                       fprintf(f, "0x%X 0x%X %i %i ", get_method_calling_convention(tp),
-                               get_method_additional_properties(tp), nparams, nresults);
-                       for (i = 0; i < nparams; i++)
-                               fprintf(f, "%ld ", get_type_nr(get_method_param_type(tp, i)));
-                       for (i = 0; i < nresults; i++)
-                               fprintf(f, "%ld ", get_type_nr(get_method_res_type(tp, i)));
-                       fprintf(f, "%d ", get_method_first_variadic_param_index(tp));
-                       break;
+       case tpo_method: {
+               size_t nparams  = get_method_n_params(tp);
+               size_t nresults = get_method_n_ress(tp);
+               ir_fprintf(f, "%u %u %zu %zu ", get_method_calling_convention(tp),
+                       get_method_additional_properties(tp), nparams, nresults);
+               for (i = 0; i < nparams; i++)
+                       write_long(env, get_type_nr(get_method_param_type(tp, i)));
+               for (i = 0; i < nresults; i++)
+                       write_long(env, get_type_nr(get_method_res_type(tp, i)));
+               ir_fprintf(f, "%u ", get_method_variadicity(tp));
+               break;
+       }
 
-               case tpo_pointer:
-                       write_mode(env, get_type_mode(tp));
-                       fprintf(f, "%ld ", get_type_nr(get_pointer_points_to_type(tp)));
-                       break;
+       case tpo_pointer:
+               write_mode(env, get_type_mode(tp));
+               write_long(env, get_type_nr(get_pointer_points_to_type(tp)));
+               break;
 
-               default:
-                       printf("export_type: Unknown type code \"%s\".\n", get_type_tpop_name(tp));
-                       break;
+       case tpo_enumeration:
+               fprintf(stderr, "Enumeration type not handled yet by exporter\n");
+               break;
+
+       default:
+               printf("export_type: Unknown type code \"%s\".\n",
+                      get_type_tpop_name(tp));
+               break;
        }
        fputc('\n', f);
 }
 
 static void export_entity(io_env_t *env, ir_entity *ent)
 {
-       ir_type *owner = get_entity_owner(ent);
-       fprintf(env->file, "\tentity %ld \"%s\" \"%s\" %ld %ld %d %u %d %s %s %s %s %s ",
-                       get_entity_nr(ent),
-                       get_entity_name(ent),
-                       ent->ld_name ? get_id_str(ent->ld_name) : "",
+       FILE          *file       = env->file;
+       ir_type       *owner      = get_entity_owner(ent);
+       ir_visibility  visibility = get_entity_visibility(ent);
+       ir_linkage     linkage    = get_entity_linkage(ent);
+
+       /* we don't dump array_element_ent entities. They're a strange concept
+        * and lead to cycles in type_graph.
+        */
+       if (is_Array_type(owner))
+               return;
+
+       fprintf(env->file, "\tentity ");
+       write_long(env, get_entity_nr(ent));
+       write_ident_null(env, get_entity_ident(ent));
+       if (!entity_has_ld_ident(ent)) {
+               write_ident_null(env, NULL);
+       } else {
+               write_ident_null(env, get_entity_ld_ident(ent));
+       }
+
+       /* visibility + linkage */
+       if (visibility != ir_visibility_default) {
+               fprintf(file, "%s ", get_visibility_name(visibility));
+       }
+       if (linkage & IR_LINKAGE_CONSTANT)
+               fputs("constant ", file);
+       if (linkage & IR_LINKAGE_WEAK)
+               fputs("weak ", file);
+       if (linkage & IR_LINKAGE_GARBAGE_COLLECT)
+               fputs("garbage_collect ", file);
+       if (linkage & IR_LINKAGE_MERGE)
+               fputs("merge ", file);
+       if (linkage & IR_LINKAGE_HIDDEN_USER)
+               fputs("hidden_user ", file);
+
+       fprintf(file, "%ld %ld %d %u %d %s ",
                        get_type_nr(get_entity_type(ent)),
                        get_type_nr(owner),
                        get_entity_offset(ent),
                        (unsigned) get_entity_offset_bits_remainder(ent),
                        is_entity_compiler_generated(ent),
-                       get_allocation_name(get_entity_allocation(ent)),
-                       get_visibility_name(get_entity_visibility(ent)),
-                       get_variability_name(get_entity_variability(ent)),
-                       get_peculiarity_name(get_entity_peculiarity(ent)),
                        get_volatility_name(get_entity_volatility(ent)));
 
-       /* TODO: inheritance stuff for class entities not supported yet */
-       if (is_Class_type(owner) && owner != get_glob_type())
-               printf("Inheritance of class entities not supported yet!\n");
-
-       if (get_entity_variability(ent) != variability_uninitialized &&
-           get_entity_visibility(ent) != visibility_external_allocated)
-       {
-               if (is_compound_entity(ent)) {
-                       if (has_entity_initializer(ent)) {
-                               fputs("initializer ", env->file);
-                               write_initializer(env, get_entity_initializer(ent));
-                       } else {
-                               int i, n = get_compound_ent_n_values(ent);
-                               fputs("noninitializer ", env->file);
-                               fprintf(env->file, "%d ", n);
-                               for (i = 0; i < n; i++) {
-                                       ir_entity *member = get_compound_ent_value_member(ent, i);
-                                       ir_node   *irn    = get_compound_ent_value(ent, i);
-                                       fprintf(env->file, "%ld %ld ", get_entity_nr(member), get_irn_node_nr(irn));
-                               }
-                       }
-               } else {
-                       ir_node *irn = get_atomic_ent_value(ent);
-                       fprintf(env->file, "%ld ", get_irn_node_nr(irn));
+       if (ent->initializer != NULL) {
+               fputs("initializer ", env->file);
+               write_initializer(env, get_entity_initializer(ent));
+       } else if (entity_has_compound_ent_values(ent)) {
+               size_t i, n = get_compound_ent_n_values(ent);
+               fputs("compoundgraph ", env->file);
+               ir_fprintf(env->file, "%zu ", n);
+               for (i = 0; i < n; i++) {
+                       ir_entity *member = get_compound_ent_value_member(ent, i);
+                       ir_node   *irn    = get_compound_ent_value(ent, i);
+                       fprintf(env->file, "%ld %ld ", get_entity_nr(member), get_irn_node_nr(irn));
                }
+       } else {
+               fputs("none", env->file);
        }
 
        fputc('\n', env->file);
@@ -567,22 +678,61 @@ static void export_type_or_ent_post(type_or_ent tore, void *ctx)
 {
        io_env_t *env = (io_env_t *) ctx;
 
-       switch (get_kind(tore.ent))
-       {
-               case k_entity:
-                       export_entity(env, tore.ent);
-                       break;
+       switch (get_kind(tore.ent)) {
+       case k_entity:
+               export_entity(env, tore.ent);
+               break;
 
-               case k_type:
-                       export_type_post(env, tore.typ);
-                       break;
+       case k_type:
+               export_type_post(env, tore.typ);
+               break;
 
-               default:
-                       panic("export_type_or_ent_post: Unknown type or entity.");
-                       break;
+       default:
+               panic("export_type_or_ent_post: Unknown type or entity.");
+               break;
+       }
+}
+
+static void export_ASM(io_env_t *env, ir_node *node)
+{
+       ir_asm_constraint *input_constraints    = get_ASM_input_constraints(node);
+       ir_asm_constraint *output_constraints   = get_ASM_output_constraints(node);
+       ident            **clobbers             = get_ASM_clobbers(node);
+       int                n_input_constraints  = get_ASM_n_input_constraints(node);
+       int                n_output_constraints = get_ASM_n_output_constraints(node);
+       int                n_clobbers           = get_ASM_n_clobbers(node);
+       int i;
+
+       write_ident(env, get_ASM_text(node));
+       write_list_begin(env);
+       for (i = 0; i < n_input_constraints; ++i) {
+               const ir_asm_constraint *constraint = &input_constraints[i];
+               write_unsigned(env, constraint->pos);
+               write_ident(env, constraint->constraint);
+               write_mode(env, constraint->mode);
+       }
+       write_list_end(env);
+
+       write_list_begin(env);
+       for (i = 0; i < n_output_constraints; ++i) {
+               const ir_asm_constraint *constraint = &output_constraints[i];
+               write_unsigned(env, constraint->pos);
+               write_ident(env, constraint->constraint);
+               write_mode(env, constraint->mode);
+       }
+       write_list_end(env);
+
+       write_list_begin(env);
+       for (i = 0; i < n_clobbers; ++i) {
+               ident *clobber = clobbers[i];
+               write_ident(env, clobber);
        }
+       write_list_end(env);
 }
 
+/**
+ * Walker: exports every node.
+ */
 static void export_node(ir_node *irn, void *ctx)
 {
        io_env_t *env = (io_env_t *) ctx;
@@ -592,54 +742,96 @@ static void export_node(ir_node *irn, void *ctx)
        if (env->ignoreblocks && opcode == iro_Block)
                return;
 
-       n = get_irn_arity(irn);
+       fprintf(env->file, "\t%s ", get_irn_opname(irn));
+       write_long(env, get_irn_node_nr(irn));
 
-       fprintf(env->file, "\t%s %ld [ ", get_irn_opname(irn), get_irn_node_nr(irn));
+       write_list_begin(env);
+       n = get_irn_arity(irn);
+       if (!is_Block(irn)) {
+               ir_node *block = get_nodes_block(irn);
+               write_long(env, get_irn_node_nr(block));
+       }
 
-       for (i = -1; i < n; i++) {
+       for (i = 0; i < n; i++) {
                ir_node *pred = get_irn_n(irn, i);
                if (pred == NULL) {
                        /* Anchor node may have NULL predecessors */
                        assert(is_Anchor(irn));
                        fputs("-1 ", env->file);
                } else {
-                       fprintf(env->file, "%ld ", get_irn_node_nr(pred));
+                       write_long(env, get_irn_node_nr(pred));
                }
        }
-
-       fprintf(env->file, "] { ");
-
-       switch (opcode)
-       {
-               #include "gen_irio_export.inl"
+       write_list_end(env);
+
+       fputs("{ ", env->file);
+
+       switch (opcode) {
+       case iro_Start:
+       case iro_End:
+       case iro_Block:
+       case iro_Anchor:
+               break;
+       case iro_SymConst:
+               /* TODO: only symconst_addr_ent implemented yet */
+               assert(get_SymConst_kind(irn) == symconst_addr_ent);
+               fprintf(env->file, "%ld ", get_entity_nr(get_SymConst_entity(irn)));
+               break;
+       case iro_Proj:
+               write_mode(env, get_irn_mode(irn));
+               fprintf(env->file, "%ld ", get_Proj_proj(irn));
+               break;
+       case iro_ASM:
+               export_ASM(env, irn);
+               break;
+#include "gen_irio_export.inl"
+       default:
+               panic("no export code for node %+F\n", irn);
        }
        fputs("}\n", env->file);
 }
 
+static const char *get_mode_sort_name(ir_mode_sort sort)
+{
+       switch (sort) {
+       case irms_auxiliary:        return "auxiliary";
+       case irms_control_flow:     return "control_flow";
+       case irms_memory:           return "memory";
+       case irms_internal_boolean: return "internal_boolean";
+       case irms_reference:        return "reference";
+       case irms_int_number:       return "int_number";
+       case irms_float_number:     return "float_number";
+       }
+       panic("invalid mode sort found");
+}
+
 static void export_modes(io_env_t *env)
 {
-       int i, n_modes = get_irp_n_modes();
+       size_t i, n_modes = get_irp_n_modes();
 
        fputs("modes {\n", env->file);
 
        for (i = 0; i < n_modes; i++) {
                ir_mode *mode = get_irp_mode(i);
-               switch (get_mode_sort(mode))
-               {
-                       case irms_auxiliary:
-                       case irms_control_flow:
-                       case irms_memory:
-                       case irms_internal_boolean:
-                               /* skip "internal" modes, which may not be user defined */
-                               continue;
-                       default:
-                               break;
+               switch (get_mode_sort(mode)) {
+               case irms_auxiliary:
+               case irms_control_flow:
+               case irms_memory:
+               case irms_internal_boolean:
+                       /* skip "internal" modes, which may not be user defined */
+                       continue;
+               default:
+                       break;
                }
 
-               fprintf(env->file, "\tmode \"%s\" 0x%X %d %d %s %d %d ", get_mode_name(mode),
-                       get_mode_sort(mode), get_mode_size_bits(mode), get_mode_sign(mode),
-                       get_mode_arithmetic_name(get_mode_arithmetic(mode)), get_mode_modulo_shift(mode),
-                       get_mode_n_vector_elems(mode));
+               fprintf(env->file, "\tmode ");
+               write_string(env, get_mode_name(mode));
+               fprintf(env->file, "%s %u %d %s %u %u ",
+                       get_mode_sort_name(get_mode_sort(mode)),
+                       get_mode_size_bits(mode), get_mode_sign(mode),
+                       get_mode_arithmetic_name(get_mode_arithmetic(mode)),
+                       get_mode_modulo_shift(mode),
+                       get_mode_n_vector_elems(mode));
                if (mode_is_reference(mode)) {
                        write_mode(env, get_reference_mode_signed_eq(mode));
                        write_mode(env, get_reference_mode_unsigned_eq(mode));
@@ -647,60 +839,94 @@ static void export_modes(io_env_t *env)
                fputc('\n', env->file);
        }
 
-       fputs("}\n\n", env->file);
+       fputs("}\n", env->file);
 }
 
-/** Exports the whole irp to the given file in a textual form. */
-void ir_export(const char *filename)
+static void export_program(io_env_t *env)
 {
-       io_env_t env;
-       int i, n_irgs = get_irp_n_irgs();
+       FILE         *f = env->file;
+       ir_segment_t  s;
 
-       env.file = fopen(filename, "wt");
-       if (!env.file) {
+       fputs("\nprogram {\n", f);
+       if (irp_prog_name_is_set()) {
+               fprintf(f, "\tname ");
+               write_string(env, get_irp_name());
+               fputc('\n', f);
+       }
+
+       for (s = IR_SEGMENT_FIRST; s <= IR_SEGMENT_LAST; ++s) {
+               ir_type *segment_type = get_segment_type(s);
+               fprintf(f, "\tsegment_type %s ", get_segment_name(s));
+               if (segment_type == NULL) {
+                       fputs(" NULL\n", f);
+               } else {
+                       write_long(env, get_type_nr(segment_type));
+                       fputc('\n', f);
+               }
+       }
+       fputs("}\n", f);
+}
+
+void ir_export(const char *filename)
+{
+       FILE *file = fopen(filename, "wt");
+       if (file == NULL) {
                perror(filename);
                return;
        }
 
-       export_modes(&env);
+       ir_export_file(file, filename);
+       fclose(file);
+}
 
-       fputs("typegraph {\n", env.file);
+/* Exports the whole irp to the given file in a textual form. */
+void ir_export_file(FILE *file, const char *outputname)
+{
+       io_env_t env;
+       size_t i, n_irgs = get_irp_n_irgs();
 
+       (void) outputname;
+       env.file = file;
+
+       export_modes(&env);
+
+       fputs("\ntypegraph {\n", env.file);
        type_walk_prog(export_type_or_ent_pre, export_type_or_ent_post, &env);
+       fputs("}\n", env.file);
 
        for (i = 0; i < n_irgs; i++) {
-               ir_graph *irg = get_irp_irg(i);
-               ir_type *valuetype = get_irg_value_param_type(irg);
+               ir_graph *irg       = get_irp_irg(i);
+               ir_type  *valuetype = get_irg_value_param_type(irg);
 
-               fprintf(env.file, "}\n\nirg %ld %ld %ld {\n", get_entity_nr(get_irg_entity(irg)),
-                       get_type_nr(get_irg_frame_type(irg)),
-                       valuetype == NULL ? -1 : get_type_nr(valuetype));
+               fprintf(env.file, "\nirg %ld %ld %ld {\n",
+                       get_entity_nr(get_irg_entity(irg)),
+                       get_type_nr(get_irg_frame_type(irg)),
+                       valuetype == NULL ? -1 : get_type_nr(valuetype));
 
                env.ignoreblocks = 0;
                irg_block_walk_graph(irg, NULL, export_node, &env);
 
                env.ignoreblocks = 1;
                irg_walk_anchors(irg, NULL, export_node, &env);
+
+               fputs("}\n", env.file);
        }
 
-       fprintf(env.file, "}\n\nconstirg %ld {\n", get_irn_node_nr(get_const_code_irg()->current_block));
+       fprintf(env.file, "\nconstirg %ld {\n", get_irn_node_nr(get_const_code_irg()->current_block));
 
        walk_const_code(NULL, export_node, &env);
        fputs("}\n", env.file);
 
-       fclose(env.file);
+       export_program(&env);
 }
 
-/** Exports the given irg to the given file. */
-void ir_export_irg(ir_graph *irg, const char *filename)
+/* Exports the given irg to the given file. */
+void ir_export_irg(ir_graph *irg, FILE *file, const char *outputname)
 {
        io_env_t env;
 
-       env.file = fopen(filename, "wt");
-       if (!env.file) {
-               perror(filename);
-               return;
-       }
+       (void) outputname;
+       env.file = file;
 
        export_modes(&env);
 
@@ -720,172 +946,237 @@ void ir_export_irg(ir_graph *irg, const char *filename)
        fprintf(env.file, "}\n\nconstirg %ld {\n", get_irn_node_nr(get_const_code_irg()->current_block));
        walk_const_code(NULL, export_node, &env);
        fputs("}\n", env.file);
-
-       fclose(env.file);
 }
 
-static void save_lex_state(io_env_t *env, lex_state_t *state)
+static void read_c(io_env_t *env)
 {
-       state->offs = ftell(env->file);
-       state->line = env->line;
-       state->col  = env->col;
+       int c = fgetc(env->file);
+       env->c = c;
+       if (c == '\n')
+               env->line++;
 }
 
-static void restore_lex_state(io_env_t *env, lex_state_t *state)
-{
-       fseek(env->file, state->offs, SEEK_SET);
-       env->line = state->line;
-       env->col  = state->col;
-}
-
-static int read_c(io_env_t *env)
+/** Returns the first non-whitespace character or EOF. **/
+static void skip_ws(io_env_t *env)
 {
-       int ch = fgetc(env->file);
-       switch (ch)
-       {
+       while (true) {
+               switch (env->c) {
+               case ' ':
                case '\t':
-                       env->col += 4;
-                       break;
-
                case '\n':
-                       env->col = 0;
-                       env->line++;
-                       break;
+               case '\r':
+                       read_c(env);
+                       continue;
 
                default:
-                       env->col++;
-                       break;
-       }
-       return ch;
-}
-
-/** Returns the first non-whitespace character or EOF. **/
-static int skip_ws(io_env_t *env)
-{
-       while (1)
-       {
-               int ch = read_c(env);
-               switch (ch)
-               {
-                       case ' ':
-                       case '\t':
-                       case '\n':
-                       case '\r':
-                               break;
-
-                       default:
-                               return ch;
+                       return;
                }
        }
 }
 
 static void skip_to(io_env_t *env, char to_ch)
 {
-       int ch;
-       do
-               ch = read_c(env);
-       while (ch != to_ch && ch != EOF);
+       while (env->c != to_ch && env->c != EOF) {
+               read_c(env);
+       }
 }
 
 static int expect_char(io_env_t *env, char ch)
 {
-       int curch = skip_ws(env);
-       if (curch != ch) {
-               printf("Unexpected char '%c', expected '%c' in line %i:%i\n", curch, ch, env->line, env->col);
+       skip_ws(env);
+       if (env->c != ch) {
+               parse_error(env, "Unexpected char '%c', expected '%c'\n",
+                           env->c, ch);
                return 0;
        }
+       read_c(env);
        return 1;
 }
 
 #define EXPECT(c) if (expect_char(env, (c))) {} else return 0
-#define EXPECT_OR_EXIT(c) if (expect_char(env, (c))) {} else exit(1)
 
-inline static const char *read_str_to(io_env_t *env, char *buf, size_t bufsize)
+static char *read_word(io_env_t *env)
 {
-       size_t i;
-       for (i = 0; i < bufsize - 1; i++) {
-               int ch = read_c(env);
-               if (ch == EOF) break;
-               switch (ch)
-               {
-                       case ' ':
-                       case '\t':
-                       case '\n':
-                       case '\r':
-                               if (i != 0)
-                                       goto endofword;
-                               i--;    /* skip whitespace */
-                               break;
+       skip_ws(env);
 
-                       default:
-                               buf[i] = ch;
-                               break;
+       assert(obstack_object_size(&env->obst) == 0);
+       while (true) {
+               int c = env->c;
+               switch (c) {
+               case EOF:
+               case ' ':
+               case '\t':
+               case '\n':
+               case '\r':
+                       goto endofword;
+
+               default:
+                       obstack_1grow(&env->obst, c);
+                       break;
                }
+               read_c(env);
        }
+
 endofword:
-       buf[i] = 0;
-       return buf;
+       obstack_1grow(&env->obst, '\0');
+       return (char*)obstack_finish(&env->obst);
 }
 
-static const char *read_str(io_env_t *env)
+static char *read_string(io_env_t *env)
 {
-       static char buf[1024];
-       return read_str_to(env, buf, sizeof(buf));
-}
+       skip_ws(env);
+       if (env->c != '"') {
+               parse_error(env, "Expected string, got '%c'\n", env->c);
+               exit(1);
+       }
+       read_c(env);
 
-static const char *read_qstr_to(io_env_t *env, char *buf, size_t bufsize)
-{
-       size_t i;
-       EXPECT_OR_EXIT('\"');
-       for (i = 0; i < bufsize - 1; i++) {
-               int ch = read_c(env);
-               if (ch == EOF) {
-                       printf("Unexpected end of quoted string!\n");
+       assert(obstack_object_size(&env->obst) == 0);
+       while (env->c != '"') {
+               if (env->c == EOF) {
+                       parse_error(env, "Unexpected EOF while parsing string\n");
                        exit(1);
                }
-               if (ch == '\"') break;
 
-               buf[i] = ch;
+               if (env->c == '\\') {
+                       read_c(env);
+                       switch (env->c) {
+                       case 'n':
+                               obstack_1grow(&env->obst, '\n');
+                               break;
+                       case '"':
+                       case '\\':
+                               obstack_1grow(&env->obst, env->c);
+                               break;
+                       default:
+                               parse_error(env, "Unknown escape sequence '\\%c'\n", env->c);
+                               exit(1);
+                               break;
+                       }
+               } else {
+                       obstack_1grow(&env->obst, env->c);
+               }
+               read_c(env);
+       }
+       read_c(env);
+       obstack_1grow(&env->obst, 0);
+
+       return (char*)obstack_finish(&env->obst);
+}
+
+static ident *read_ident(io_env_t *env)
+{
+       char  *str = read_string(env);
+       ident *res = new_id_from_str(str);
+       obstack_free(&env->obst, str);
+       return res;
+}
+
+/*
+ * reads a "quoted string" or alternatively the token NULL
+ */
+static char *read_string_null(io_env_t *env)
+{
+       skip_ws(env);
+       if (env->c == 'N') {
+               char *str = read_word(env);
+               if (strcmp(str, "NULL") == 0) {
+                       obstack_free(&env->obst, str);
+                       return NULL;
+               }
+       } else if (env->c == '"') {
+               return read_string(env);
        }
-       if (i == bufsize - 1) {
-               printf("Quoted string too long!\n");
+
+       parse_error(env, "Expected \"string\" or NULL\n");
+       exit(1);
+}
+
+static ident *read_ident_null(io_env_t *env)
+{
+       ident *res;
+       char  *str = read_string_null(env);
+       if (str == NULL)
+               return NULL;
+
+       res = new_id_from_str(str);
+       obstack_free(&env->obst, str);
+       return res;
+}
+
+static long read_long(io_env_t *env)
+{
+       long  result;
+       char *str;
+
+       skip_ws(env);
+       if (!isdigit(env->c) && env->c != '-') {
+               parse_error(env, "Expected number, got '%c'\n", env->c);
                exit(1);
        }
-       buf[i] = 0;
-       return buf;
+
+       assert(obstack_object_size(&env->obst) == 0);
+       do {
+               obstack_1grow(&env->obst, env->c);
+               read_c(env);
+       } while (isdigit(env->c));
+       obstack_1grow(&env->obst, 0);
+
+       str = (char*)obstack_finish(&env->obst);
+       result = atol(str);
+       obstack_free(&env->obst, str);
+
+       return result;
 }
 
-static const char *read_qstr(io_env_t *env)
+static int read_int(io_env_t *env)
 {
-       static char buf[1024];
-       return read_qstr_to(env, buf, sizeof(buf));
+       return (int) read_long(env);
 }
 
-static long read_long2(io_env_t *env, char **endptr)
+static unsigned read_unsigned(io_env_t *env)
 {
-       static char buf[1024];
-       return strtol(read_str_to(env, buf, sizeof(buf)), endptr, 0);
+       return (unsigned) read_long(env);
 }
 
-static long read_long(io_env_t *env)
+static size_t read_size_t(io_env_t *env)
 {
-       return read_long2(env, NULL);
+       /* FIXME */
+       return (size_t) read_unsigned(env);
 }
 
-static ir_node *get_node_or_null(io_env_t *env, long nodenr)
+static void expect_list_begin(io_env_t *env)
 {
-       ir_node *node = (ir_node *) get_id(env, nodenr);
-       if (node && node->kind != k_ir_node)
-               panic("Irn ID %ld collides with something else in line %i:%i\n", nodenr, env->line, env->col);
-       return node;
+       skip_ws(env);
+       if (env->c != '[') {
+               parse_error(env, "Expected list, got '%c'\n", env->c);
+               exit(1);
+       }
+       read_c(env);
 }
 
-static ir_node *get_node(io_env_t *env, long nodenr)
+static bool list_has_next(io_env_t *env)
 {
-       ir_node *node = get_node_or_null(env, nodenr);
-       if (!node)
-               panic("Unknown node: %ld in line %i:%i\n", nodenr, env->line, env->col);
+       if (feof(env->file)) {
+               parse_error(env, "Unexpected EOF while reading list");
+               exit(1);
+       }
+       skip_ws(env);
+       if (env->c == ']') {
+               read_c(env);
+               return false;
+       }
+
+       return true;
+}
 
+static ir_node *get_node_or_null(io_env_t *env, long nodenr)
+{
+       ir_node *node = (ir_node *) get_id(env, nodenr);
+       if (node && node->kind != k_ir_node) {
+               panic("Irn ID %ld collides with something else in line %d\n",
+                     nodenr, env->line);
+       }
        return node;
 }
 
@@ -893,7 +1184,7 @@ static ir_node *get_node_or_dummy(io_env_t *env, long nodenr)
 {
        ir_node *node = get_node_or_null(env, nodenr);
        if (node == NULL) {
-               node = new_Dummy(mode_X);
+               node = new_r_Dummy(env->irg, mode_X);
                set_id(env, nodenr, node);
        }
        return node;
@@ -903,9 +1194,10 @@ static ir_type *get_type(io_env_t *env, long typenr)
 {
        ir_type *type = (ir_type *) get_id(env, typenr);
        if (type == NULL)
-               panic("Unknown type: %ld in line %i:%i\n", typenr, env->line, env->col);
+               panic("unknown type: %ld in line %d\n", typenr, env->line);
        else if (type->kind != k_type)
-               panic("Type ID %ld collides with something else in line %i:%i\n", typenr, env->line, env->col);
+               panic("type ID %ld collides with something else in line %d\n",
+                     typenr, env->line);
        return type;
 }
 
@@ -918,10 +1210,13 @@ static ir_entity *get_entity(io_env_t *env, long entnr)
 {
        ir_entity *entity = (ir_entity *) get_id(env, entnr);
        if (entity == NULL) {
-               printf("Unknown entity: %ld in line %i:%i\n", entnr, env->line, env->col);
+               parse_error(env, "unknown entity: %ld\n", entnr);
                exit(1);
-       } else if (entity->kind != k_entity)
-               panic("Entity ID %ld collides with something else in line %i:%i\n", entnr, env->line, env->col);
+       } else if (entity->kind != k_entity) {
+               panic("Entity ID %ld collides with something else in line %d\n",
+                     entnr, env->line);
+       }
+
        return entity;
 }
 
@@ -932,40 +1227,43 @@ static ir_entity *read_entity(io_env_t *env)
 
 static ir_mode *read_mode(io_env_t *env)
 {
-       static char buf[128];
-       int i, n;
-
-       read_str_to(env, buf, sizeof(buf));
+       char *str = read_word(env);
+       size_t i, n;
 
        n = get_irp_n_modes();
        for (i = 0; i < n; i++) {
                ir_mode *mode = get_irp_mode(i);
-               if (!strcmp(buf, get_mode_name(mode)))
+               if (strcmp(str, get_mode_name(mode)) == 0) {
+                       obstack_free(&env->obst, str);
                        return mode;
+               }
        }
 
-       printf("Unknown mode \"%s\" in line %i:%i\n", buf, env->line, env->col);
-       return mode_ANY;
+       parse_error(env, "unknown mode \"%s\"\n", str);
+       exit(1);
 }
 
 static const char *get_typetag_name(typetag_t typetag)
 {
-       switch (typetag)
-       {
-               case tt_align:       return "align";
-               case tt_allocation:  return "allocation";
-               case tt_builtin:     return "builtin kind";
-               case tt_initializer: return "initializer kind";
-               case tt_iro:         return "opcode";
-               case tt_peculiarity: return "peculiarity";
-               case tt_pin_state:   return "pin state";
-               case tt_tpo:         return "type";
-               case tt_type_state:  return "type state";
-               case tt_variability: return "variability";
-               case tt_visibility:  return "visibility";
-               case tt_volatility:  return "volatility";
-               default: return "<UNKNOWN>";
+       switch (typetag) {
+       case tt_align:              return "align";
+       case tt_allocation:         return "allocation";
+       case tt_builtin:            return "builtin kind";
+       case tt_cond_jmp_predicate: return "cond_jmp_predicate";
+       case tt_initializer:        return "initializer kind";
+       case tt_iro:                return "opcode";
+       case tt_keyword:            return "keyword";
+       case tt_linkage:            return "linkage";
+       case tt_mode_arithmetic:    return "mode_arithmetic";
+       case tt_mode_sort:          return "mode_sort";
+       case tt_pin_state:          return "pin state";
+       case tt_segment:            return "segment";
+       case tt_tpo:                return "type";
+       case tt_type_state:         return "type state";
+       case tt_volatility:         return "volatility";
+       case tt_visibility:         return "visibility";
        }
+       return "<UNKNOWN>";
 }
 
 /**
@@ -973,19 +1271,21 @@ static const char *get_typetag_name(typetag_t typetag)
  */
 static unsigned read_enum(io_env_t *env, typetag_t typetag)
 {
-       static char buf[128];
-       unsigned code = symbol(read_str_to(env, buf, sizeof(buf)), typetag);
-       if (code != SYMERROR)
+       char     *str  = read_word(env);
+       unsigned  code = symbol(str, typetag);
+
+       if (code != SYMERROR) {
+               obstack_free(&env->obst, str);
                return code;
+       }
 
-       printf("Invalid %s: \"%s\" in %i:%i\n", get_typetag_name(typetag), buf, env->line, env->col);
+       parse_error(env, "invalid %s: \"%s\"\n", get_typetag_name(typetag), str);
        return 0;
 }
 
 #define read_align(env)              ((ir_align)              read_enum(env, tt_align))
 #define read_allocation(env)         ((ir_allocation)         read_enum(env, tt_allocation))
 #define read_builtin_kind(env)       ((ir_builtin_kind)       read_enum(env, tt_builtin))
-#define read_cond_kind(env)          ((cond_kind)             read_enum(env, tt_cond_kind))
 #define read_cond_jmp_predicate(env) ((cond_jmp_predicate)    read_enum(env, tt_cond_jmp_predicate))
 #define read_initializer_kind(env)   ((ir_initializer_kind_t) read_enum(env, tt_initializer))
 #define read_mode_arithmetic(env)    ((ir_mode_arithmetic)    read_enum(env, tt_mode_arithmetic))
@@ -993,7 +1293,6 @@ static unsigned read_enum(io_env_t *env, typetag_t typetag)
 #define read_pin_state(env)          ((op_pin_state)          read_enum(env, tt_pin_state))
 #define read_type_state(env)         ((ir_type_state)         read_enum(env, tt_type_state))
 #define read_variability(env)        ((ir_variability)        read_enum(env, tt_variability))
-#define read_visibility(env)         ((ir_visibility)         read_enum(env, tt_visibility))
 #define read_volatility(env)         ((ir_volatility)         read_enum(env, tt_volatility))
 
 static ir_cons_flags get_cons_flags(io_env_t *env)
@@ -1001,12 +1300,12 @@ static ir_cons_flags get_cons_flags(io_env_t *env)
        ir_cons_flags flags = cons_none;
 
        op_pin_state pinstate = read_pin_state(env);
-       switch (pinstate)
-       {
-               case op_pin_state_floats: flags |= cons_floats; break;
-               case op_pin_state_pinned: break;
-               default:
-                       panic("Error in %i:%i: Invalid pinstate: %s", env->line, env->col, get_op_pin_state_name(pinstate));
+       switch (pinstate) {
+       case op_pin_state_floats: flags |= cons_floats; break;
+       case op_pin_state_pinned: break;
+       default:
+               panic("Error in %d: Invalid pinstate: %s", env->line,
+                     get_op_pin_state_name(pinstate));
        }
 
        if (read_volatility(env) == volatility_is_volatile)
@@ -1017,552 +1316,614 @@ static ir_cons_flags get_cons_flags(io_env_t *env)
        return flags;
 }
 
-static tarval *read_tv(io_env_t *env)
+static ir_tarval *read_tv(io_env_t *env)
 {
-       static char buf[128];
-       ir_mode *tvmode = read_mode(env);
-       read_str_to(env, buf, sizeof(buf));
-       return new_tarval_from_str(buf, strlen(buf), tvmode);
+       ir_mode   *tvmode = read_mode(env);
+       char      *str    = read_word(env);
+       ir_tarval *tv     = new_tarval_from_str(str, strlen(str), tvmode);
+       obstack_free(&env->obst, str);
+
+       return tv;
 }
 
 static ir_initializer_t *read_initializer(io_env_t *env)
 {
        ir_initializer_kind_t ini_kind = read_initializer_kind(env);
 
-       switch (ini_kind)
-       {
-               case IR_INITIALIZER_CONST:
-               {
-                       ir_node *irn = get_node_or_dummy(env, read_long(env));
-                       return create_initializer_const(irn);
-               }
+       switch (ini_kind) {
+       case IR_INITIALIZER_CONST: {
+               ir_node *irn = get_node_or_dummy(env, read_long(env));
+               return create_initializer_const(irn);
+       }
 
-               case IR_INITIALIZER_TARVAL:
-                       return create_initializer_tarval(read_tv(env));
+       case IR_INITIALIZER_TARVAL:
+               return create_initializer_tarval(read_tv(env));
 
-               case IR_INITIALIZER_NULL:
-                       return get_initializer_null();
+       case IR_INITIALIZER_NULL:
+               return get_initializer_null();
 
-               case IR_INITIALIZER_COMPOUND:
-               {
-                       unsigned i, n = (unsigned) read_long(env);
-                       ir_initializer_t *ini = create_initializer_compound(n);
-                       for (i = 0; i < n; i++) {
-                               ir_initializer_t *curini = read_initializer(env);
-                               set_initializer_compound_value(ini, i, curini);
-                       }
-                       return ini;
+       case IR_INITIALIZER_COMPOUND: {
+               size_t i, n = read_size_t(env);
+               ir_initializer_t *ini = create_initializer_compound(n);
+               for (i = 0; i < n; i++) {
+                       ir_initializer_t *curini = read_initializer(env);
+                       set_initializer_compound_value(ini, i, curini);
                }
+               return ini;
+       }
 
-               default:
-                       panic("Unknown initializer kind");
+       default:
+               panic("Unknown initializer kind");
        }
 }
 
 
 /** Reads a type description and remembers it by its id. */
-static void import_type(io_env_t *env, keyword_t kwkind)
+static void import_type(io_env_t *env)
 {
        int            i;
        ir_type       *type;
        long           typenr = read_long(env);
-       const char    *tpop   = read_str(env);
-       const char    *name   = read_qstr(env);
+       tp_opcode      tpop   = (tp_opcode) read_enum(env, tt_tpo);
        unsigned       size   = (unsigned) read_long(env);
        unsigned       align  = (unsigned) read_long(env);
        ir_type_state  state  = read_type_state(env);
-       ir_visibility  vis    = read_visibility(env);
-
-       ident         *id     = new_id_from_str(name);
-
-       const char    *kindstr;
+       unsigned       flags  = (unsigned) read_long(env);
+
+       switch (tpop) {
+       case tpo_array: {
+               int ndims = (int) read_long(env);
+               long elemtypenr = read_long(env);
+               ir_type *elemtype = get_type(env, elemtypenr);
+
+               type = new_type_array(ndims, elemtype);
+               for (i = 0; i < ndims; i++) {
+                       char *str = read_word(env);
+                       if (strcmp(str, "unknown") != 0) {
+                               long lowerbound = atol(str);
+                               set_array_lower_bound_int(type, i, lowerbound);
+                       }
+                       obstack_free(&env->obst, str);
 
-       if (kwkind == kw_frametype) {
-               if (symbol(tpop, tt_tpo) != tpo_class) {
-                       printf("Frame type must be a class type in line %i:%i\n", env->line, env->col);
-                       skip_to(env, '\n');
-                       return;
+                       str = read_word(env);
+                       if (strcmp(str, "unknown") != 0) {
+                               long upperbound = atol(str);
+                               set_array_upper_bound_int(type, i, upperbound);
+                       }
+                       obstack_free(&env->obst, str);
                }
-
-               type = new_type_frame(id);
                set_type_size_bytes(type, size);
+               break;
+       }
 
-               kindstr = "frametype";
-       } else if (kwkind == kw_valuetype) {
-               if (symbol(tpop, tt_tpo) != tpo_struct) {
-                       printf("Value type must be a struct type in line %i:%i\n", env->line, env->col);
-                       skip_to(env, '\n');
-                       return;
-               }
+       case tpo_class: {
+               ident *id = read_ident_null(env);
 
-               type = new_type_value(id);
+               if (typenr == (long) IR_SEGMENT_GLOBAL)
+                       type = get_glob_type();
+               else
+                       type = new_type_class(id);
                set_type_size_bytes(type, size);
+               break;
+       }
 
-               kindstr = "valuetype";
-       } else {
-               switch (symbol(tpop, tt_tpo))
-               {
-                       case tpo_array:
-                       {
-                               int ndims = (int) read_long(env);
-                               long elemtypenr = read_long(env);
-                               ir_type *elemtype = get_type(env, elemtypenr);
-
-                               type = new_type_array(id, ndims, elemtype);
-                               for (i = 0; i < ndims; i++) {
-                                       const char *str = read_str(env);
-                                       if (strcmp(str, "unknown") != 0) {
-                                               long lowerbound = strtol(str, NULL, 0);
-                                               set_array_lower_bound_int(type, i, lowerbound);
-                                       }
-                                       str = read_str(env);
-                                       if (strcmp(str, "unknown") != 0) {
-                                               long upperbound = strtol(str, NULL, 0);
-                                               set_array_upper_bound_int(type, i, upperbound);
-                                       }
-                               }
-                               set_type_size_bytes(type, size);
-                               break;
-                       }
+       case tpo_method: {
+               unsigned                  callingconv = (unsigned) read_long(env);
+               mtp_additional_properties addprops    = (mtp_additional_properties) read_long(env);
+               int nparams          = (int)      read_long(env);
+               int nresults         = (int)      read_long(env);
+               int variadicity;
 
-                       case tpo_class:
-                               if(typenr == (long) IR_SEGMENT_GLOBAL)
-                                       type = get_glob_type();
-                               else
-                                       type = new_type_class(id);
-                               set_type_size_bytes(type, size);
-                               break;
+               type = new_type_method(nparams, nresults);
 
-                       case tpo_method:
-                       {
-                               unsigned callingconv = (unsigned) read_long(env);
-                               unsigned addprops    = (unsigned) read_long(env);
-                               int nparams          = (int)      read_long(env);
-                               int nresults         = (int)      read_long(env);
-                               int variaindex;
-
-                               type = new_type_method(id, nparams, nresults);
-
-                               for (i = 0; i < nparams; i++) {
-                                       long     typenr = read_long(env);
-                                       ir_type *paramtype = get_type(env, typenr);
-
-                                       set_method_param_type(type, i, paramtype);
-                               }
-                               for (i = 0; i < nresults; i++) {
-                                       long typenr = read_long(env);
-                                       ir_type *restype = get_type(env, typenr);
-
-                                       set_method_res_type(type, i, restype);
-                               }
-
-                               variaindex = (int) read_long(env);
-                               if (variaindex != -1) {
-                                       set_method_variadicity(type, variadicity_variadic);
-                                       if (variaindex != nparams)
-                                               set_method_first_variadic_param_index(type, variaindex);
-                               }
-
-                               set_method_calling_convention(type, callingconv);
-                               set_method_additional_properties(type, addprops);
-                               break;
-                       }
+               for (i = 0; i < nparams; i++) {
+                       long     typenr = read_long(env);
+                       ir_type *paramtype = get_type(env, typenr);
 
-                       case tpo_pointer:
-                       {
-                               ir_mode *mode = read_mode(env);
-                               ir_type *pointsto = get_type(env, read_long(env));
-                               type = new_type_pointer(id, pointsto, mode);
-                               break;
-                       }
+                       set_method_param_type(type, i, paramtype);
+               }
+               for (i = 0; i < nresults; i++) {
+                       long typenr = read_long(env);
+                       ir_type *restype = get_type(env, typenr);
 
-                       case tpo_primitive:
-                       {
-                               ir_mode *mode = read_mode(env);
-                               type = new_type_primitive(id, mode);
-                               break;
-                       }
+                       set_method_res_type(type, i, restype);
+               }
 
-                       case tpo_struct:
-                               if(typenr < (long) IR_SEGMENT_COUNT)
-                                       type = get_segment_type((ir_segment_t) typenr);
-                               else
-                                       type = new_type_struct(id);
-                               set_type_size_bytes(type, size);
-                               break;
+               variadicity = (int) read_long(env);
+               set_method_variadicity(type, variadicity);
 
-                       case tpo_union:
-                               type = new_type_union(id);
-                               set_type_size_bytes(type, size);
-                               break;
+               set_method_calling_convention(type, callingconv);
+               set_method_additional_properties(type, addprops);
+               break;
+       }
 
-                       case tpo_unknown:
-                               return;   /* ignore unknown type */
+       case tpo_pointer: {
+               ir_mode *mode     = read_mode(env);
+               ir_type *pointsto = get_type(env, read_long(env));
+               type = new_type_pointer(pointsto);
+               set_type_mode(type, mode);
+               break;
+       }
 
-                       default:
-                               if (typenr != 0)  /* ignore global type */
-                                       printf("Unknown type kind: \"%s\" in line %i:%i\n", tpop, env->line, env->col);
-                               skip_to(env, '\n');
-                               return;
-               }
-               kindstr = "type";
+       case tpo_primitive: {
+               ir_mode *mode = read_mode(env);
+               type = new_type_primitive(mode);
+               break;
+       }
+
+       case tpo_struct: {
+               ident *id = read_ident_null(env);
+               type = new_type_struct(id);
+               set_type_size_bytes(type, size);
+               break;
+       }
+
+       case tpo_union: {
+               ident *id = read_ident_null(env);
+               type = new_type_union(id);
+               set_type_size_bytes(type, size);
+               break;
+       }
+
+       case tpo_unknown:
+               return;   /* ignore unknown type */
+
+       default:
+               parse_error(env, "unknown type kind: \"%d\"\n", tpop);
+               skip_to(env, '\n');
+               return;
        }
 
        set_type_alignment_bytes(type, align);
-       set_type_visibility(type, vis);
+       type->flags = flags;
 
        if (state == layout_fixed)
                ARR_APP1(ir_type *, env->fixedtypes, type);
 
        set_id(env, typenr, type);
-       printf("Insert %s %s %ld\n", kindstr, name, typenr);
 }
 
 /** Reads an entity description and remembers it by its id. */
 static void import_entity(io_env_t *env)
 {
-       char          buf[1024], buf2[1024];
-       long          entnr       = read_long(env);
-       const char   *name        = read_qstr_to(env, buf, sizeof(buf));
-       const char   *ld_name     = read_qstr_to(env, buf2, sizeof(buf2));
-       long          typenr      = read_long(env);
-       long          ownertypenr = read_long(env);
+       long           entnr      = read_long(env);
+       ident         *name       = read_ident(env);
+       ident         *ld_name    = read_ident_null(env);
+       ir_visibility  visibility = ir_visibility_default;
+       ir_linkage     linkage    = IR_LINKAGE_DEFAULT;
+       long           typenr;
+       long           ownertypenr;
+       const char    *str;
+       ir_type       *type;
+       ir_type       *ownertype;
+       ir_entity     *entity;
+
+       skip_ws(env);
+       while (!isdigit(env->c)) {
+               char     *str = read_word(env);
+               unsigned  v;
+
+               skip_ws(env);
+
+               v = symbol(str, tt_visibility);
+               if (v != SYMERROR) {
+                       visibility = (ir_visibility)v;
+                       continue;
+               }
+               v = symbol(str, tt_linkage);
+               if (v != SYMERROR) {
+                       linkage |= (ir_linkage)v;
+                       continue;
+               }
+               printf("Parser error, expected visibility or linkage, got '%s'\n",
+                      str);
+               break;
+       }
+
+       typenr      = read_long(env);
+       ownertypenr = read_long(env);
 
-       ir_type   *type      = get_type(env, typenr);
-       ir_type   *ownertype = !ownertypenr ? get_glob_type() : get_type(env, ownertypenr);
-       ir_entity *entity    = new_entity(ownertype, new_id_from_str(name), type);
+       type      = get_type(env, typenr);
+       ownertype = !ownertypenr ? get_glob_type() : get_type(env, ownertypenr);
+       entity    = new_entity(ownertype, name, type);
 
-       if (*ld_name)
-               set_entity_ld_ident(entity, new_id_from_str(ld_name));
-       set_entity_offset     (entity, (int) read_long(env));
+       if (ld_name != NULL)
+               set_entity_ld_ident(entity, ld_name);
+       set_entity_offset(entity, (int) read_long(env));
        set_entity_offset_bits_remainder(entity, (unsigned char) read_long(env));
        set_entity_compiler_generated(entity, (int) read_long(env));
-       set_entity_allocation (entity, read_allocation(env));
-       set_entity_visibility (entity, read_visibility(env));
-       set_entity_variability(entity, read_variability(env));
-       set_entity_peculiarity(entity, read_peculiarity(env));
-       set_entity_volatility (entity, read_volatility(env));
-
-       if (get_entity_variability(entity) != variability_uninitialized &&
-           get_entity_visibility(entity) != visibility_external_allocated)
-       {
-               if (is_compound_entity(entity)) {
-                       if (!strcmp(read_str_to(env, buf2, sizeof(buf2)), "initializer")) {
-                               set_entity_initializer(entity, read_initializer(env));
-                       } else {
-                               int i, n = (int) read_long(env);
-                               for (i = 0; i < n; i++) {
-                                       ir_entity *member = get_entity(env, read_long(env));
-                                       ir_node   *irn    = get_node_or_dummy(env, read_long(env));
-                                       add_compound_ent_value(entity, irn, member);
-                               }
-                       }
-               } else {
-                       ir_node *irn = get_node_or_dummy(env, read_long(env));
-                       set_atomic_ent_value(entity, irn);
+       set_entity_volatility(entity, read_volatility(env));
+       set_entity_visibility(entity, visibility);
+       set_entity_linkage(entity, linkage);
+
+       str = read_word(env);
+       if (strcmp(str, "initializer") == 0) {
+               set_entity_initializer(entity, read_initializer(env));
+       } else if (strcmp(str, "compoundgraph") == 0) {
+               int n = (int) read_long(env);
+               int i;
+               for (i = 0; i < n; i++) {
+                       ir_entity *member = get_entity(env, read_long(env));
+                       ir_node   *irn    = get_node_or_dummy(env, read_long(env));
+                       add_compound_ent_value(entity, irn, member);
                }
+       } else if (strcmp(str, "none") == 0) {
+               /* do nothing */
+       } else {
+               parse_error(env, "expected 'initializer', 'compoundgraph' or 'none' got '%s'\n", str);
+               exit(1);
        }
 
        set_id(env, entnr, entity);
-       printf("Insert entity %s %ld\n", name, entnr);
 }
 
 /** Parses the whole type graph. */
 static int parse_typegraph(io_env_t *env)
 {
-       const char *kind;
+       ir_graph *old_irg = env->irg;
        keyword_t kwkind;
-       lex_state_t oldstate;
 
        EXPECT('{');
 
-       save_lex_state(env, &oldstate);
-
-       current_ir_graph = get_const_code_irg();
+       env->irg = get_const_code_irg();
 
        /* parse all types first */
-       while (1) {
-               kind = read_str(env);
-               if (kind[0] == '}' && kind[1] == '\0')
+       while (true) {
+               skip_ws(env);
+               if (env->c == '}') {
+                       read_c(env);
                        break;
-
-               kwkind = (keyword_t) symbol(kind, tt_keyword);
-               switch (kwkind)
-               {
-                       case kw_type:
-                       case kw_frametype:
-                       case kw_valuetype:
-                               import_type(env, kwkind);
-                               break;
-
-                       default:
-                               skip_to(env, '\n');
-                               break;
                }
-       }
 
-       /* now parse rest */
-       restore_lex_state(env, &oldstate);
-
-       while (1) {
-               kind = read_str(env);
-               if (kind[0] == '}' && kind[1] == '\0')
+               kwkind = (keyword_t) read_enum(env, tt_keyword);
+               switch (kwkind) {
+               case kw_type:
+                       import_type(env);
                        break;
 
-               switch (symbol(kind, tt_keyword))
-               {
-                       case kw_type:
-                       case kw_frametype:
-                       case kw_valuetype:
-                               skip_to(env, '\n');
-                               break;
-
-                       case kw_entity:
-                               import_entity(env);
-                               break;
+               case kw_entity:
+                       import_entity(env);
+                       break;
 
-                       default:
-                               printf("Type graph element not supported yet: \"%s\"\n", kind);
-                               skip_to(env, '\n');
-                               break;
+               default:
+                       parse_error(env, "type graph element not supported yet: %d\n", kwkind);
+                       skip_to(env, '\n');
+                       break;
                }
        }
+       env->irg = old_irg;
        return 1;
 }
 
-static int read_node_header(io_env_t *env, long *nodenr, long **preds, const char **nodename)
+static int read_node_header(io_env_t *env, long *nodenr, ir_node ***preds,
+                            const char **nodename)
 {
        int numpreds;
-       *nodename = read_str(env);
-       if ((*nodename)[0] == '}' && !(*nodename)[1]) return -1;  /* end-of-graph */
 
-       *nodenr = read_long(env);
+       *nodename = read_word(env);
+       *nodenr   = read_long(env);
 
-       ARR_RESIZE(ir_node *, *preds, 0);
+       ARR_RESIZE(ir_node*, *preds, 0);
 
-       EXPECT('[');
-       for (numpreds = 0; !feof(env->file); numpreds++) {
-               char *endptr;
-               ARR_APP1(long, *preds, read_long2(env, &endptr));
-               if (*endptr == ']') break;
+       expect_list_begin(env);
+       for (numpreds = 0; list_has_next(env); numpreds++) {
+               long     val  = read_long(env);
+               ir_node *pred = get_node_or_dummy(env, val);
+               ARR_APP1(ir_node*, *preds, pred);
        }
+
        return numpreds;
 }
 
+static ir_node *read_ASM(io_env_t *env, int numpreds, ir_node **preds)
+{
+       ir_node *newnode;
+       ir_asm_constraint *input_constraints  = NEW_ARR_F(ir_asm_constraint, 0);
+       ir_asm_constraint *output_constraints = NEW_ARR_F(ir_asm_constraint, 0);
+       ident            **clobbers           = NEW_ARR_F(ident*, 0);
+
+       ident *asm_text = read_ident(env);
+
+       expect_list_begin(env);
+       while (list_has_next(env)) {
+               ir_asm_constraint constraint;
+               constraint.pos        = read_unsigned(env);
+               constraint.constraint = read_ident(env);
+               constraint.mode       = read_mode(env);
+               ARR_APP1(ir_asm_constraint, input_constraints, constraint);
+       }
+
+       expect_list_begin(env);
+       while (list_has_next(env)) {
+               ir_asm_constraint constraint;
+               constraint.pos        = read_unsigned(env);
+               constraint.constraint = read_ident(env);
+               constraint.mode       = read_mode(env);
+               ARR_APP1(ir_asm_constraint, output_constraints, constraint);
+       }
+
+       expect_list_begin(env);
+       while (list_has_next(env)) {
+               ident *clobber = read_ident(env);
+               ARR_APP1(ident*, clobbers, clobber);
+       }
+
+       assert(ARR_LEN(input_constraints) == (size_t)numpreds-1);
+
+       newnode = new_r_ASM(preds[0], numpreds-1, preds+1,
+                       input_constraints,
+                       ARR_LEN(output_constraints),
+                       output_constraints,
+                       ARR_LEN(clobbers),
+                       clobbers,
+                       asm_text);
+       DEL_ARR_F(clobbers);
+       DEL_ARR_F(output_constraints);
+       DEL_ARR_F(input_constraints);
+       return newnode;
+}
+
 /** Parses an IRG. */
 static int parse_graph(io_env_t *env, ir_graph *irg)
 {
-       long       *preds = NEW_ARR_F(long, 16);
-       ir_node   **prednodes = NEW_ARR_F(ir_node *, 16);
+       ir_node   **preds = NEW_ARR_F(ir_node*,0);
        int         i, numpreds, ret = 1;
        long        nodenr;
        const char *nodename;
        ir_node    *node, *newnode;
 
-       current_ir_graph = irg;
+       env->irg = irg;
 
        EXPECT('{');
 
-       while (1) {
-               numpreds = read_node_header(env, &nodenr, &preds, &nodename);
-               if (numpreds == -1) break;  /* end-of-graph */
-               if (!numpreds) {
-                       printf("Node %s %ld is missing predecessors!", nodename, nodenr);
-                       ret = 0;
+       while (true) {
+               skip_ws(env);
+               if (env->c == '}') {
+                       read_c(env);
                        break;
                }
 
-               ARR_RESIZE(ir_node *, prednodes, numpreds);
-               for (i = 0; i < numpreds - 1; i++)
-                       prednodes[i] = get_node_or_dummy(env, preds[i + 1]);
+               numpreds = read_node_header(env, &nodenr, &preds, &nodename);
 
                node = get_node_or_null(env, nodenr);
                newnode = NULL;
 
                EXPECT('{');
 
-               switch (symbol(nodename, tt_iro))
-               {
-                       case iro_End:
-                       {
-                               ir_node *newendblock = get_node(env, preds[0]);
-                               newnode = get_irg_end(current_ir_graph);
-                               exchange(get_nodes_block(newnode), newendblock);
-                               for (i = 0; i < numpreds - 1; i++)
-                                       add_irn_n(newnode, prednodes[i]);
-                               break;
-                       }
+               switch (symbol(nodename, tt_iro)) {
+               case iro_End: {
+                       ir_node *newendblock = preds[0];
+                       newnode = get_irg_end(irg);
+                       exchange(get_nodes_block(newnode), newendblock);
+                       for (i = 1; i < numpreds; i++)
+                               add_irn_n(newnode, preds[i]);
+                       break;
+               }
 
-                       case iro_Start:
-                       {
-                               ir_node *newstartblock = get_node(env, preds[0]);
-                               newnode = get_irg_start(current_ir_graph);
-                               exchange(get_nodes_block(newnode), newstartblock);
-                               break;
-                       }
+               case iro_Start: {
+                       ir_node *newstartblock = preds[0];
+                       newnode = get_irg_start(irg);
+                       exchange(get_nodes_block(newnode), newstartblock);
+                       break;
+               }
 
-                       case iro_Block:
-                       {
-                               if (preds[0] != nodenr) {
-                                       printf("Invalid block: preds[0] != nodenr (%ld != %ld)\n",
-                                               preds[0], nodenr);
-                                       ret = 0;
-                                       goto endloop;
-                               }
+               case iro_Block:
+                       newnode = new_r_Block(irg, numpreds, preds);
+                       break;
 
-                               newnode = new_Block(numpreds - 1, prednodes);
-                               break;
-                       }
+               case iro_Anchor:
+                       newnode = irg->anchor;
+                       for (i = 1; i < numpreds; i++)
+                               set_irn_n(newnode, i-1, preds[i]);
+                       set_nodes_block(newnode, preds[0]);
+                       break;
 
-                       case iro_Anchor:
-                               newnode = current_ir_graph->anchor;
-                               for (i = 0; i < numpreds - 1; i++)
-                                       set_irn_n(newnode, i, prednodes[i]);
-                               set_irn_n(newnode, -1, get_node(env, preds[0]));
-                               break;
+               case iro_SymConst: {
+                       long entnr = read_long(env);
+                       union symconst_symbol sym;
+                       sym.entity_p = get_entity(env, entnr);
+                       newnode = new_r_SymConst(irg, mode_P, sym, symconst_addr_ent);
+                       break;
+               }
 
-                       case iro_SymConst:
-                       {
-                               long entnr = read_long(env);
-                               union symconst_symbol sym;
-                               sym.entity_p = get_entity(env, entnr);
-                               newnode = new_SymConst(mode_P, sym, symconst_addr_ent);
-                               break;
-                       }
+               case iro_Proj: {
+                       ir_mode *mode = read_mode(env);
+                       long     pn   = read_long(env);
+                       newnode = new_r_Proj(preds[1], mode, pn);
+                       /* explicitely set block, since preds[1] might be a dummy node
+                        * which is always in the startblock */
+                       set_nodes_block(newnode, preds[0]);
+                       break;
+               }
 
-                       #include "gen_irio_import.inl"
+               case iro_ASM:
+                       newnode = read_ASM(env, numpreds, preds);
+                       break;
 
-                       default:
-                               goto notsupported;
+               #include "gen_irio_import.inl"
+
+               default:
+                       goto notsupported;
                }
 
                EXPECT('}');
 
                if (!newnode) {
 notsupported:
-                       panic("Node type not supported yet: %s in line %i:%i\n", nodename, env->line, env->col);
+                       parse_error(env, "node type not supported yet: %s\n", nodename);
+                       abort();
                }
 
                if (node)
                        exchange(node, newnode);
                /* Always update hash entry to avoid more uses of id nodes */
                set_id(env, nodenr, newnode);
-               /* printf("Insert %s %ld\n", nodename, nodenr); */
        }
 
-endloop:
        DEL_ARR_F(preds);
-       DEL_ARR_F(prednodes);
 
        return ret;
 }
 
 static int parse_modes(io_env_t *env)
 {
-       const char *kind;
-       keyword_t kwkind;
-
        EXPECT('{');
 
-       while (1) {
-               kind = read_str(env);
-               if (kind[0] == '}' && kind[1] == '\0')
+       while (true) {
+               keyword_t kwkind;
+
+               skip_ws(env);
+               if (env->c == '}') {
+                       read_c(env);
                        break;
+               }
 
-               kwkind = (keyword_t) symbol(kind, tt_keyword);
-               switch (kwkind)
-               {
-                       case kw_mode:
-                       {
-                               const char *name = read_qstr(env);
-                               ir_mode_sort sort = (ir_mode_sort) read_long(env);
-                               int size = read_long(env);
-                               int sign = read_long(env);
-                               ir_mode_arithmetic arith = read_mode_arithmetic(env);
-                               unsigned modulo_shift = read_long(env);
-                               int vector_elems = read_long(env);
-                               if (vector_elems != 1) {
-                                       panic("no support for import of vector modes yes");
-                               }
-
-                               ir_mode *mode = new_ir_mode(name, sort, size, sign, arith, modulo_shift);
-
-                               if (mode_is_reference(mode))
-                               {
-                                       set_reference_mode_signed_eq(mode, read_mode(env));
-                                       set_reference_mode_unsigned_eq(mode, read_mode(env));
-                               }
-                               break;
+               kwkind = (keyword_t) read_enum(env, tt_keyword);
+               switch (kwkind) {
+               case kw_mode: {
+                       const char *name = read_string(env);
+                       ir_mode_sort sort = (ir_mode_sort)read_enum(env, tt_mode_sort);
+                       int size = read_long(env);
+                       int sign = read_long(env);
+                       ir_mode_arithmetic arith = read_mode_arithmetic(env);
+                       unsigned modulo_shift = read_long(env);
+                       int vector_elems = read_long(env);
+                       ir_mode *mode;
+
+                       if (vector_elems != 1) {
+                               panic("no support for import of vector modes yes");
                        }
 
-                       default:
-                               skip_to(env, '\n');
-                               break;
+                       mode = new_ir_mode(name, sort, size, sign, arith, modulo_shift);
+                       if (mode_is_reference(mode)) {
+                               set_reference_mode_signed_eq(mode, read_mode(env));
+                               set_reference_mode_unsigned_eq(mode, read_mode(env));
+                       }
+                       break;
+               }
+
+               default:
+                       skip_to(env, '\n');
+                       break;
+               }
+       }
+       return 1;
+}
+
+static int parse_program(io_env_t *env)
+{
+       EXPECT('{');
+
+       while (true) {
+               keyword_t kwkind;
+
+               skip_ws(env);
+               if (env->c == '}') {
+                       read_c(env);
+                       break;
+               }
+
+               kwkind = (keyword_t) read_enum(env, tt_keyword);
+               switch (kwkind) {
+               case kw_segment_type: {
+                       ir_segment_t  segment = (ir_segment_t) read_enum(env, tt_segment);
+                       ir_type      *type    = read_type(env);
+                       set_segment_type(segment, type);
+                       break;
+               }
+               default:
+                       parse_error(env, "unexpected keyword %d\n", kwkind);
+                       skip_to(env, '\n');
                }
        }
        return 1;
 }
 
-/** Imports an previously exported textual representation of an (maybe partial) irp */
 void ir_import(const char *filename)
+{
+       FILE *file = fopen(filename, "rt");
+       if (file == NULL) {
+               perror(filename);
+               exit(1);
+       }
+
+       ir_import_file(file, filename);
+
+       fclose(file);
+}
+
+void ir_import_file(FILE *input, const char *inputname)
 {
        int oldoptimize = get_optimize();
        firm_verification_t oldver = get_node_verification_mode();
        io_env_t ioenv;
        io_env_t *env = &ioenv;
-       int i, n;
+       size_t i, n;
 
        symtbl_init();
 
        memset(env, 0, sizeof(*env));
-       env->idset = new_set(id_cmp, 128);
+       obstack_init(&env->obst);
+       env->idset      = new_set(id_cmp, 128);
        env->fixedtypes = NEW_ARR_F(ir_type *, 0);
+       env->inputname  = inputname;
+       env->file       = input;
+       env->line       = 1;
 
-       env->file = fopen(filename, "rt");
-       if (!env->file) {
-               perror(filename);
-               exit(1);
-       }
+       /* read first character */
+       read_c(env);
 
        set_optimize(0);
        do_node_verification(FIRM_VERIFICATION_OFF);
 
-       while (1) {
-               const char *str = read_str(env);
-               if (!*str) break;
-               switch (symbol(str, tt_keyword))
+       while (true) {
+               keyword_t kw;
+
+               skip_ws(env);
+               if (env->c == EOF)
+                       break;
+
+               kw = (keyword_t)read_enum(env, tt_keyword);
+               switch (kw) {
+               case kw_modes:
+                       if (!parse_modes(env)) goto end;
+                       break;
+
+               case kw_typegraph:
+                       if (!parse_typegraph(env)) goto end;
+                       break;
+
+               case kw_irg:
                {
-                       case kw_modes:
-                               if (!parse_modes(env)) goto end;
-                               break;
+                       ir_entity *irgent = get_entity(env, read_long(env));
+                       long valuetypeid;
+                       ir_graph *irg = new_ir_graph(irgent, 0);
+                       set_irg_frame_type(irg, get_type(env, read_long(env)));
+                       valuetypeid = read_long(env);
+                       if (valuetypeid != -1)
+                               set_method_value_param_type(get_entity_type(irgent),
+                                               get_type(env, valuetypeid));
+
+                       if (!parse_graph(env, irg)) goto end;
+                       break;
+               }
 
-                       case kw_typegraph:
-                               if (!parse_typegraph(env)) goto end;
-                               break;
+               case kw_constirg: {
+                       ir_graph *constirg = get_const_code_irg();
+                       long bodyblockid = read_long(env);
+                       set_id(env, bodyblockid, constirg->current_block);
+                       if (!parse_graph(env, constirg)) goto end;
+                       break;
+               }
 
-                       case kw_irg:
-                       {
-                               ir_entity *irgent = get_entity(env, read_long(env));
-                               long valuetypeid;
-                               ir_graph *irg = new_ir_graph(irgent, 0);
-                               set_irg_frame_type(irg, get_type(env, read_long(env)));
-                               valuetypeid = read_long(env);
-                               if (valuetypeid != -1)
-                                       set_method_value_param_type(get_entity_type(irgent),
-                                                       get_type(env, valuetypeid));
-
-                               if (!parse_graph(env, irg)) goto end;
-                               break;
-                       }
+               case kw_program:
+                       parse_program(env);
+                       break;
 
-                       case kw_constirg:
-                       {
-                               ir_graph *constirg = get_const_code_irg();
-                               long bodyblockid = read_long(env);
-                               set_id(env, bodyblockid, constirg->current_block);
-                               if (!parse_graph(env, constirg)) goto end;
-                               break;
-                       }
+               default: {
+                       parse_error(env, "Unexpected keyword %d at toplevel\n", kw);
+                       exit(1);
+               }
                }
        }
 
@@ -1580,5 +1941,5 @@ end:
        do_node_verification(oldver);
        set_optimize(oldoptimize);
 
-       fclose(env->file);
+       obstack_free(&env->obst, NULL);
 }