X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firprintf.h;h=22934dd537f2cd9733a3c85691d5cc2fac63ee05;hb=169fd803ea2ed08171113c1fd7ab4e528e1ebc26;hp=1e1a2f6af67e61fecd2bca67125164ff4a6bf43d;hpb=2a1ac3ef0662b13991af866cfe4bf806d59d62b9;p=libfirm

diff --git a/ir/ir/irprintf.h b/ir/ir/irprintf.h
index 1e1a2f6af..22934dd53 100644
--- a/ir/ir/irprintf.h
+++ b/ir/ir/irprintf.h
@@ -20,12 +20,20 @@
 #ifndef _IRPRINTF_H
 #define _IRPRINTF_H
 
-#include "config.h"
+#include "firm_config.h"
+
+#include <stddef.h>
+#include <stdarg.h>
+#include <stdio.h>
+
+/* forward definition */
+struct obstack;
 
 /**
  * Something that can append strings and chars to something.
  */
 typedef struct _appender_t {
+	void (*init)(void *object, size_t n);
 	void (*append_char)(void *object, size_t n, char ch);
 	void (*append_str)(void *object, size_t n, const char *str);
 } appender_t;
@@ -42,22 +50,36 @@ typedef void (ir_printf_cb_t)(const appender_t *app, void *object, size_t limit,
 
 /**
  * A string formatting routine for ir objects.
- * This function rudimentarily implements a kind of printf(3) for ir
+ *
+ * @param fmt  The format string.
+ *
+ * This function rudimentary implements a kind of printf(3) for ir
  * nodes. Following conversion specifiers. No length, special or field
  * width specifiers are accepted.
- * - @%p A pointer.
+ * - @%% Print a '%' character.
+ * - @%> Print as many white spaces as given in the parameter.
+ * - @%c Print a character
  * - @%s A string.
+ * - @%p A pointer.
+ * - @%d A decimal integer.
+ * - @%x A hexadecimal integer.
+ * - @%o An octal integer.
  * - @%I An ident.
+ * - @%t A type name.
  * - @%e An entity name.
- * - @%E An entity ld_name.
+ * - @%E An entity ld name.
+ * - @%T A tarval.
  * - @%n A full description of a node.
- * - @%o The opcode name of an ir node.
- * - @%m The mode name of an ir mode.
+ * - @%O The opcode name of an ir node.
  * - @%N The node number of an ir node.
- * - @%b The block node number of the nodes block.
- * - @%t A tarval.
+ * - @%m The mode name of an ir mode.
+ * - @%B The block node number of the nodes block.
+ * - @%b A bitset.
+ * - @%= A pnc value
+ * - @%G A debug info (if available)
+ * - @%P A compound graph path
  *
- * Each of these can be prepended by a '+' which means, that the given
+ * Each of these can be prepend by a '+' which means, that the given
  * pointer is a collection of items specified by the format. In this
  * case you also have to pass an iterator interface to ir_printf()
  * suitable for the instance of the collection. So, imagine you have a
@@ -65,7 +87,7 @@ typedef void (ir_printf_cb_t)(const appender_t *app, void *object, size_t limit,
  * @code
  *   pset *nodes;
  *   ...
- *   ir_printf("Some nodes: %+n\n", it_pset, nodes);
+ *   ir_printf("Some nodes: %*n\n", it_pset, nodes);
  * @endcode
  * The @c it_pset is an iterator interface (of type
  * @c iterator_t that allows the dumper to traverse the set.
@@ -74,7 +96,7 @@ typedef void (ir_printf_cb_t)(const appender_t *app, void *object, size_t limit,
  * callback function which will be invoked on each element in the
  * collection. It gets the appender (the thing where the textual
  * representation of the element is written to) and its parameters
- * passed by the dumping function. Suppose you have your own datatype
+ * passed by the dumping function. Suppose you have your own data type
  * @c xyz_t and want to dump a pset of it, you have:
  * @code
  *   void xyz_dump(const appender_t *app, void *object, size_t limit,
@@ -86,10 +108,8 @@ typedef void (ir_printf_cb_t)(const appender_t *app, void *object, size_t limit,
  *   ...
  *   pset *xyzs;
  *
- *   ir_printf("A set of xyz\'s: %+C\n", it_pset, xyzs, xyz_dump);
+ *   ir_printf("A set of xyz\'s: %*C\n", it_pset, xyzs, xyz_dump);
  * @endcode
- *
- * @param fmt The format string.
  */
 void ir_printf(const char *fmt, ...);
 
@@ -103,22 +123,28 @@ void ir_fprintf(FILE *f, const char *fmt, ...);
  */
 void ir_snprintf(char *buf, size_t n, const char *fmt, ...);
 
-#ifdef DEBUG_libfirm
-
-#define ir_debugf ir_printf
-#define ir_fdebugf ir_fprintf
-
-#else
+/**
+ * @see irn_printf.
+ */
+void ir_vprintf(const char *fmt, va_list args);
 
-static INLINE void ir_debugf(const char *fmt, ...)
-{
-}
+/**
+ * @see irn_printf.
+ */
+void ir_vfprintf(FILE *f, const char *fmt, va_list args);
 
-static INLINE void ir_fdebugf(FILE *, const char *fmt, ...)
-{
-}
+/**
+ * @see irn_printf.
+ */
+void ir_vsnprintf(char *buf, size_t len, const char *fmt, va_list args);
 
+/**
+ * @see irn_printf.
+ */
+void ir_obst_vprintf(struct obstack *obst, const char *fmt, va_list args);
 
-#endif
+#ifdef WITH_LIBCORE
+#include <libcore/lc_printf.h>
+#endif /* WITH_LIBCORE */
 
-#endif
+#endif /* _IRPRINTF_H */