X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firdump.c;h=f27bb1d7b006d2b2a982319c7849ae92409bb08a;hb=7d070c58e7bef1ed875fac066b57f29de449724b;hp=105a3668afd1744939b33fd029686d775c1bf526;hpb=e3f51845a3d0fc2162e36fba3eea5b17a913fe38;p=libfirm

diff --git a/ir/ir/irdump.c b/ir/ir/irdump.c
index 105a3668a..f27bb1d7b 100644
--- a/ir/ir/irdump.c
+++ b/ir/ir/irdump.c
@@ -404,7 +404,6 @@ static void print_enum_item_edge(FILE *F, const ir_type *tp, size_t item, const
 /* global and ahead declarations                                   */
 /*-----------------------------------------------------------------*/
 
-static void dump_node_with_edges(ir_node *n, void *env);
 static void dump_loop_nodes_into_graph(FILE *F, ir_graph *irg);
 
 /*-----------------------------------------------------------------*/
@@ -540,7 +539,7 @@ static void ird_walk_graph(ir_graph *irg, irg_walk_func *pre, irg_walk_func *pos
 }
 
 /**
- * Walker, allocates an array for all blocks and puts it's nodes non-floating
+ * Walker, allocates an array for all blocks and puts their non-floating
  * nodes into this array.
  */
 static void collect_node(ir_node *node, void *env)
@@ -691,18 +690,16 @@ void dump_node_opcode(FILE *F, ir_node *n)
 	} break;
 
 	case iro_Load:
-		if (get_Load_align(n) == align_non_aligned)
+		if (get_Load_unaligned(n) == align_non_aligned)
 			fprintf(F, "ua");
 		fprintf(F, "%s[%s]", get_irn_opname(n), get_mode_name_ex(get_Load_mode(n), NULL));
 		break;
 	case iro_Store:
-		if (get_Store_align(n) == align_non_aligned)
+		if (get_Store_unaligned(n) == align_non_aligned)
 			fprintf(F, "ua");
 		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)))
@@ -807,8 +804,8 @@ typedef struct proj_lookup {
 static const pns_lookup_t start_lut[] = {
 #define X(a)    { pn_Start_##a, #a }
 	X(X_initial_exec),
+	X(M),
 	X(P_frame_base),
-	X(P_tls),
 	X(T_args),
 #undef X
 };
@@ -828,7 +825,6 @@ static const pns_lookup_t call_lut[] = {
 	X(X_regular),
 	X(X_except),
 	X(T_result),
-	X(P_value_res_base)
 #undef X
 };
 
@@ -1100,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);
@@ -1193,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);
@@ -1370,7 +1362,7 @@ static void print_mem_edge_vcgattr(FILE *F, ir_node *from, int to)
 		fprintf(F, INTER_MEM_EDGE_ATTR);
 }
 
-/** Print the vcg attributes for the edge from node from to it's to's input */
+/** Print the vcg attributes for the edge from node "from" to its "to"th input */
 static void print_edge_vcgattr(FILE *F, ir_node *from, int to)
 {
 	assert(from);
@@ -1562,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);
@@ -1770,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);
 	}
@@ -1831,7 +1821,9 @@ static void dump_entity_initializer(FILE *F, const ir_entity *ent)
 	(void) ent;
 }
 
-/** Dumps a type or entity and it's 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;
@@ -1924,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);
 			}
@@ -2664,7 +2656,7 @@ void dump_loop(FILE *F, ir_loop *l)
 			PRINT_NODEID(b);
 			fprintf(F, "\"  label: \"");
 			dump_node_opcode(F, b);
-			fprintf(F, " %ld:%d", get_irn_node_nr(b), get_irn_idx(b));
+			fprintf(F, " %ld:%u", get_irn_node_nr(b), get_irn_idx(b));
 			fprintf(F, "\" status:clustered color:yellow\n");
 
 			/* dump the blocks edges */
@@ -2691,7 +2683,7 @@ void dump_loop(FILE *F, ir_loop *l)
 			PRINT_NODEID(b);
 			fprintf(F, "\"  label: \"");
 			dump_node_opcode(F, b);
-			fprintf(F, " %ld:%d", get_irn_node_nr(b), get_irn_idx(b));
+			fprintf(F, " %ld:%u", get_irn_node_nr(b), get_irn_idx(b));
 			fprintf(F, "\" status:clustered color:lightblue\n");
 
 			/* dump the nodes that go into the block */