Fixed some 64bit warnings because of mixing size_t and other types.

[libfirm] / ir / ir / irgraph.c

diff --git a/ir/ir/irgraph.c b/ir/ir/irgraph.c
index 047be4c..3e066fe 100644 (file)
--- a/ir/ir/irgraph.c
+++ b/ir/ir/irgraph.c
@@ -111,10 +111,10 @@ static ir_graph *alloc_graph(void)
  */
 static void free_graph(ir_graph *irg)
 {
-       char *ptr = (char *)irg;
-       int  i;
+       char           *ptr = (char *)irg;
+       ir_edge_kind_t  i;
 
-       for (i = 0; i < EDGE_KIND_LAST; ++i)
+       for (i = EDGE_KIND_FIRST; i < EDGE_KIND_LAST; ++i)
                edges_deactivate_kind(irg, i);
        DEL_ARR_F(irg->idx_irn_map);
        free(ptr - additional_graph_data_size);
@@ -217,10 +217,9 @@ ir_graph *new_r_ir_graph(ir_entity *ent, int n_loc)
 
        start_block = new_r_Block_noopt(res, 0, NULL);
        set_irg_start_block(res, start_block);
-       bad = new_ir_node(NULL, res, start_block, op_Bad, mode_T, 0, NULL);
-       bad->attr.irg.irg = res;
+       bad = new_r_Bad(res);
        set_irg_bad        (res, bad);
-       set_irg_no_mem     (res, new_ir_node(NULL, res, start_block, op_NoMem, mode_M, 0, NULL));
+       set_irg_no_mem     (res, new_r_NoMem(res));
        start = new_r_Start(res);
        set_irg_start      (res, start);
 
@@ -307,10 +306,9 @@ ir_graph *new_const_code_irg(void)
        /* -- The start block -- */
        start_block = new_r_Block_noopt(res, 0, NULL);
        set_irg_start_block(res, start_block);
-       bad = new_ir_node(NULL, res, start_block, op_Bad, mode_T, 0, NULL);
-       bad->attr.irg.irg = res;
+       bad = new_r_Bad(res);
        set_irg_bad(res, bad);
-       no_mem = new_ir_node(NULL, res, start_block, op_NoMem, mode_M, 0, NULL);
+       no_mem = new_r_NoMem(res);
        set_irg_no_mem(res, no_mem);
        start = new_r_Start(res);
        set_irg_start(res, start);
@@ -343,7 +341,7 @@ ir_graph *new_const_code_irg(void)
  */
 static void copy_all_nodes(ir_node *node, void *env)
 {
-       ir_graph *irg      = env;
+       ir_graph *irg      = (ir_graph*)env;
        ir_node  *new_node = irn_copy_into_irg(node, irg);
 
        set_irn_link(node, new_node);
@@ -355,7 +353,7 @@ static void copy_all_nodes(ir_node *node, void *env)
 
                if (is_frame_type(tp)) {
                        /* replace by the copied entity */
-                       ent = get_entity_link(ent);
+                       ent = (ir_entity*)get_entity_link(ent);
 
                        assert(is_entity(ent));
                        assert(get_entity_owner(ent) == get_irg_frame_type(irg));
@@ -777,19 +775,19 @@ void (set_irg_inline_property)(ir_graph *irg, irg_inline_property s)
        _set_irg_inline_property(irg, s);
 }
 
-unsigned (get_irg_additional_properties)(const ir_graph *irg)
+mtp_additional_properties (get_irg_additional_properties)(const ir_graph *irg)
 {
        return _get_irg_additional_properties(irg);
 }
 
-void (set_irg_additional_properties)(ir_graph *irg, unsigned property_mask)
+void (set_irg_additional_properties)(ir_graph *irg, mtp_additional_properties property_mask)
 {
        _set_irg_additional_properties(irg, property_mask);
 }
 
-void (set_irg_additional_property)(ir_graph *irg, mtp_additional_property flag)
+void (add_irg_additional_properties)(ir_graph *irg, mtp_additional_properties flag)
 {
-       _set_irg_additional_property(irg, flag);
+       _add_irg_additional_properties(irg, flag);
 }
 
 void (set_irg_link)(ir_graph *irg, void *thing)