improve firm profiler (based on patch by Steven Schäfer)

[libfirm] / ir / ir / irgraph.c

diff --git a/ir/ir/irgraph.c b/ir/ir/irgraph.c
index 456b102..ba6e16e 100644 (file)
--- a/ir/ir/irgraph.c
+++ b/ir/ir/irgraph.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2011 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -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);
@@ -142,7 +142,7 @@ void irg_set_nloc(ir_graph *res, int n_loc)
 }
 
 /* Allocates a list of nodes:
-    - The start block containing a start node and Proj nodes for it's four
+    - The start block containing a start node and Proj nodes for its four
       results (X, M, P, Tuple).
     - The end block containing an end node. This block is not matured after
       new_ir_graph as predecessors need to be added to it.
@@ -227,7 +227,6 @@ ir_graph *new_r_ir_graph(ir_entity *ent, int n_loc)
        projX                   = new_r_Proj(start, mode_X, pn_Start_X_initial_exec);
        set_irg_initial_exec    (res, projX);
        set_irg_frame           (res, new_r_Proj(start, mode_P_data, pn_Start_P_frame_base));
-       set_irg_tls             (res, new_r_Proj(start, mode_P_data, pn_Start_P_tls));
        set_irg_args            (res, new_r_Proj(start, mode_T,      pn_Start_T_args));
        initial_mem             = new_r_Proj(start, mode_M, pn_Start_M);
        set_irg_initial_mem(res, initial_mem);
@@ -341,7 +340,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);
@@ -353,7 +352,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));
@@ -495,7 +494,7 @@ long get_irg_graph_nr(const ir_graph *irg)
 }
 #endif
 
-int get_irg_idx(const ir_graph *irg)
+size_t get_irg_idx(const ir_graph *irg)
 {
        return irg->index;
 }
@@ -565,16 +564,6 @@ void (set_irg_frame)(ir_graph *irg, ir_node *node)
        _set_irg_frame(irg, node);
 }
 
-ir_node *(get_irg_tls)(const ir_graph *irg)
-{
-       return _get_irg_tls(irg);
-}
-
-void (set_irg_tls)(ir_graph *irg, ir_node *node)
-{
-       _set_irg_tls(irg, node);
-}
-
 ir_node *(get_irg_initial_mem)(const ir_graph *irg)
 {
        return _get_irg_initial_mem(irg);
@@ -742,8 +731,8 @@ void (set_irg_loopinfo_inconsistent)(ir_graph *irg)
 
 void set_irp_loopinfo_inconsistent(void)
 {
-       int i;
-       for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
+       size_t i, n;
+       for (i = 0, n = get_irp_n_irgs(); i < n; ++i) {
                set_irg_loopinfo_inconsistent(get_irp_irg(i));
        }
 }
@@ -775,19 +764,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)
@@ -837,7 +826,7 @@ void set_max_irg_visited(int val)
 ir_visited_t inc_max_irg_visited(void)
 {
 #ifndef NDEBUG
-       int i;
+       size_t i;
        for (i = 0; i < get_irp_n_irgs(); i++)
                assert(max_irg_visited >= get_irg_visited(get_irp_irg(i)));
 #endif