X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firdump.c;h=f27bb1d7b006d2b2a982319c7849ae92409bb08a;hb=eb47aca33f2f8c414409f3695e73277b47442334;hp=71289d0edd1fe515d9e9c8679e74d1b0a77c34dd;hpb=0df5e0ea5d4d6a566339ac4b93a73719858e81e1;p=libfirm

diff --git a/ir/ir/irdump.c b/ir/ir/irdump.c
index 71289d0ed..f27bb1d7b 100644
--- a/ir/ir/irdump.c
+++ b/ir/ir/irdump.c
@@ -700,8 +700,6 @@ void dump_node_opcode(FILE *F, ir_node *n)
 		fprintf(F, "%s", get_irn_opname(n));
 		break;
 	case iro_Block:
-		if (is_Block_dead(n))
-			fputs("Dead ", F);
 		if (n == get_irg_start_block(get_irn_irg(n)))
 			fputs("Start ", F);
 		if (n == get_irg_end_block(get_irn_irg(n)))
@@ -1098,10 +1096,7 @@ static void dump_node_vcgattr(FILE *F, ir_node *node, ir_node *local, int bad)
 		print_vcg_color(F, ird_color_error);
 		break;
 	case iro_Block:
-		if (is_Block_dead(n))
-			print_vcg_color(F, ird_color_dead_block_background);
-		else
-			print_vcg_color(F, ird_color_block_background);
+		print_vcg_color(F, ird_color_block_background);
 		break;
 	case iro_Phi:
 		print_vcg_color(F, ird_color_phi);
@@ -1191,8 +1186,7 @@ static void dump_const_node_local(FILE *F, ir_node *n)
 
 	for (i = 0; i < get_irn_arity(n); i++) {
 		ir_node *con = get_irn_n(n, i);
-		if (is_constlike_node(con) && !irn_visited(con)) {
-			mark_irn_visited(con);
+		if (is_constlike_node(con) && !irn_visited_else_mark(con)) {
 			/* Generate a new name for the node by appending the names of
 			n and const. */
 			fprintf(F, "node: {title: "); PRINT_CONSTID(n, con);
@@ -1560,8 +1554,6 @@ static void dump_whole_block(FILE *F, ir_node *block)
 	/* colorize blocks */
 	if (! get_Block_matured(block))
 		color = ird_color_block_background;
-	if (is_Block_dead(block))
-		color = ird_color_dead_block_background;
 
 	fprintf(F, "\" status:clustered ");
 	print_vcg_color(F, color);
@@ -1768,11 +1760,11 @@ void dump_type_node(FILE *F, ir_type *tp)
 {
 	fprintf(F, "node: {title: ");
 	PRINT_TYPEID(tp);
-	fprintf(F, " label: \"%s ", get_type_tpop_name(tp));
+	fprintf(F, " label: \"");
 	if (tp->dbi != NULL) {
-		char buf[256];
+		char buf[1024];
 		ir_print_type(buf, sizeof(buf), tp);
-		fprintf(F, "'%s'", buf);
+		fprintf(F, "%s '%s'", get_type_tpop_name(tp), buf);
 	} else {
 		ir_fprintf(F, "%+F", tp);
 	}
@@ -1829,7 +1821,9 @@ static void dump_entity_initializer(FILE *F, const ir_entity *ent)
 	(void) ent;
 }
 
-/** Dumps a type or entity and its edges. */
+/**
+ * type-walker: Dumps a type or entity and its edges.
+ */
 static void dump_type_info(type_or_ent tore, void *env)
 {
 	FILE *F = (FILE*)env;
@@ -1922,8 +1916,8 @@ static void dump_type_info(type_or_ent tore, void *env)
 				 --i;
 				upper = get_array_upper_bound(tp, i);
 				lower = get_array_lower_bound(tp, i);
-				print_node_type_edge(F, upper, tp, "label: \"upper %d\"", get_array_order(tp, i));
-				print_node_type_edge(F, lower, tp, "label: \"lower %d\"", get_array_order(tp, i));
+				print_node_type_edge(F, upper, tp, "label: \"upper %zu\"", get_array_order(tp, i));
+				print_node_type_edge(F, lower, tp, "label: \"lower %zu\"", get_array_order(tp, i));
 				dump_const_expression(F, upper);
 				dump_const_expression(F, lower);
 			}