X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firdump.c;h=6fd63ce49b77f2f8bcee2d242c850627ceef0f22;hb=b597c7fd473086ca6374b2abbdf129f595c156d0;hp=dc43becd88ee0be047ce15a0e9340cc93f72484a;hpb=46687ebb95d59afd2b9a234def0ba7859494aef5;p=libfirm diff --git a/ir/ir/irdump.c b/ir/ir/irdump.c index dc43becd8..6fd63ce49 100644 --- a/ir/ir/irdump.c +++ b/ir/ir/irdump.c @@ -642,13 +642,13 @@ static ir_node **construct_block_lists(ir_graph *irg) { #ifdef INTERPROCEDURAL_VIEW int rem_view = get_interprocedural_view(); #endif - int walk_flag = using_irn_visited(irg); + int walk_flag = ir_resources_reserved(irg) & IR_RESOURCE_IRN_VISITED; ir_graph *rem = current_ir_graph; current_ir_graph = irg; if(walk_flag) - clear_using_irn_visited(current_ir_graph); + ir_free_resources(irg, IR_RESOURCE_IRN_VISITED); for (i = get_irp_n_irgs() - 1; i >= 0; --i) ird_set_irg_link(get_irp_irg(i), NULL); @@ -670,7 +670,7 @@ static ir_node **construct_block_lists(ir_graph *irg) { #endif if(walk_flag) - set_using_irn_visited(current_ir_graph); + ir_reserve_resources(irg, IR_RESOURCE_IRN_VISITED); current_ir_graph = rem; return ird_get_irg_link(irg); @@ -2042,15 +2042,15 @@ static void dump_enum_item(FILE *F, ir_type *tp, int pos) /* dumps a type or entity and it's edges. */ static void -dump_type_info(type_or_ent *tore, void *env) { +dump_type_info(type_or_ent tore, void *env) { FILE *F = env; int i = 0; /* to shutup gcc */ /* dump this type or entity */ - switch (get_kind(tore)) { + switch (get_kind(tore.ent)) { case k_entity: { - ir_entity *ent = (ir_entity *)tore; + ir_entity *ent = tore.ent; ir_node *value; /* The node */ dump_entity_node(F, ent, 0); @@ -2092,7 +2092,7 @@ dump_type_info(type_or_ent *tore, void *env) { break; } case k_type: { - ir_type *tp = (ir_type *)tore; + ir_type *tp = tore.typ; dump_type_node(F, tp); /* and now the edges */ switch (get_type_tpop_code(tp)) { @@ -2159,17 +2159,18 @@ typedef struct _h_env { * If env->dump_ent dumps entities of classes and overwrites edges. */ static void -dump_class_hierarchy_node(type_or_ent *tore, void *ctx) { +dump_class_hierarchy_node(type_or_ent tore, void *ctx) { h_env_t *env = ctx; FILE *F = env->f; int i = 0; /* to shutup gcc */ /* dump this type or entity */ - switch (get_kind(tore)) { + switch (get_kind(tore.ent)) { case k_entity: { - ir_entity *ent = (ir_entity *)tore; + ir_entity *ent = tore.ent; if (get_entity_owner(ent) == get_glob_type()) break; - if (!is_Method_type(get_entity_type(ent))) break; /* GL */ + if (!is_Method_type(get_entity_type(ent))) + break; /* GL */ if (env->dump_ent && is_Class_type(get_entity_owner(ent))) { /* The node */ dump_entity_node(F, ent, 0); @@ -2181,8 +2182,9 @@ dump_class_hierarchy_node(type_or_ent *tore, void *ctx) { break; } case k_type: { - ir_type *tp = (ir_type *)tore; - if (tp == get_glob_type()) break; + ir_type *tp = tore.typ; + if (tp == get_glob_type()) + break; switch (get_type_tpop_code(tp)) { case tpo_class: dump_type_node(F, tp);