X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf-text%2Ftypes%2Finteger.c;h=1337eca3ab13df44bb89e7ee5903d381dd743a88;hp=7dcca27e1f364c15417584ff9d0d0d9c6bc841f5;hb=81dee1bb528a95f7bf2bc622948807150794a75e;hpb=8f390b0366dfa57a51cde50f28895a051d5550c1

diff --git a/formats/ctf-text/types/integer.c b/formats/ctf-text/types/integer.c
index 7dcca27e..1337eca3 100644
--- a/formats/ctf-text/types/integer.c
+++ b/formats/ctf-text/types/integer.c
@@ -20,8 +20,9 @@
 #include <stdio.h>
 #include <inttypes.h>
 #include <stdint.h>
+#include <babeltrace/bitfield.h>
 
-void ctf_text_integer_write(struct stream_pos *ppos, struct definition *definition)
+int ctf_text_integer_write(struct stream_pos *ppos, struct definition *definition)
 {
 	struct definition_integer *integer_definition =
 		container_of(definition, struct definition_integer, p);
@@ -30,15 +31,86 @@ void ctf_text_integer_write(struct stream_pos *ppos, struct definition *definiti
 	struct ctf_text_stream_pos *pos = ctf_text_pos(ppos);
 
 	if (pos->dummy)
-		return;
-	print_pos_tabs(pos);
-	if (!integer_declaration->signedness) {
-		fprintf(pos->fp, "%" PRIu64" (0x%" PRIX64 ")\n",
-			integer_definition->value._unsigned,
+		return 0;
+
+	if (pos->field_nr++ != 0)
+		fprintf(pos->fp, ",");
+	fprintf(pos->fp, " ");
+	if (pos->print_names)
+		fprintf(pos->fp, "%s = ",
+			g_quark_to_string(definition->name));
+
+	if (integer_declaration->encoding == CTF_STRING_ASCII
+	    || integer_declaration->encoding == CTF_STRING_UTF8) {
+
+		if (!integer_declaration->signedness) {
+			g_string_append_c(pos->string,
+				(int) integer_definition->value._unsigned);
+		} else {
+			g_string_append_c(pos->string,
+				(int) integer_definition->value._signed);
+		}
+		return 0;
+	}
+
+	switch (integer_declaration->base) {
+	case 0:	/* default */
+	case 10:
+		if (!integer_declaration->signedness) {
+			fprintf(pos->fp, "%" PRIu64,
+				integer_definition->value._unsigned);
+		} else {
+			fprintf(pos->fp, "%" PRId64,
+				integer_definition->value._signed);
+		}
+		break;
+	case 2:
+	{
+		int bitnr;
+		uint64_t v;
+
+		if (!integer_declaration->signedness)
+			v = integer_definition->value._unsigned;
+		else
+			v = (uint64_t) integer_definition->value._signed;
+
+		fprintf(pos->fp, "0b");
+		v = _bt_piecewise_lshift(v, 64 - integer_declaration->len);
+		for (bitnr = 0; bitnr < integer_declaration->len; bitnr++) {
+			fprintf(pos->fp, "%u", (v & (1ULL << 63)) ? 1 : 0);
+			v = _bt_piecewise_lshift(v, 1);
+		}
+		break;
+	}
+	case 8:
+	{
+		uint64_t v;
+
+		if (!integer_declaration->signedness)
+			v = integer_definition->value._unsigned;
+		else
+			v = (uint64_t) integer_definition->value._signed;
+
+		fprintf(pos->fp, "0%" PRIo64,
+			integer_definition->value._unsigned);
+		break;
+	}
+	case 16:
+	{
+		uint64_t v;
+
+		if (!integer_declaration->signedness)
+			v = integer_definition->value._unsigned;
+		else
+			v = (uint64_t) integer_definition->value._signed;
+
+		fprintf(pos->fp, "0x%" PRIX64,
 			integer_definition->value._unsigned);
-	} else {
-		fprintf(pos->fp, "%" PRId64" (0x%" PRIX64 ")\n",
-			integer_definition->value._signed,
-			integer_definition->value._signed);
+		break;
 	}
+	default:
+		return -EINVAL;
+	}
+
+	return 0;
 }