Let matrix_foreach(), matrix_foreach_in_col() and matrix_foreach_in_row() declare...

[libfirm] / ir / ir / irio.c

diff --git a/ir/ir/irio.c b/ir/ir/irio.c
index ea90cad..ceb1917 100644 (file)
--- a/ir/ir/irio.c
+++ b/ir/ir/irio.c
@@ -177,7 +177,7 @@ parse_error(read_env_t *env, const char *fmt, ...)
        env->read_errors = true;
 
        /* let's hope firm doesn't die on further errors */
-       do_node_verification(0);
+       do_node_verification(FIRM_VERIFICATION_OFF);
 
        va_start(ap, fmt);
        vfprintf(stderr, fmt, ap);
@@ -199,7 +199,7 @@ static void symtbl_init(void)
        key.str = (s);                                               \
        key.typetag = (tt);                                          \
        key.code = (cod);                                            \
-       set_insert(symtbl, &key, sizeof(key), hash_str(s) + tt * 17)
+       (void)set_insert(symbol_t, symtbl, &key, sizeof(key), hash_str(s) + tt * 17)
 
 #define INSERTENUM(tt, e) INSERT(tt, #e, e)
 #define INSERTKEYWORD(k) INSERT(tt_keyword, #k, kw_##k)
@@ -360,7 +360,7 @@ static unsigned symbol(const char *str, typetag_t typetag)
        key.str = str;
        key.typetag = typetag;
 
-       entry = (symbol_t*)set_find(symtbl, &key, sizeof(key), hash_str(str) + typetag * 17);
+       entry = set_find(symbol_t, symtbl, &key, sizeof(key), hash_str(str) + typetag * 17);
        return entry ? entry->code : SYMERROR;
 }
 
@@ -819,9 +819,6 @@ static void write_entity(write_env_t *env, ir_entity *ent)
                if (ent->initializer != NULL) {
                        write_symbol(env, "initializer");
                        write_initializer(env, get_entity_initializer(ent));
-               } else if (entity_has_compound_ent_values(ent)) {
-                       /* compound graph API is deprecated */
-                       panic("exporting compound_graph initializers not supported");
                } else {
                        write_symbol(env, "none");
                }
@@ -1457,7 +1454,7 @@ static void *get_id(read_env_t *env, long id)
        id_entry key, *entry;
        key.id = id;
 
-       entry = (id_entry*)set_find(env->idset, &key, sizeof(key), (unsigned) id);
+       entry = set_find(id_entry, env->idset, &key, sizeof(key), (unsigned) id);
        return entry ? entry->elem : NULL;
 }
 
@@ -1466,7 +1463,7 @@ static void set_id(read_env_t *env, long id, void *elem)
        id_entry key;
        key.id = id;
        key.elem = elem;
-       set_insert(env->idset, &key, sizeof(key), (unsigned) id);
+       (void)set_insert(id_entry, env->idset, &key, sizeof(key), (unsigned) id);
 }
 
 static ir_node *get_node_or_null(read_env_t *env, long nodenr)
@@ -1807,7 +1804,7 @@ static void read_type(read_env_t *env)
                size_t nparams  = read_size_t(env);
                size_t nresults = read_size_t(env);
                size_t i;
-               int    variadicity;
+               ir_variadicity variadicity;
 
                type = new_type_method(nparams, nresults);
 
@@ -1824,7 +1821,7 @@ static void read_type(read_env_t *env)
                        set_method_res_type(type, i, restype);
                }
 
-               variadicity = (int) read_long(env);
+               variadicity = (ir_variadicity) read_long(env);
                set_method_variadicity(type, variadicity);
 
                set_method_calling_convention(type, callingconv);
@@ -1970,10 +1967,10 @@ static void read_entity(read_env_t *env, ir_entity_kind kind)
                ir_label_t nr = get_irp_next_label_nr();
                entity = new_label_entity(nr);
                break;
+       }
        case IR_ENTITY_UNKNOWN:
                panic("read_entity with IR_ENTITY_UNKNOWN?");
        }
-       }
 
        set_entity_compiler_generated(entity, compiler_generated);
        set_entity_volatility(entity, volatility);
@@ -2127,7 +2124,7 @@ static ir_node *read_ASM(read_env_t *env)
        pin_state = read_pin_state(env);
 
        n_in = read_preds(env);
-       in   = obstack_finish(&env->preds_obst);
+       in   = (ir_node**)obstack_finish(&env->preds_obst);
 
        if (ARR_LEN(input_constraints) != (size_t)n_in) {
                parse_error(env, "input_constraints != n_in in ir file");
@@ -2190,20 +2187,20 @@ static ir_node *read_Anchor(read_env_t *env)
        return res;
 }
 
-typedef ir_node* (*read_node_func)(read_env_t *env);
+typedef ir_node* read_node_func(read_env_t *env);
 static pmap *node_readers;
 
-static void register_node_reader(ident *ident, read_node_func func)
+static void register_node_reader(ident *ident, read_node_func* func)
 {
-       pmap_insert(node_readers, ident, func);
+       pmap_insert(node_readers, ident, (void*)func);
 }
 
 static ir_node *read_node(read_env_t *env)
 {
-       ident         *id   = read_symbol(env);
-       read_node_func func = pmap_get(node_readers, id);
-       long           nr   = read_long(env);
-       ir_node       *res;
+       ident          *id   = read_symbol(env);
+       read_node_func *func = pmap_get(read_node_func, node_readers, id);
+       long            nr   = read_long(env);
+       ir_node        *res;
        if (func == NULL) {
                parse_error(env, "Unknown nodetype '%s'", get_id_str(id));
                skip_to(env, '\n');