X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firdump_t.h;h=3bb952df60d913e5ac788ef709721758cb9b543c;hb=eb47aca33f2f8c414409f3695e73277b47442334;hp=b99976558ac52b33df0a59d8135553fab21c2855;hpb=012c6aef388bc20594591520b05c143ee4e6d074;p=libfirm

diff --git a/ir/ir/irdump_t.h b/ir/ir/irdump_t.h
index b99976558..3bb952df6 100644
--- a/ir/ir/irdump_t.h
+++ b/ir/ir/irdump_t.h
@@ -32,6 +32,7 @@
  * Symbolic names for the different dumping colors.
  */
 typedef enum ird_color_t {
+	ird_color_none = -1,
 	ird_color_prog_background,
 	ird_color_block_background,
 	ird_color_dead_block_background,
@@ -103,7 +104,6 @@ typedef enum {
 #define KEEP_ALIVE_DF_EDGE_ATTR  "class:20 priority:10 color:purple"
 #define ANCHOR_EDGE_ATTR         "class:20 priority:60 color:purple linestyle:dotted"
 #define OUT_EDGE_ATTR            "class:21 priority:10 color:gold linestyle:dashed"
-#define MACROBLOCK_EDGE_ATTR     "class:22 priority:10 color:green linestyle:dashed"
 
 #define BACK_EDGE_ATTR "linestyle:dashed "
 
@@ -118,8 +118,8 @@ typedef enum {
 #define ENUM_ITEM_NODE_ATTR      "color: green"
 #define ENT_TYPE_EDGE_ATTR       "class: 3 label: \"type\" color: red"
 #define ENT_OWN_EDGE_ATTR        "class: 4 label: \"owner\" color: black"
-#define METH_PAR_EDGE_ATTR       "class: 5 label: \"param %d\" color: green"
-#define METH_RES_EDGE_ATTR       "class: 6 label: \"res %d\" color: green"
+#define METH_PAR_EDGE_ATTR       "class: 5 label: \"param %zu\" color: green"
+#define METH_RES_EDGE_ATTR       "class: 6 label: \"res %zu\" color: green"
 #define TYPE_SUPER_EDGE_ATTR     "class: 7 label: \"supertype\" color: red"
 #define UNION_EDGE_ATTR          "class: 8 label: \"component\" color: blue"
 #define PTR_PTS_TO_EDGE_ATTR     "class: 9 label: \"points to\" color:green"
@@ -127,43 +127,39 @@ typedef enum {
 #define ARR_ENT_EDGE_ATTR        "class: 10 label: \"arr ent\" color: green"
 #define ENT_OVERWRITES_EDGE_ATTR "class: 11 label: \"overwrites\" color:red"
 #define ENT_VALUE_EDGE_ATTR      "label: \"value %d\""
-#define ENT_CORR_EDGE_ATTR       "label: \"value %d corresponds to \" "
+#define ENT_CORR_EDGE_ATTR       "label: \"value %zu corresponds to \" "
 #define TYPE_MEMBER_EDGE_ATTR    "class: 12 label: \"member\" color:blue"
 /* #define CALLGRAPH_EDGE_ATTR      "calls" */
 
-#define PRINT_NODEID(X)       fprintf(F, "n%ld", get_irn_node_nr(X))
-#define PRINT_TYPEID(X)       fprintf(F, "\"t%ld\"", get_type_nr(X))
-#define PRINT_ENTID(X)        fprintf(F, "e%ld", get_entity_nr(X))
-#define PRINT_IRGID(X)        fprintf(F, "g%ld", get_irg_graph_nr(X))
-#define PRINT_CONSTID(X,Y)    fprintf(F, "\"n%ldn%ld\"", get_irn_node_nr(X),get_irn_node_nr(Y))
-#define PRINT_CONSTBLKID(X,Y) fprintf(F, "n%ldb%ld", get_irn_node_nr(X),get_irn_node_nr(Y))
-#define PRINT_LOOPID(X)       fprintf(F, "l%d", get_loop_loop_nr(X))
-#define PRINT_ITEMID(X,Y)     fprintf(F, "i%ldT%d", get_type_nr(X), (Y))
-#define PRINT_EXTBBID(X)      fprintf(F, "x%ld", get_irn_node_nr(X))
-
-extern int dump_dominator_information_flag;
-extern int opt_dump_pointer_values_to_info;
-extern int opt_dump_analysed_type_info;
-
-FILE *vcg_open(const ir_graph *irg, const char * suffix1, const char *suffix2);
-FILE *vcg_open_name(const char *name, const char *suffix);
-void dump_vcg_header(FILE *F, const char *name, const char *layout, const char *orientation);
-void dump_vcg_footer(FILE *F);
+#define PRINT_NODEID(X)       ir_fprintf(F, "n%ld", get_irn_node_nr(X))
+#define PRINT_TYPEID(X)       ir_fprintf(F, "\"t%ld\"", get_type_nr(X))
+#define PRINT_ENTID(X)        ir_fprintf(F, "e%ld", get_entity_nr(X))
+#define PRINT_IRGID(X)        ir_fprintf(F, "g%ld", get_irg_graph_nr(X))
+#define PRINT_CONSTID(X,Y)    ir_fprintf(F, "\"n%ldn%ld\"", get_irn_node_nr(X),get_irn_node_nr(Y))
+#define PRINT_CONSTBLKID(X,Y) ir_fprintf(F, "n%ldb%ld", get_irn_node_nr(X),get_irn_node_nr(Y))
+#define PRINT_LOOPID(X)       ir_fprintf(F, "l%ld", get_loop_loop_nr(X))
+#define PRINT_ITEMID(X,Y)     ir_fprintf(F, "i%ldT%zu", get_type_nr(X), (Y))
+#define PRINT_EXTBBID(X)      ir_fprintf(F, "x%ld", get_irn_node_nr(X))
+
+void dump_vcg_header(FILE *out, const char *name, const char *layout, const char *orientation);
+void dump_vcg_footer(FILE *out);
 const char *get_irg_dump_name(const ir_graph *irg);
 
-
 const char *get_ent_dump_name(const ir_entity *ent);
-const char *get_mode_name_ex(const ir_mode *mode, int *bad);
+
 /**
- * dump the name of a node n to the File F.
+ * returns the name of a mode or "<ERROR>" if mode is NOT a mode object.
+ * in the later case, sets bad.
  */
-int dump_node_opcode(FILE *F, ir_node *n);
+const char *get_mode_name_ex(const ir_mode *mode, int *bad);
+/** dump the name of a node n to the File F. */
+void dump_node_opcode(FILE *out, ir_node *n);
 
-int dump_node_label(FILE *F, ir_node *n);
+void dump_node_label(FILE *out, ir_node *n);
 
-int dump_vrp_info(FILE *F, ir_node *n);
+void dump_vrp_info(FILE *out, ir_node *n);
 
 /** Writes vcg representation with title "PRINT_TYPEID(tp)" to file F. */
-int dump_type_node(FILE *F, ir_type *tp);
+void dump_type_node(FILE *out, ir_type *tp);
 
-#endif /* FIRM_IR_IRDUMPT_T_H */
+#endif