X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firdump.c;h=5305cc9323ca456405aa2f934f744eb16eadf061;hb=af0115376ccdcc72e0643caf221407218f4504f0;hp=0026f0ec1d3f574c472ef36838d6a347ae2663ab;hpb=0b4ffc9e2d57b0393ad86820e9415c0ccbc54549;p=libfirm

diff --git a/ir/ir/irdump.c b/ir/ir/irdump.c
index 0026f0ec1..5305cc932 100644
--- a/ir/ir/irdump.c
+++ b/ir/ir/irdump.c
@@ -23,16 +23,10 @@
  * @author  Martin Trapp, Christian Schaefer, Goetz Lindenmaier, Hubert Schmidt
  * @version $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
-#ifdef HAVE_STRING_H
 #include <string.h>
-#endif
-#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
-#endif
 #include <stdarg.h>
 
 #include "firm_common_t.h"
@@ -68,14 +62,6 @@
 #include "eset.h"
 #include "pset.h"
 
-#if DO_HEAPANALYSIS
-extern void dump_irn_chi_term(FILE *FL, ir_node *n);
-extern void dump_irn_state(FILE *FL, ir_node *n);
-extern int  get_opt_dump_abstvals(void);
-typedef unsigned long SeqNo;
-extern SeqNo get_Block_seqno(ir_node *n);
-#endif
-
 /** Dump only irgs with names that start with this prefix. */
 static ident *dump_file_filter_id = NULL;
 
