do not use current_ir_graph in irdump.c

[libfirm] / ir / ir / irio.c

diff --git a/ir/ir/irio.c b/ir/ir/irio.c
index a0dd036..ea90cad 100644 (file)
--- a/ir/ir/irio.c
+++ b/ir/ir/irio.c
@@ -226,7 +226,6 @@ static void symtbl_init(void)
 
        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);
 
        INSERT(tt_throws, "throw",   true);
@@ -324,7 +323,6 @@ 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";
        }
        panic("INVALID_VISIBILITY");
@@ -1074,13 +1072,14 @@ static void write_mode(write_env_t *env, ir_mode *mode)
 
 static void write_modes(write_env_t *env)
 {
-       size_t i, n_modes = get_irp_n_modes();
+       size_t n_modes = ir_get_n_modes();
+       size_t i;
 
        write_symbol(env, "modes");
        fputs("{\n", env->file);
 
        for (i = 0; i < n_modes; i++) {
-               ir_mode *mode = get_irp_mode(i);
+               ir_mode *mode = ir_get_mode(i);
                if (!mode_is_int(mode) && !mode_is_reference(mode)
                    && !mode_is_float(mode)) {
                    /* skip internal modes */
@@ -1548,11 +1547,11 @@ static ir_entity *read_entity_ref(read_env_t *env)
 static ir_mode *read_mode_ref(read_env_t *env)
 {
        char  *str = read_string(env);
-       size_t n   = get_irp_n_modes();
+       size_t n   = ir_get_n_modes();
        size_t i;
 
        for (i = 0; i < n; i++) {
-               ir_mode *mode = get_irp_mode(i);
+               ir_mode *mode = ir_get_mode(i);
                if (strcmp(str, get_mode_name(mode)) == 0) {
                        obstack_free(&env->obst, str);
                        return mode;
@@ -1900,7 +1899,7 @@ static void read_entity(read_env_t *env, ir_entity_kind kind)
        long           entnr      = read_long(env);
        ident         *name       = NULL;
        ident         *ld_name    = NULL;
-       ir_visibility  visibility = ir_visibility_default;
+       ir_visibility  visibility = ir_visibility_external;
        ir_linkage     linkage    = IR_LINKAGE_DEFAULT;
        ir_type       *owner      = NULL;
        ir_entity     *entity     = NULL;
@@ -2290,6 +2289,7 @@ static ir_graph *read_irg(read_env_t *env)
        set_irg_inline_property(irg, prop);
        set_irg_additional_properties(irg, (mtp_additional_properties)props);
        read_graph(env, irg);
+       irg_finalize_cons(irg);
        return irg;
 }