revivie max_irg_visited

[libfirm] / ir / ir / irgraph.c

diff --git a/ir/ir/irgraph.c b/ir/ir/irgraph.c
index df317c7..af159cf 100644 (file)
--- a/ir/ir/irgraph.c
+++ b/ir/ir/irgraph.c
@@ -178,7 +178,7 @@ void irg_set_nloc(ir_graph *res, int n_loc) {
 ir_graph *new_r_ir_graph(ir_entity *ent, int n_loc) {
        ir_graph *res;
        ir_node  *first_block;
-       ir_node  *end, *start, *start_block, *initial_mem, *projX;
+       ir_node  *end, *start, *start_block, *initial_mem, *projX, *bad;
 
        res = alloc_graph();
 
@@ -205,8 +205,8 @@ ir_graph *new_r_ir_graph(ir_entity *ent, int n_loc) {
 
        res->last_node_idx = 0;
 
-       res->value_table = new_identities (); /* value table for global value
-                                                numbering for optimizing use in iropt.c */
+       res->value_table = new_identities(); /* value table for global value
+                                               numbering for optimizing use in iropt.c */
        res->outs = NULL;
 
        res->inline_property       = irg_inline_any;
@@ -232,7 +232,7 @@ ir_graph *new_r_ir_graph(ir_entity *ent, int n_loc) {
        set_entity_irg(ent, res);
 
        /*--  a class type so that it can contain "inner" methods as in Pascal. --*/
-       res->frame_type = new_type_frame(id_mangle(get_entity_ident(ent), frame_type_suffix));
+       res->frame_type = new_type_frame();
 
        /* the Anchor node must be created first */
        res->anchor = new_Anchor(res);
@@ -248,7 +248,9 @@ ir_graph *new_r_ir_graph(ir_entity *ent, int n_loc) {
        start_block = new_immBlock();
        set_cur_block(start_block);
        set_irg_start_block(res, start_block);
-       set_irg_bad        (res, new_ir_node(NULL, res, start_block, op_Bad, mode_T, 0, NULL));
+       bad = new_ir_node(NULL, res, start_block, op_Bad, mode_T, 0, NULL);
+       bad->attr.irg.irg = res;
+       set_irg_bad        (res, bad);
        set_irg_no_mem     (res, new_ir_node(NULL, res, start_block, op_NoMem, mode_M, 0, NULL));
        start = new_Start();
        set_irg_start      (res, start);
@@ -262,7 +264,6 @@ ir_graph *new_r_ir_graph(ir_entity *ent, int n_loc) {
        initial_mem             = new_Proj(start, mode_M, pn_Start_M);
        set_irg_initial_mem(res, initial_mem);
 
-       add_immBlock_pred(start_block, projX);
        set_store(initial_mem);
 
        res->index       = get_irp_new_irg_idx();
@@ -270,11 +271,6 @@ ir_graph *new_r_ir_graph(ir_entity *ent, int n_loc) {
        res->graph_nr    = get_irp_new_node_nr();
 #endif
 
-       /*
-        * The code generation needs it. leave it in now.
-        * Use of this edge is matter of discussion, unresolved. Also possible:
-        * add_immBlock_pred(res->start_block, res->start_block), but invalid typed.
-        */
        mature_immBlock(res->current_block);
 
        /*-- Make a block to start with --*/
@@ -349,6 +345,7 @@ ir_graph *new_const_code_irg(void)
        set_cur_block(start_block);
        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;
        set_irg_bad(res, bad);
        no_mem = new_ir_node(NULL, res, start_block, op_NoMem, mode_M, 0, NULL);
        set_irg_no_mem(res, no_mem);
@@ -358,7 +355,6 @@ ir_graph *new_const_code_irg(void)
        /* Proj results of start node */
        set_irg_initial_mem(res, new_Proj(start, mode_M, pn_Start_M));
        projX = new_Proj(start, mode_X, pn_Start_X_initial_exec);
-       add_immBlock_pred(start_block, projX);
        mature_immBlock(start_block);
 
        body_block = new_immBlock();
@@ -407,9 +403,10 @@ static void copy_all_nodes(ir_node *n, void *env) {
        new_backedge_info(nn);
        set_irn_link(n, nn);
 
-       /* fix the irg for blocks */
+       /* fix the irg for Blocks: as Bad nodes are NOT copied, no
+          need t fix them */
        if (is_Block(nn))
-               nn->attr.block.irg = irg;
+               nn->attr.block.irg.irg = irg;
 
        /* fix access to entities on the stack frame */
        if (is_Sel(nn)) {
@@ -530,7 +527,8 @@ ir_graph *create_irg_copy(ir_graph *irg) {
    inefficient search, call remove_irp_irg by hand).
    Does not free types, entities or modes that are used only by this
    graph, nor the entity standing for this graph. */
-void free_ir_graph(ir_graph *irg) {
+void free_ir_graph(ir_graph *irg)
+{
        assert(is_ir_graph(irg));
 
        edges_deactivate(irg);
@@ -543,10 +541,7 @@ void free_ir_graph(ir_graph *irg) {
        if (irg->value_table)
                del_identities(irg->value_table);
        if (irg->ent) {
-               ir_peculiarity pec = get_entity_peculiarity (irg->ent);
-               set_entity_peculiarity (irg->ent, peculiarity_description);
                set_entity_irg(irg->ent, NULL);  /* not set in const code irg */
-               set_entity_peculiarity (irg->ent, pec);
        }
 
        free_End(get_irg_end(irg));
@@ -928,49 +923,37 @@ ir_visited_t
        return _get_irg_visited(irg);
 }
 
-#ifdef INTERPROCEDURAL_VIEW
 /** maximum visited flag content of all ir_graph visited fields. */
 static ir_visited_t max_irg_visited = 0;
-#endif /* INTERPROCEDURAL_VIEW */
 
-void
-set_irg_visited(ir_graph *irg, ir_visited_t visited) {
+void set_irg_visited(ir_graph *irg, ir_visited_t visited)
+{
        irg->visited = visited;
-#ifdef INTERPROCEDURAL_VIEW
        if (irg->visited > max_irg_visited) {
                max_irg_visited = irg->visited;
        }
-#endif /* INTERPROCEDURAL_VIEW */
 }
 
-void
-inc_irg_visited(ir_graph *irg) {
-#ifdef INTERPROCEDURAL_VIEW
-       if (++irg->visited > max_irg_visited) {
+void inc_irg_visited(ir_graph *irg)
+{
+       ++irg->visited;
+       if (irg->visited > max_irg_visited) {
                max_irg_visited = irg->visited;
        }
-#else
-       ++irg->visited;
-#endif /* INTERPROCEDURAL_VIEW */
 }
 
-#ifdef INTERPROCEDURAL_VIEW
-ir_visited_t
-get_max_irg_visited(void) {
-#ifndef NDEBUG
-       int i;
-       for(i = 0; i < get_irp_n_irgs(); i++)
-               assert(max_irg_visited >= get_irg_visited(get_irp_irg(i)));
-#endif
+ir_visited_t get_max_irg_visited(void)
+{
        return max_irg_visited;
 }
 
-void set_max_irg_visited(int val) {
+void set_max_irg_visited(int val)
+{
        max_irg_visited = val;
 }
 
-ir_visited_t
-inc_max_irg_visited(void) {
+ir_visited_t inc_max_irg_visited(void)
+{
 #ifndef NDEBUG
        int i;
        for(i = 0; i < get_irp_n_irgs(); i++)
@@ -978,7 +961,6 @@ inc_max_irg_visited(void) {
 #endif
        return ++max_irg_visited;
 }
-#endif /* INTERPROCEDURAL_VIEW */
 
 ir_visited_t
 (get_irg_block_visited)(const ir_graph *irg) {
@@ -1080,3 +1062,18 @@ size_t register_additional_graph_data(size_t size) {
 
        return additional_graph_data_size += size;
 }
+
+void (set_irg_state)(ir_graph *irg, ir_graph_state_t state)
+{
+       _set_irg_state(irg, state);
+}
+
+void (clear_irg_state)(ir_graph *irg, ir_graph_state_t state)
+{
+       _clear_irg_state(irg, state);
+}
+
+int (is_irg_state)(const ir_graph *irg, ir_graph_state_t state)
+{
+       return _is_irg_state(irg, state);
+}