X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf-text%2Ftypes%2Finteger.c;h=0886b0628fffc6a5ffb8784f8fb610b401e41fd3;hp=6abe9b5e55d2c8d8fe335c83497fe5a0f9c6c316;hb=c462e188f3e7819c7bc74f671038cdbf36e8c3c0;hpb=1ae19169d9cb823765444d22cdb05cd2ed3f162f

diff --git a/formats/ctf-text/types/integer.c b/formats/ctf-text/types/integer.c
index 6abe9b5e..0886b062 100644
--- a/formats/ctf-text/types/integer.c
+++ b/formats/ctf-text/types/integer.c
@@ -3,7 +3,9 @@
  *
  * Integers read/write functions.
  *
- * Copyright 2010 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2010-2011 EfficiOS Inc. and Linux Foundation
+ *
+ * Author: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -14,14 +16,23 @@
  *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  */
 
 #include <babeltrace/ctf-text/types.h>
 #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);
@@ -29,16 +40,89 @@ void ctf_text_integer_write(struct stream_pos *ppos, struct definition *definiti
 		integer_definition->declaration;
 	struct ctf_text_stream_pos *pos = ctf_text_pos(ppos);
 
+	if (!print_field(definition))
+		return 0;
+
 	if (pos->dummy)
-		return;
-	print_pos_tabs(pos);
-	if (!integer_declaration->signedness) {
-		fprintf(pos->fp, "%" PRIu64" (%" PRIX64 ")\n",
-			integer_definition->value._unsigned,
-			integer_definition->value._unsigned);
-	} else {
-		fprintf(pos->fp, "%" PRId64" (%" PRIX64 ")\n",
-			integer_definition->value._signed,
-			integer_definition->value._signed);
+		return 0;
+
+	if (pos->field_nr++ != 0)
+		fprintf(pos->fp, ",");
+	fprintf(pos->fp, " ");
+	if (pos->print_names)
+		fprintf(pos->fp, "%s = ",
+			rem_(g_quark_to_string(definition->name)));
+
+	if (pos->string
+	    && (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, v);
+		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, v);
+		break;
+	}
+	default:
+		return -EINVAL;
+	}
+
+	return 0;
 }