Introduce flip-flopping normalisations

[libfirm] / ir / ir / irio.c

diff --git a/ir/ir/irio.c b/ir/ir/irio.c
index a0c2f30..c1b6e9d 100644 (file)
--- a/ir/ir/irio.c
+++ b/ir/ir/irio.c
@@ -396,17 +396,8 @@ static void write_tarval(io_env_t *env, ir_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);
 }
@@ -472,17 +463,8 @@ 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);
 }
@@ -600,7 +582,7 @@ static void export_type_post(io_env_t *env, ir_type *tp)
                        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, "%zu ", get_method_first_variadic_param_index(tp));
+               ir_fprintf(f, "%u ", get_method_variadicity(tp));
                break;
        }
 
@@ -1430,7 +1412,7 @@ static void import_type(io_env_t *env)
                mtp_additional_properties addprops    = (mtp_additional_properties) read_long(env);
                int nparams          = (int)      read_long(env);
                int nresults         = (int)      read_long(env);
-               int variaindex;
+               int variadicity;
 
                type = new_type_method(nparams, nresults);
 
@@ -1447,12 +1429,8 @@ static void import_type(io_env_t *env)
                        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);
-               }
+               variadicity = (int) read_long(env);
+               set_method_variadicity(type, variadicity);
 
                set_method_calling_convention(type, callingconv);
                set_method_additional_properties(type, addprops);