use tv_t.h instead of tv.h

[libfirm] / ir / ir / irprintf.c

diff --git a/ir/ir/irprintf.c b/ir/ir/irprintf.c
index 06dcd09..7555c4e 100644 (file)
--- a/ir/ir/irprintf.c
+++ b/ir/ir/irprintf.c
@@ -24,6 +24,9 @@
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif
+#ifdef HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -31,6 +34,7 @@
 
 #include <ctype.h>
 
+#include "firm_config.h"
 #include "ident.h"
 #include "irmode_t.h"
 #include "irnode_t.h"
@@ -43,6 +47,7 @@
 #include "iterator.h"
 #include "bitset.h"
 
+#define STRNIL "(nil)"
 
 /**
  * Init the string.
@@ -150,6 +155,8 @@ static const appender_t obst_appender = {
        obst_append_str
 };
 
+#ifndef WITH_LIBCORE
+
 static void ir_common_vprintf(const appender_t *app, void *object,
                size_t limit, const char *fmt, va_list args);
 
@@ -225,8 +232,8 @@ static void dump_with_settings(const appender_t *app, void *object, size_t limit
        if(settings->width >= 0) {
                int i;
                size_t n = strlen(str);
-               int lim = MIN(settings->width, limit);
-               int to_print = MIN(lim, n);
+               int lim = MIN(settings->width, (int)limit);
+               int to_print = MIN(lim, (int)n);
                int to_pad = to_print - lim;
 
                if(!settings->left_just)
@@ -358,6 +365,17 @@ static void ir_common_vprintf(const appender_t *app, void *object,
                                        buf[1] = '\0';
                                        break;
 
+                               /* Indent */
+                               case '>':
+                                       {
+                                               int i, n = va_arg(args, int);
+                                               for(i = 0; i < n && i < sizeof(buf) - 1; ++i)
+                                                       buf[i] = ' ';
+
+                                               buf[i] = '\0';
+                                       }
+                                       break;
+
                                case 'c':
                                        buf[0] = va_arg(args, int);
                                        buf[1] = '\0';
@@ -398,7 +416,7 @@ static void ir_common_vprintf(const appender_t *app, void *object,
 
                                                        case len_long_long:
                                                                {
-                                                                       long long arg = va_arg(args, long long);
+                                                                       int64_t arg = va_arg(args, int64_t);
                                                                        snprintf(buf, sizeof(buf), fmt_str, arg);
                                                                }
                                                                break;
@@ -429,8 +447,11 @@ static void ir_common_vprintf(const appender_t *app, void *object,
                                case 'n':
                                        {
                                                ir_node *irn = va_arg(args, ir_node *);
-                                               snprintf(buf, sizeof(buf), "%s%s:%ld",
-                                                               get_irn_opname(irn), get_mode_name(get_irn_mode(irn)), get_irn_node_nr(irn));
+                                               if(irn)
+                                                       snprintf(buf, sizeof(buf), "%s%s:%ld",
+                                                                       get_irn_opname(irn), get_mode_name(get_irn_mode(irn)), get_irn_node_nr(irn));
+                                               else
+                                                       strncpy(buf, STRNIL, sizeof(buf));
                                        }
                                        break;
 
@@ -577,3 +598,56 @@ void ir_obst_vprintf(struct obstack *obst, const char *fmt, va_list args)
 {
        ir_common_vprintf(&obst_appender, obst, 0, fmt, args);
 }
+
+#else
+
+#include "irargs_t.h"
+
+void ir_printf(const char *fmt, ...)
+{
+       va_list args;
+
+       va_start(args, fmt);
+       lc_evprintf(firm_get_arg_env(), fmt, args);
+       va_end(args);
+}
+
+void ir_fprintf(FILE *f, const char *fmt, ...)
+{
+       va_list args;
+
+       va_start(args, fmt);
+       lc_evfprintf(firm_get_arg_env(), f, fmt, args);
+       va_end(args);
+}
+
+void ir_snprintf(char *buf, size_t n, const char *fmt, ...)
+{
+       va_list args;
+
+       va_start(args, fmt);
+       lc_evsnprintf(firm_get_arg_env(), buf, n, fmt, args);
+       va_end(args);
+}
+
+void ir_vprintf(const char *fmt, va_list args)
+{
+       lc_evprintf(firm_get_arg_env(), fmt, args);
+}
+
+void ir_vfprintf(FILE *f, const char *fmt, va_list args)
+{
+       lc_evfprintf(firm_get_arg_env(), f, fmt, args);
+}
+
+void ir_vsnprintf(char *buf, size_t len, const char *fmt, va_list args)
+{
+       lc_evsnprintf(firm_get_arg_env(), buf, len, fmt, args);
+}
+
+void ir_obst_vprintf(struct obstack *obst, const char *fmt, va_list args)
+{
+       lc_evoprintf(firm_get_arg_env(), obst, fmt, args);
+}
+
+#endif