@@ -482,7 +468,7 @@ static void print_enum_item_edge(FILE *F, ir_type *E, int item, const char *fmt,
 /*-----------------------------------------------------------------*/
 
 static void dump_whole_node(ir_node *n, void *env);
-static INLINE void dump_loop_nodes_into_graph(FILE *F, ir_graph *irg);
+static inline void dump_loop_nodes_into_graph(FILE *F, ir_graph *irg);
 
 /*-----------------------------------------------------------------*/
 /* Helper functions.                                                */
@@ -742,11 +728,6 @@ int dump_node_opcode(FILE *F, ir_node *n)
 
 	/* implementation for default nodes */
 	switch (get_irn_opcode(n)) {
-
-	case iro_Const:
-		ir_fprintf(F, "%T", get_Const_tarval(n));
-		break;
-
 	case iro_SymConst:
 		switch (get_SymConst_kind(n)) {
 		case symconst_addr_name:
@@ -847,6 +828,9 @@ int dump_node_opcode(FILE *F, ir_node *n)
 	case iro_DivMod:
 		fprintf(F, "%s[%s]", get_irn_opname(n), get_mode_name_ex(get_DivMod_resmode(n), &bad));
 		break;
+	case iro_Builtin:
+		fprintf(F, "%s[%s]", get_irn_opname(n), get_builtin_kind_name(get_Builtin_kind(n)));
+		break;
 
 	default:
 default_case:
@@ -933,7 +917,6 @@ static const pns_lookup_t start_lut[] = {
 	X(P_frame_base),
 	X(P_tls),
 	X(T_args),
-	X(P_value_arg_base)
 #undef X
 };
 
@@ -1109,6 +1092,10 @@ dump_node_nodeattr(FILE *F, ir_node *n)
 		}
 		break;
 
+	case iro_Const:
+		ir_fprintf(F, "%T ", get_Const_tarval(n));
+		break;
+
 	case iro_Proj:
 		pred    = get_Proj_pred(n);
 		proj_nr = get_Proj_proj(n);
@@ -1236,7 +1223,7 @@ static void dump_node_vcgattr(FILE *F, ir_node *node, ir_node *local, int bad)
 		return;
 	}
 
-	mode = get_irn_mode(node);
+	mode = get_irn_mode(n);
 	if(mode == mode_M) {
 		print_vcg_color(F, ird_color_memory);
 		return;
@@ -1314,7 +1301,7 @@ void dump_remv_node_info_callback(void *handle)
 /**
  * Dump the node information of a node n to a file F.
  */
-static INLINE int dump_node_info(FILE *F, ir_node *n)
+static inline int dump_node_info(FILE *F, ir_node *n)
 {
 	int bad = 0;
 	const ir_op_ops *ops = get_op_ops(get_irn_op(n));
@@ -1332,7 +1319,7 @@ static INLINE int dump_node_info(FILE *F, ir_node *n)
 	return bad;
 }
 
-static INLINE int is_constlike_node(const ir_node *node)
+static inline int is_constlike_node(const ir_node *node)
 {
 	const ir_op *op = get_irn_op(node);
 	return is_op_constlike(op);
@@ -1473,10 +1460,6 @@ static void dump_node(FILE *F, ir_node *n)
 
 	if(dump_node_edge_hook)
 		dump_node_edge_hook(F, n);
-#if DO_HEAPANALYSIS
-	dump_irn_chi_term(F, n);
-	dump_irn_state(F, n);
-#endif
 }
 
 /** dump the edge to the block this node belongs to */
@@ -1725,10 +1708,6 @@ static void dump_whole_block(FILE *F, ir_node *block) {
 	PRINT_NODEID(block);
 	fprintf(F, "\"  label: \"");
 	dump_node_label(F, block);
-#if DO_HEAPANALYSIS
-	if (get_opt_dump_abstvals())
-		fprintf(F, " seqno: %d", (int)get_Block_seqno(block));
-#endif
 
 	/* colorize blocks */
 	if (! get_Block_matured(block))
@@ -1759,9 +1738,6 @@ static void dump_whole_block(FILE *F, ir_node *block) {
 	/* Close the vcg information for the block */
 	fprintf(F, "}\n");
 	dump_const_node_local(F, block);
-#if DO_HEAPANALYSIS
-	dump_irn_chi_term(F, block);
-#endif
 	fprintf(F, "\n");
 }
 
@@ -2226,13 +2202,13 @@ dump_out_edge(ir_node *n, void *env) {
 	}
 }
 
-static INLINE void
+static inline void
 dump_loop_label(FILE *F, ir_loop *loop) {
 	fprintf(F, "loop %d, %d sons, %d nodes",
 	        get_loop_depth(loop), get_loop_n_sons(loop), get_loop_n_nodes(loop));
 }
 
-static INLINE void dump_loop_info(FILE *F, ir_loop *loop) {
+static inline void dump_loop_info(FILE *F, ir_loop *loop) {
 	fprintf(F, " info1: \"");
 	fprintf(F, " loop nr: %d", get_loop_loop_nr(loop));
 #ifdef DEBUG_libfirm   /* GL @@@ debug analyses */
@@ -2241,7 +2217,7 @@ static INLINE void dump_loop_info(FILE *F, ir_loop *loop) {
 	fprintf(F, "\"");
 }
 
-static INLINE void
+static inline void
 dump_loop_node(FILE *F, ir_loop *loop) {
 	fprintf(F, "node: {title: \"");
 	PRINT_LOOPID(loop);
@@ -2252,7 +2228,7 @@ dump_loop_node(FILE *F, ir_loop *loop) {
 	fprintf(F, "}\n");
 }
 
-static INLINE void
+static inline void
 dump_loop_node_edge(FILE *F, ir_loop *loop, int i) {
 	assert(loop);
 	fprintf(F, "edge: {sourcename: \"");
@@ -2263,7 +2239,7 @@ dump_loop_node_edge(FILE *F, ir_loop *loop, int i) {
 	fprintf(F, "}\n");
 }
 
-static INLINE void
+static inline void
 dump_loop_son_edge(FILE *F, ir_loop *loop, int i) {
 	assert(loop);
 	fprintf(F, "edge: {sourcename: \"");
@@ -2292,7 +2268,7 @@ void dump_loops(FILE *F, ir_loop *loop) {
 	}
 }
 
-static INLINE
+static inline
 void dump_loop_nodes_into_graph(FILE *F, ir_graph *irg) {
 	ir_graph *rem = current_ir_graph;
 	current_ir_graph = irg;