Use new scope instead of empty statement.
[libfirm] / ir / ir / irdumptxt.c
index 90236a9..1736d39 100644 (file)
@@ -1,20 +1,6 @@
 /*
- * Copyright (C) 1995-2011 University of Karlsruhe.  All right reserved.
- *
  * This file is part of libFirm.
- *
- * This file may be distributed and/or modified under the terms of the
- * GNU General Public License version 2 as published by the Free Software
- * Foundation and appearing in the file LICENSE.GPL included in the
- * packaging of this file.
- *
- * Licensees holding valid libFirm Professional Edition licenses may use
- * this file in accordance with the libFirm Commercial License.
- * Agreement provided with the Software.
- *
- * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
- * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE.
+ * Copyright (C) 2012 University of Karlsruhe.
  */
 
 /**
@@ -56,8 +42,7 @@ ir_dump_verbosity_t ir_get_dump_verbosity(void)
        return verbosity;
 }
 
-/* Write the irnode and all its attributes to the file passed. */
-void dump_irnode_to_file(FILE *F, ir_node *n)
+void dump_irnode_to_file(FILE *F, const ir_node *n)
 {
        char     comma;
        ir_graph *irg;
@@ -77,8 +62,9 @@ void dump_irnode_to_file(FILE *F, ir_node *n)
        if (get_irn_pinned(n) == op_pin_state_floats &&
                get_irg_pinned(get_irn_irg(n)) == op_pin_state_floats) {
                fprintf(F, "  node was pinned in ");
-               dump_node_opcode(F, get_irn_n(n, -1));
-               fprintf(F, " %ld\n", get_irn_node_nr(get_irn_n(n, -1)));
+               ir_node *const block = get_nodes_block(n);
+               dump_node_opcode(F, block);
+               fprintf(F, " %ld\n", get_irn_node_nr(block));
        }
 
        fprintf(F, "  arity:   %d\n", get_irn_arity(n));
@@ -86,8 +72,9 @@ void dump_irnode_to_file(FILE *F, ir_node *n)
        fprintf(F, "  pred nodes:\n");
        if (!is_Block(n)) {
                fprintf(F, "    -1:    ");
-               dump_node_opcode(F, get_irn_n(n, -1));
-               fprintf(F, " %ld\n", get_irn_node_nr(get_irn_n(n, -1)));
+               ir_node *const block = get_nodes_block(n);
+               dump_node_opcode(F, block);
+               fprintf(F, " %ld\n", get_irn_node_nr(block));
        }
 
        {
@@ -131,7 +118,7 @@ void dump_irnode_to_file(FILE *F, ir_node *n)
        }
 
        /* This is not nice, output it as a marker in the predecessor list. */
-       if (is_Block(n) || get_irn_op(n) == op_Phi) {
+       if (is_Block(n) || is_Phi(n)) {
            int i;
                fprintf(F, "  backedges:");
                comma = ' ';
@@ -141,7 +128,7 @@ void dump_irnode_to_file(FILE *F, ir_node *n)
        }
 
        /* Loop node.   Someone else please tell me what's wrong ... */
-       if (is_irg_state(irg, IR_GRAPH_STATE_CONSISTENT_LOOPINFO)) {
+       if (irg_has_properties(irg, IR_GRAPH_PROPERTY_CONSISTENT_LOOPINFO)) {
                ir_loop *loop = get_irn_loop(n);
                if (loop != NULL) {
                        fprintf(F, "  in loop %ld with depth %u\n",
@@ -152,16 +139,17 @@ void dump_irnode_to_file(FILE *F, ir_node *n)
        /* Source types */
        switch (get_irn_opcode(n)) {
        case iro_Block: {
-               if (get_Block_entity(n) != NULL)
-                       fprintf(F, "  Label: %lu\n", get_entity_label(get_Block_entity(n)));
+               ir_entity *const entity = get_Block_entity(n);
+               if (entity != NULL)
+                       fprintf(F, "  Label: %lu\n", get_entity_label(entity));
                fprintf(F, "  block visited: %lu\n", get_Block_block_visited(n));
                fprintf(F, "  block marked: %u\n", get_Block_mark(n));
-               if (is_irg_state(get_irn_irg(n), IR_GRAPH_STATE_CONSISTENT_DOMINANCE)) {
+               if (irg_has_properties(get_irn_irg(n), IR_GRAPH_PROPERTY_CONSISTENT_DOMINANCE)) {
                        fprintf(F, "  dom depth %d\n", get_Block_dom_depth(n));
                        fprintf(F, "  domtree pre num %u\n", get_Block_dom_tree_pre_num(n));
                        fprintf(F, "  max subtree pre num %u\n", get_Block_dom_max_subtree_pre_num(n));
                }
-               if (is_irg_state(get_irn_irg(n), IR_GRAPH_STATE_CONSISTENT_POSTDOMINANCE)) {
+               if (irg_has_properties(get_irn_irg(n), IR_GRAPH_PROPERTY_CONSISTENT_POSTDOMINANCE)) {
                        fprintf(F, "  pdom depth %d\n", get_Block_postdom_depth(n));
                        fprintf(F, "  pdomtree pre num %u\n", get_Block_pdom_tree_pre_num(n));
                        fprintf(F, "  max pdomsubtree pre num %u\n", get_Block_pdom_max_subtree_pre_num(n));
@@ -219,9 +207,6 @@ void dump_irnode_to_file(FILE *F, ir_node *n)
                        }
                }
        } break;
-       case iro_Cast: {
-               ir_fprintf(F, "  cast to type: %+F\n", get_Cast_type(n));
-       } break;
        case iro_Cmp: {
                ir_relation relation = get_Cmp_relation(n);
                ir_fprintf(F, "  relation: %s\n", get_relation_string(relation));
@@ -247,11 +232,6 @@ void dump_irnode_to_file(FILE *F, ir_node *n)
                        fprintf(F, "  entity: ");
                        dump_entity_to_file(F, get_SymConst_entity(n));
                        break;
-               case symconst_type_tag:
-                       fprintf(F, "  kind: type_tag\n");
-                       fprintf(F, "  type: ");
-                       dump_type_to_file(F, get_SymConst_type(n));
-                       break;
                case symconst_type_size:
                        fprintf(F, "  kind: size\n");
                        fprintf(F, "  type: ");
@@ -269,7 +249,7 @@ void dump_irnode_to_file(FILE *F, ir_node *n)
                }
        } break;
        case iro_Load:
-               fprintf(F, "  mode of loaded value: %s\n", get_mode_name_ex(get_Load_mode(n), NULL));
+               fprintf(F, "  mode of loaded value: %s\n", get_mode_name_ex(get_Load_mode(n)));
                fprintf(F, "  volatility: %s\n", get_volatility_name(get_Load_volatility(n)));
                fprintf(F, "  align: %s\n", get_align_name(get_Load_unaligned(n)));
                break;
@@ -281,39 +261,32 @@ void dump_irnode_to_file(FILE *F, ir_node *n)
                fprintf(F, "  compare operation: %s\n", get_relation_string(get_Confirm_relation(n)));
                break;
        case iro_ASM: {
-               const ir_asm_constraint *cons;
-               ident **clobber;
-               int l;
-
                fprintf(F, "  assembler text: %s", get_id_str(get_ASM_text(n)));
-               l = get_ASM_n_input_constraints(n);
-               if (l > 0) {
-                       int i;
-                       fprintf(F, "\n  inputs:  ");
-                       cons = get_ASM_input_constraints(n);
-                       for (i = 0; i < l; ++i)
-                               fprintf(F, "%%%u %s ", cons[i].pos, get_id_str(cons[i].constraint));
+               fprintf(F, "\n  inputs:  ");
+               const ir_asm_constraint *in_cons = get_ASM_input_constraints(n);
+               int n_inputs = get_ASM_n_inputs(n);
+               for (int i = 0; i < n_inputs; ++i) {
+                       fprintf(F, "%%%u %s ", in_cons[i].pos,
+                               get_id_str(in_cons[i].constraint));
                }
-               l = get_ASM_n_output_constraints(n);
-               if (l > 0) {
-                       int i;
-                       fprintf(F, "\n  outputs: ");
-                       cons = get_ASM_output_constraints(n);
-                       for (i = 0; i < l; ++i)
-                               fprintf(F, "%%%u %s ", cons[i].pos, get_id_str(cons[i].constraint));
-               }
-               l = get_ASM_n_clobbers(n);
-               if (l > 0) {
-                       int i;
-                       fprintf(F, "\n  clobber: ");
-                       clobber = get_ASM_clobbers(n);
-                       for (i = 0; i < l; ++i)
-                               fprintf(F, "%s ", get_id_str(clobber[i]));
+               fprintf(F, "\n  outputs: ");
+               const ir_asm_constraint *out_cons = get_ASM_output_constraints(n);
+               int n_outputs = get_ASM_n_output_constraints(n);
+               for (int i = 0; i < n_outputs; ++i) {
+                       fprintf(F, "%%%u %s ", out_cons[i].pos,
+                               get_id_str(out_cons[i].constraint));
                }
+
+               fprintf(F, "\n  clobber: ");
+               ident **clobber = get_ASM_clobbers(n);
+               int n_clobbers = get_ASM_n_clobbers(n);
+               for (int i = 0; i < n_clobbers; ++i)
+                       fprintf(F, "%s ", get_id_str(clobber[i]));
                if (get_irn_pinned(n) != op_pin_state_floats)
                        fprintf(F, "\n  volatile");
                fprintf(F, "\n");
-       } break;
+               break;
+       }
 
        default:
                break;
@@ -321,7 +294,7 @@ void dump_irnode_to_file(FILE *F, ir_node *n)
 
        if (get_irg_typeinfo_state(get_irn_irg(n)) == ir_typeinfo_consistent  ||
                get_irg_typeinfo_state(get_irn_irg(n)) == ir_typeinfo_inconsistent  )
-               if (get_irn_typeinfo_type(n) != firm_none_type)
+               if (get_irn_typeinfo_type(n) != get_none_type())
                        ir_fprintf (F, "  Analysed type: %s\n", get_irn_typeinfo_type(n));
 }
 
@@ -349,9 +322,13 @@ static bool is_init_string(ir_initializer_t const* const init, ir_type *const ty
        n = get_initializer_compound_n_entries(init);
        for (i = 0; i != n; ++i) {
                ir_initializer_t const* const val = get_initializer_compound_value(init, i);
-               ir_tarval*              const tv  = get_initializer_tarval_value(val);
+               ir_tarval*                    tv;
                long                          v;
 
+               if (get_initializer_kind(val) != IR_INITIALIZER_TARVAL)
+                       return false;
+               tv = get_initializer_tarval_value(val);
+
                if (!tarval_is_constant(tv))
                        return false;
 
@@ -548,26 +525,23 @@ static void dump_entity_to_file_prefix(FILE *F, ir_entity *ent, const char *pref
                        ir_graph *irg = get_entity_irg(ent);
 
                        if (irg) {
-                               fprintf(F, "%s  estimated node count: %u\n", prefix, get_irg_estimated_node_cnt(irg));
                                fprintf(F, "%s  maximum node index:   %u\n", prefix, get_irg_last_idx(irg));
                        }
 
-                       if (mask) {
-                               fprintf(F, "%s  additional prop: ", prefix);
-
-                               if (mask & mtp_property_const)         fputs("const_function, ", F);
-                               if (mask & mtp_property_pure)          fputs("pure_function, ", F);
-                               if (mask & mtp_property_noreturn)      fputs("noreturn_function, ", F);
-                               if (mask & mtp_property_nothrow)       fputs("nothrow_function, ", F);
-                               if (mask & mtp_property_naked)         fputs("naked_function, ", F);
-                               if (mask & mtp_property_malloc)        fputs("malloc_function, ", F);
-                               if (mask & mtp_property_returns_twice) fputs("weak_function, ", F);
-                               if (mask & mtp_property_intrinsic)     fputs("intrinsic_function, ", F);
-                               if (mask & mtp_property_runtime)       fputs("runtime_function, ", F);
-                               if (mask & mtp_property_private)       fputs("private_function, ", F);
-                               if (mask & mtp_property_has_loop)      fputs("has_loop_function, ", F);
-                               fputc('\n', F);
-                       }
+                       fprintf(F, "%s  additional prop: ", prefix);
+                       if (mask & mtp_property_const)         fputs("const_function, ", F);
+                       if (mask & mtp_property_pure)          fputs("pure_function, ", F);
+                       if (mask & mtp_property_noreturn)      fputs("noreturn_function, ", F);
+                       if (mask & mtp_property_nothrow)       fputs("nothrow_function, ", F);
+                       if (mask & mtp_property_naked)         fputs("naked_function, ", F);
+                       if (mask & mtp_property_malloc)        fputs("malloc_function, ", F);
+                       if (mask & mtp_property_returns_twice) fputs("weak_function, ", F);
+                       if (mask & mtp_property_intrinsic)     fputs("intrinsic_function, ", F);
+                       if (mask & mtp_property_runtime)       fputs("runtime_function, ", F);
+                       if (mask & mtp_property_private)       fputs("private_function, ", F);
+                       if (mask & mtp_property_has_loop)      fputs("has_loop_function, ", F);
+                       fputc('\n', F);
+
                        fprintf(F, "%s  calling convention: ", prefix);
                        if (cc & cc_reg_param)           fputs("regparam, ", F);
                        if (cc & cc_this_call)           fputs("thiscall, ", F);
@@ -603,27 +577,6 @@ static void dump_entity_to_file_prefix(FILE *F, ir_entity *ent, const char *pref
                        need_nl = 1;
                        dump_ir_initializers_to_file(F, prefix, initializer, get_entity_type(ent));
                        fputc('\n', F);
-               } else if (entity_has_compound_ent_values(ent)) {
-                       size_t i;
-                       fprintf(F, "%s  compound values:", prefix);
-                       for (i = 0; i < get_compound_ent_n_values(ent); ++i) {
-                               size_t j;
-                               compound_graph_path *path = get_compound_ent_value_path(ent, i);
-                               ir_entity *ent0 = get_compound_graph_path_node(path, 0);
-                               fprintf(F, "\n%s    %3d:%d ", prefix, get_entity_offset(ent0), get_entity_offset_bits_remainder(ent0));
-                               if (get_type_state(type) == layout_fixed)
-                                       fprintf(F, "(%3u:%u) ",   get_compound_ent_value_offset_bytes(ent, i), get_compound_ent_value_offset_bit_remainder(ent, i));
-                               fprintf(F, "%s", get_entity_name(ent));
-                               for (j = 0; j < get_compound_graph_path_length(path); ++j) {
-                                       ir_entity *node = get_compound_graph_path_node(path, j);
-                                       fprintf(F, ".%s", get_entity_name(node));
-                                       if (is_Array_type(get_entity_owner(node)))
-                                               fprintf(F, "[%ld]", get_compound_graph_path_array_index(path, j));
-                               }
-                               fprintf(F, "\t = ");
-                               dump_node_opcode(F, get_compound_ent_value(ent, i));
-                       }
-                       fputc('\n', F);
                }
        }