X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firprintf.c;h=cb20f58188f5154bf777c75b794d83960b4412a4;hb=593c8e22a9dfdcd8acd9dc6b006912e553abecff;hp=f744eeecbe45186953290fd62d7f5c949170a9f3;hpb=544aba59a02c6920afa0d30b1df61c0ef64a8030;p=libfirm

diff --git a/ir/ir/irprintf.c b/ir/ir/irprintf.c
index f744eeecb..cb20f5818 100644
--- a/ir/ir/irprintf.c
+++ b/ir/ir/irprintf.c
@@ -10,7 +10,7 @@
  */
 
 /**
- * @file irprinf.c
+ * @file irprintf.c
  *
  * A little printf helper unterstanding firm types.
  * @author Sebastian Hack
@@ -34,12 +34,13 @@
 
 #include <ctype.h>
 
+#include "firm_config.h"
 #include "ident.h"
 #include "irmode_t.h"
 #include "irnode_t.h"
 #include "entity_t.h"
 #include "type_t.h"
-#include "tv.h"
+#include "tv_t.h"
 #include "irprintf.h"
 #include "obst.h"
 #include "pset.h"
@@ -154,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);
 
@@ -362,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';
@@ -375,7 +389,9 @@ static void ir_common_vprintf(const appender_t *app, void *object,
 					snprintf(buf, sizeof(buf), "%p", va_arg(args, void *));
 					break;
 
+				case 'i':
 				case 'd':
+				case 'u':
 				case 'x':
 				case 'X':
 				case 'o':
@@ -433,8 +449,15 @@ static void ir_common_vprintf(const appender_t *app, void *object,
 				case 'n':
 					{
 						ir_node *irn = va_arg(args, ir_node *);
-						if(irn)
-							snprintf(buf, sizeof(buf), "%s%s:%ld",
+						if (irn)
+							if (is_Const(irn)) {
+								char tbuf[128];
+								tarval_snprintf(tbuf, sizeof(tbuf), get_Const_tarval(irn));
+								snprintf(buf, sizeof(buf), "%s%s<%s>:%ld",
+									get_irn_opname(irn), get_mode_name(get_irn_mode(irn)), tbuf, get_irn_node_nr(irn));
+                                                        }
+                                                        else
+								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));
@@ -508,6 +531,10 @@ static void ir_common_vprintf(const appender_t *app, void *object,
 					/* clean the buffer again */
 					buf[0] = '\0';
 					break;
+
+				case '=':
+					str = get_pnc_string(va_arg(args, int));
+					break;
 			}
 
 			dump_with_settings(app, object, limit, &settings, str);
@@ -522,7 +549,7 @@ static void ir_common_vprintf(const appender_t *app, void *object,
 }
 
 /**
- * Convencience for stdout dumping.
+ * Convenience for stdout dumping.
  */
 void ir_printf(const char *fmt, ...)
 {
@@ -533,7 +560,7 @@ void ir_printf(const char *fmt, ...)
 }
 
 /**
- * Convencience for file dumping.
+ * Convenience for file dumping.
  */
 void ir_fprintf(FILE *f, const char *fmt, ...)
 {
@@ -544,7 +571,7 @@ void ir_fprintf(FILE *f, const char *fmt, ...)
 }
 
 /**
- * Convencience for string dumping.
+ * Convenience for string dumping.
  */
 void ir_snprintf(char *buf, size_t len, const char *fmt, ...)
 {
@@ -555,7 +582,7 @@ void ir_snprintf(char *buf, size_t len, const char *fmt, ...)
 }
 
 /**
- * Convencience for string dumping.
+ * Convenience for string dumping.
  */
 void ir_obst_printf(struct obstack *obst, const char *fmt, ...)
 {
@@ -584,3 +611,56 @@ void ir_obst_vprintf(struct obstack *obst, const char *fmt, va_list args)
 {
 	ir_common_vprintf(&obst_appender, obst, 0, fmt, args);
 }
+
+#else /* WITH_LIBCORE */
+
+#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