X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firdump.c;h=bd179872e769805e65f1f481336a620f4b530fae;hb=ea68f3f7a13e0b7742bfaa643e109302bc023e9c;hp=311af7b73db60e2072a9501d9bf72446468c739a;hpb=931937086a29c0ab082a79bc064c7932ac5ae98f;p=libfirm

diff --git a/ir/ir/irdump.c b/ir/ir/irdump.c
index 311af7b73..bd179872e 100644
--- a/ir/ir/irdump.c
+++ b/ir/ir/irdump.c
@@ -674,11 +674,6 @@ void dump_node_opcode(FILE *F, const ir_node *n)
 		fprintf(F, "%s%s", get_irn_opname(n),
 			(flags & ir_dump_flag_show_marks) ? (get_Block_mark(n) ? "*" : "") : "");
 		break;
-	case iro_Conv:
-		if (get_Conv_strict(n))
-			fprintf(F, "strict");
-		fprintf(F, "%s", get_irn_opname(n));
-		break;
 	case iro_Div:
 		fprintf(F, "%s", get_irn_opname(n));
 		if (get_Div_no_remainder(n))
@@ -1139,7 +1134,7 @@ static void print_data_edge_vcgattr(FILE *F, const ir_node *from, int to)
 	 * do not use get_nodes_block() here, will fail
 	 * if the irg is not pinned.
 	 */
-	if (get_irn_n(from, -1) == get_irn_n(get_irn_n(from, to), -1))
+	if (get_nodes_block(from) == get_nodes_block(get_irn_n(from, to)))
 		fprintf(F, INTRA_DATA_EDGE_ATTR);
 	else
 		fprintf(F, INTER_DATA_EDGE_ATTR);
@@ -1151,7 +1146,7 @@ static void print_mem_edge_vcgattr(FILE *F, const ir_node *from, int to)
 	 * do not use get_nodes_block() here, will fail
 	 * if the irg is not pinned.
 	 */
-	if (get_irn_n(from, -1) == get_irn_n(get_irn_n(from, to), -1))
+	if (get_nodes_block(from) == get_nodes_block(get_irn_n(from, to)))
 		fprintf(F, INTRA_MEM_EDGE_ATTR);
 	else
 		fprintf(F, INTER_MEM_EDGE_ATTR);
@@ -1262,9 +1257,8 @@ static void dump_ir_data_edges(FILE *F, const ir_node *n)
  */
 static void dump_ir_edges(ir_node *node, void *env)
 {
-	int              i = 0;
-	FILE            *F = (FILE*)env;
-	const ir_edge_t *edge;
+	int   i = 0;
+	FILE *F = (FILE*)env;
 
 	foreach_out_edge(node, edge) {
 		ir_node *succ = get_edge_src_irn(edge);
@@ -1335,7 +1329,6 @@ static void dump_const_expression(FILE *F, ir_node *value)
 static void dump_whole_block(FILE *F, const ir_node *block)
 {
 	ir_node *node;
-	ird_color_t color = ird_color_block_background;
 
 	assert(is_Block(block));
 
@@ -1344,11 +1337,11 @@ static void dump_whole_block(FILE *F, const ir_node *block)
 	fprintf(F, " label: \"");
 	dump_node_label(F, block);
 
-	/* colorize blocks */
-	if (! get_Block_matured(block))
-		color = ird_color_block_background;
-
 	fprintf(F, "\" status:clustered ");
+	/* colorize blocks */
+	ird_color_t const color =
+		!get_Block_matured(block) ? ird_color_error :
+		ird_color_block_background;
 	print_vcg_color(F, color);
 	fprintf(F, "\n");
 
@@ -2202,7 +2195,6 @@ static void dump_loops_standalone(FILE *F, ir_loop *loop)
 		        (unsigned long) first,
 		        (unsigned long) first,
 		        (unsigned long) i-1);
-		loop_node_started = false;
 	}
 }
 
@@ -2285,7 +2277,6 @@ void dump_loop(FILE *F, ir_loop *l)
 {
 	pset *loopnodes = pset_new_ptr_default();
 	pset *extnodes  = pset_new_ptr_default();
-	ir_node *n, *b;
 	char name[50];
 
 	snprintf(name, sizeof(name), "loop_%ld", get_loop_loop_nr(l));
@@ -2296,28 +2287,28 @@ void dump_loop(FILE *F, ir_loop *l)
 	collect_nodeloop_external_nodes(l, loopnodes, extnodes);
 
 	/* build block lists */
-	foreach_pset(loopnodes, ir_node*, n) {
+	foreach_pset(loopnodes, ir_node, n) {
 		set_irn_link(n, NULL);
 	}
-	foreach_pset(extnodes, ir_node*, n) {
+	foreach_pset(extnodes, ir_node, n) {
 		set_irn_link(n, NULL);
 	}
-	foreach_pset(loopnodes, ir_node*, n) {
+	foreach_pset(loopnodes, ir_node, n) {
 		if (!is_Block(n)) {
-			b = get_nodes_block(n);
+			ir_node *const b = get_nodes_block(n);
 			set_irn_link(n, get_irn_link(b));
 			set_irn_link(b, n);
 		}
 	}
-	foreach_pset(extnodes, ir_node*, n) {
+	foreach_pset(extnodes, ir_node, n) {
 		if (!is_Block(n)) {
-			b = get_nodes_block(n);
+			ir_node *const b = get_nodes_block(n);
 			set_irn_link(n, get_irn_link(b));
 			set_irn_link(b, n);
 		}
 	}
 
-	foreach_pset(loopnodes, ir_node*, b) {
+	foreach_pset(loopnodes, ir_node, b) {
 		if (is_Block(b)) {
 			fprintf(F, "graph: { title: ");
 			print_nodeid(F, b);
@@ -2330,7 +2321,7 @@ void dump_loop(FILE *F, ir_loop *l)
 			dump_ir_data_edges(F, b);
 
 			/* dump the nodes that go into the block */
-			for (n = (ir_node*)get_irn_link(b); n; n = (ir_node*)get_irn_link(n)) {
+			for (ir_node *n = (ir_node*)get_irn_link(b); n; n = (ir_node*)get_irn_link(n)) {
 				if (pset_find_ptr(extnodes, n))
 					overrule_nodecolor = ird_color_block_inout;
 				dump_node(F, n);
@@ -2344,7 +2335,7 @@ void dump_loop(FILE *F, ir_loop *l)
 			fprintf(F, "\n");
 		}
 	}
-	foreach_pset(extnodes, ir_node*, b) {
+	foreach_pset(extnodes, ir_node, b) {
 		if (is_Block(b)) {
 			fprintf(F, "graph: { title: ");
 			print_nodeid(F, b);
@@ -2354,7 +2345,7 @@ void dump_loop(FILE *F, ir_loop *l)
 			fprintf(F, "\" status:clustered color:lightblue\n");
 
 			/* dump the nodes that go into the block */
-			for (n = (ir_node*)get_irn_link(b); n; n = (ir_node*)get_irn_link(n)) {
+			for (ir_node *n = (ir_node*)get_irn_link(b); n; n = (ir_node*)get_irn_link(n)) {
 				if (!pset_find_ptr(loopnodes, n))
 					overrule_nodecolor = ird_color_block_inout;
 				dump_node(F, n);