X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firdump.c;h=d0cec7806aea84141191575b85105629f87cb8c6;hb=b4647d67ab7885d5da32c2a30242fbc4ed93d81b;hp=595645a0bdb70ec1b3767319f3e77fe80140f7aa;hpb=d7337be4ef7938bf403e919f71844215a56e10b2;p=libfirm

diff --git a/ir/ir/irdump.c b/ir/ir/irdump.c
index 595645a0b..d0cec7806 100644
--- a/ir/ir/irdump.c
+++ b/ir/ir/irdump.c
@@ -56,7 +56,7 @@
 #include "irtools.h"
 #include "irprintf.h"
 
-#include "irvrfy.h"
+#include "irverify.h"
 
 #include "error.h"
 #include "array.h"
@@ -602,7 +602,7 @@ static ir_node **construct_block_lists(ir_graph *irg)
 	return ird_get_irg_link(irg);
 }
 
-typedef struct _list_tuple {
+typedef struct list_tuple {
 	ir_node **blk_list;
 	ir_extblk **extbb_list;
 } list_tuple;
@@ -795,12 +795,12 @@ static int dump_node_typeinfo(FILE *F, ir_node *n)
 	return bad;
 }
 
-typedef struct _pns_lookup {
+typedef struct pns_lookup {
 	long       nr;      /**< the proj number */
 	const char *name;   /**< the name of the Proj */
 } pns_lookup_t;
 
-typedef struct _proj_lookup {
+typedef struct proj_lookup {
 	ir_opcode          code;      /**< the opcode of the Proj predecessor */
 	unsigned           num_data;  /**< number of data entries */
 	const pns_lookup_t *data;     /**< the data */
@@ -1319,7 +1319,7 @@ static void dump_node(FILE *F, ir_node *n)
 	fputs("\"", F);
 
 	fputs(" label: \"", F);
-	bad = ! irn_vrfy_irg_dump(n, current_ir_graph, &p);
+	bad = ! irn_verify_irg_dump(n, current_ir_graph, &p);
 	dump_node_label(F, n);
 	dump_node_ana_vals(F, n);
 	//dump_node_ana_info(F, n);
@@ -1344,7 +1344,7 @@ static void dump_node(FILE *F, ir_node *n)
 static void dump_ir_block_edge(FILE *F, ir_node *n)
 {
 	if (get_opt_dump_const_local() && is_constlike_node(n)) return;
-	if (is_no_Block(n)) {
+	if (!is_Block(n)) {
 		ir_node *block = get_nodes_block(n);
 
 		if (get_opt_dump_const_local() && is_constlike_node(block)) {
@@ -1492,16 +1492,6 @@ static void dump_ir_data_edges(FILE *F, ir_node *n)
 		print_edge_vcgattr(F, n, i);
 		fprintf(F, "}\n");
 	}
-
-	if ((flags & ir_dump_flag_macroblock_edges) && is_Block(n)) {
-		ir_node *mb = get_Block_MacroBlock(n);
-		fprintf(F, "edge: {sourcename: \"");
-		PRINT_NODEID(n);
-		fprintf(F, "\" targetname: \"");
-		PRINT_NODEID(mb);
-		fprintf(F, "\" label: \"mb\" " MACROBLOCK_EDGE_ATTR);
-		fprintf(F, "}\n");
-	}
 }
 
 /**
@@ -1843,7 +1833,7 @@ static void dump_enum_item(FILE *F, ir_type *tp, int pos)
 	char buf[1024];
 	ir_enum_const *ec = get_enumeration_const(tp, pos);
 	ident         *id = get_enumeration_const_nameid(ec);
-	tarval        *tv = get_enumeration_value(ec);
+	ir_tarval     *tv = get_enumeration_value(ec);
 
 	if (tv)
 		tarval_snprintf(buf, sizeof(buf), tv);
@@ -2262,7 +2252,7 @@ static void dump_blocks_extbb_grouped(FILE *F, ir_graph *irg)
 	int        i;
 	ir_entity *ent = get_irg_entity(irg);
 
-	if (get_irg_extblk_state(irg) != extblk_valid)
+	if (get_irg_extblk_state(irg) != ir_extblk_info_valid)
 		compute_extbb(irg);
 
 	construct_extblock_lists(irg);