X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firprintf.c;h=dde2dcea8f7ac5e8fd161f56ec6ca204a414bfc5;hb=f9d25133f86594ca2b1f33fb0b41a591ecc9b914;hp=2d8e1238c10bea784d4b2dbc9c0bf2eeb5507fd8;hpb=8881d93d56384f5f37104d692ef7c68b7f949325;p=libfirm

diff --git a/ir/ir/irprintf.c b/ir/ir/irprintf.c
index 2d8e1238c..dde2dcea8 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,18 +34,21 @@
 
 #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"
 #include "iterator.h"
 #include "bitset.h"
+#include "dbginfo_t.h"
 
+#define STRNIL "(nil)"
 
 /**
  * Init the string.
@@ -153,6 +156,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);
 
@@ -202,11 +207,11 @@ static int is_std_fmt(const char *fmt)
 #endif
 
 struct settings {
-	char pad;
+	char flag_zero;
 	int width;
-	int left_just;
-	int put_plus;
-	int alternate;
+	int flag_minus;
+	int flag_plus;
+	int flag_hash;
 };
 
 /* Length specifiers. */
@@ -225,33 +230,135 @@ enum {
 static void dump_with_settings(const appender_t *app, void *object, size_t limit,
 		const struct settings *settings, const char *str)
 {
-	if(settings->width >= 0) {
+	if (settings->width >= 0) {
 		int i;
 		size_t n = strlen(str);
 		int lim = MIN(settings->width, (int)limit);
 		int to_print = MIN(lim, (int)n);
 		int to_pad = to_print - lim;
 
-		if(!settings->left_just)
+		if (!settings->flag_minus)
 			for(i = 0; i < to_pad; ++i)
-				app->append_char(object, lim, settings->pad);
+				app->append_char(object, lim, settings->flag_zero);
 
 		app->append_str(object, to_print, str);
 
-		if(!settings->left_just)
+		if (!settings->flag_minus)
 			for(i = 0; i < to_pad; ++i)
-				app->append_char(object, lim, settings->pad);
+				app->append_char(object, lim, settings->flag_zero);
 	}
 
 	else
 		app->append_str(object, limit, str);
 }
 
+/**
+ * emit a Firm object. Backported from irargs.
+ */
+static void firm_emit(char *buf, int buflen, char conversion,
+    const struct settings *occ, void *X)
+{
+#define A(s)    occ->flag_hash ? s " ": ""
+
+  firm_kind *obj = X;
+  int i, n;
+  ir_node *block;
+  char add[64];
+  char tv[256];
+  entity *ent;
+
+  buf[0] = '\0';
+  add[0] = '\0';
+
+  if (! X)
+    strncpy(buf, "(null)", buflen);
+  else {
+    switch (*obj) {
+    case k_BAD:
+      snprintf(buf, buflen, "BAD");
+      snprintf(add, sizeof(add), "[%p]", X);
+      break;
+    case k_entity:
+      snprintf(buf, buflen, "%s%s", A("ent"),
+          isupper(conversion) ? get_entity_ld_name(X): get_entity_name(X));
+      snprintf(add, sizeof(add), "[%ld]", get_entity_nr(X));
+      break;
+    case k_type:
+      snprintf(buf, buflen, "%s%s:%s", A("type"), get_type_tpop_name(X), get_type_name(X));
+      snprintf(add, sizeof(add), "[%ld]", get_type_nr(X));
+      break;
+    case k_ir_graph:
+      snprintf(buf, buflen, "%s%s", A("irg"), get_entity_name(get_irg_entity(X)));
+      snprintf(add, sizeof(add), "[%ld]", get_irg_graph_nr(X));
+      break;
+    case k_ir_node:
+      switch (conversion) {
+      case 'B':
+        block = is_no_Block(X) ? get_nodes_block(X) : X;
+        snprintf(buf, buflen, "%s%s%s", A("irn"), get_irn_opname(block),
+            get_mode_name(get_irn_mode(block)));
+        snprintf(add, sizeof(add), "[%ld]", get_irn_node_nr(block));
+        break;
+      case 'N':
+        snprintf(buf, buflen, "%ld", get_irn_node_nr(X));
+        break;
+      default:
+        if (is_Const(X)) {
+          tarval_snprintf(tv, sizeof(tv), get_Const_tarval(X));
+          snprintf(buf, buflen, "%s%s%s<%s>", A("irn"), get_irn_opname(X),
+            get_mode_name(get_irn_mode(X)), tv);
+        }
+        else
+          snprintf(buf, buflen, "%s%s%s", A("irn"), get_irn_opname(X),
+            get_mode_name(get_irn_mode(X)));
+        snprintf(add, sizeof(add), "[%ld]", get_irn_node_nr(X));
+      }
+      break;
+    case k_ir_mode:
+      snprintf(buf, buflen, "%s%s", A("mode"), get_mode_name(X));
+      break;
+    case k_tarval:
+      tarval_snprintf(tv, sizeof(tv), X);
+      snprintf(buf, buflen, "%s%s", A("tv"), tv);
+      break;
+    case k_ir_loop:
+      snprintf(buf, buflen, "ldepth[%d]", get_loop_depth(X));
+      break;
+    case k_ir_op:
+      snprintf(buf, buflen, "%s%s", A("op"), get_op_name(X));
+      break;
+    case k_ir_compound_graph_path:
+      n = get_compound_graph_path_length(X);
+
+      for (i = 0; i < n; ++i) {
+        ent = get_compound_graph_path_node(X, i);
+
+        strncat(buf, ".", buflen);
+        strncat(buf, get_entity_name(ent), buflen);
+        if (is_Array_type(get_entity_owner(ent))) {
+          snprintf(add, sizeof(add), "[%d]",
+            get_compound_graph_path_array_index(X, i));
+          strncat(buf, add, buflen);
+        }
+      }
+      add[0] = '\0';
+      break;
+
+    default:
+      snprintf(buf, buflen, "UNKWN");
+      snprintf(add, sizeof(add), "[%p]", X);
+    }
+  }
+
+  if (occ->flag_plus)
+  	strncat(buf, add, buflen);
+
+#undef A
+}
 
 /**
  * A small printf helper routine for ir nodes.
- * @param app An appender (this determines where the stuff is dumped
- * to).
+ * @param app An appender (this determines where the stuff is dumped to).
  * @param object A target passed to the appender.
  * @param limit The maximum number of characters to dump.
  * @param fmt The format string.
@@ -269,20 +376,20 @@ static void ir_common_vprintf(const appender_t *app, void *object,
 
 	app->init(object, limit);
 
-	for(i = 0, n = strlen(fmt); i < n; ++i) {
+	for (i = 0, n = strlen(fmt); i < n; ++i) {
 		char ch = fmt[i];
 
-		if(ch == '%') {
+		if (ch == '%') {
 			int len;
 			const char *len_str = "";
 
 			struct settings settings;
 
-			settings.alternate = 0;
-			settings.pad = ' ';
+			settings.flag_hash = 0;
+			settings.flag_zero = ' ';
 			settings.width = -1;
-			settings.left_just = 0;
-			settings.put_plus = 0;
+			settings.flag_minus = 0;
+			settings.flag_plus  = 0;
 
 			ch = fmt[++i];
 
@@ -292,19 +399,19 @@ static void ir_common_vprintf(const appender_t *app, void *object,
 			/* Set the string to print to the buffer by default. */
 			str = buf;
 
-			while(strchr("#0-+", ch)) {
+			while (strchr("#0-+", ch)) {
 				switch(ch) {
 					case '#':
-						settings.alternate = 1;
+						settings.flag_hash = 1;
 						break;
 					case '0':
-						settings.pad = '0';
+						settings.flag_zero = '0';
 						break;
 					case '-':
-						settings.left_just = 1;
+						settings.flag_minus = 1;
 						break;
 					case '+':
-						settings.put_plus = 1;
+						settings.flag_plus = 1;
 						break;
 				}
 
@@ -325,7 +432,7 @@ static void ir_common_vprintf(const appender_t *app, void *object,
 			}
 
 			/* Ignore the precision */
-			if(ch == '.')
+			if (ch == '.')
 				while(isdigit(ch = fmt[++i]));
 
 			/* read the length modifier. */
@@ -353,7 +460,7 @@ static void ir_common_vprintf(const appender_t *app, void *object,
 			}
 
 			/* Do the conversion specifier. */
-			switch(ch) {
+			switch (ch) {
 
 				/* The percent itself */
 				case '%':
@@ -361,6 +468,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';
@@ -374,7 +492,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':
@@ -414,44 +534,17 @@ static void ir_common_vprintf(const appender_t *app, void *object,
 					break;
 
 				case 't':
-					str = get_type_name(va_arg(args, type *));
-					break;
-
-				case 'e':
-					str = get_entity_name(va_arg(args, entity *));
-					break;
-
-				case 'E':
-					str = get_entity_ld_name(va_arg(args, entity *));
-					break;
-
-				case 'T':
-					tarval_snprintf(buf, sizeof(buf), va_arg(args, tarval *));
-					break;
-
-				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));
-					}
-					break;
-
-				case 'O':
-					str = get_irn_opname(va_arg(args, ir_node *));
-					break;
-
-				case 'N':
-					snprintf(buf, sizeof(buf), "%ld", get_irn_node_nr(va_arg(args, ir_node *)));
-					break;
-
-				case 'm':
-					str = get_mode_name(va_arg(args, ir_mode *));
-					break;
-
-				case 'B':
-					snprintf(buf, sizeof(buf), "%ld",
-							get_irn_node_nr(get_nodes_block(va_arg(args, ir_node *))));
+        case 'e':
+        case 'E':
+        case 'T':
+        case 'n':
+        case 'O':
+        case 'm':
+        case 'B':
+        case 'P':
+        case 'F':
+        case 'f':
+          firm_emit(buf, sizeof(buf), ch, &settings, va_arg(args, void *));
 					break;
 
 				case 'b':
@@ -504,11 +597,25 @@ 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;
+				case 'G':
+					{
+						ir_node *irn = va_arg(args, ir_node *);
+						dbg_info *dbg = get_irn_dbg_info(irn);
+						buf[0] = '\0';
+						if (dbg && __dbg_info_snprint) {
+							if (__dbg_info_snprint(buf, sizeof(buf), dbg) <= 0)
+								buf[0] = '\0';
+						}
+						break;
+					}
 			}
 
 			dump_with_settings(app, object, limit, &settings, str);
 		}
-
 		else
 			DUMP_CH(ch);
 	}
@@ -518,7 +625,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, ...)
 {
@@ -529,7 +636,7 @@ void ir_printf(const char *fmt, ...)
 }
 
 /**
- * Convencience for file dumping.
+ * Convenience for file dumping.
  */
 void ir_fprintf(FILE *f, const char *fmt, ...)
 {
@@ -540,7 +647,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, ...)
 {
@@ -551,7 +658,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, ...)
 {
@@ -580,3 +687,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