X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf-text%2Ftypes%2Finteger.c;h=f56a753bbb47177b0ab2811600f3669a2b935ce7;hb=c34ea0fad3f9900c3b97efa229d221927422dacf;hp=a01284583f6ecdd64e83cc2a9d34c31b00bc0a8f;hpb=164078da31b3612e3618e8e8046a3866cb22f80e;p=babeltrace.git

diff --git a/formats/ctf-text/types/integer.c b/formats/ctf-text/types/integer.c
index a0128458..f56a753b 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
@@ -20,6 +22,7 @@
 #include <stdio.h>
 #include <inttypes.h>
 #include <stdint.h>
+#include <babeltrace/bitfield.h>
 
 int ctf_text_integer_write(struct stream_pos *ppos, struct definition *definition)
 {
@@ -29,6 +32,9 @@ int ctf_text_integer_write(struct stream_pos *ppos, struct definition *definitio
 		integer_definition->declaration;
 	struct ctf_text_stream_pos *pos = ctf_text_pos(ppos);
 
+	if (!print_field(definition))
+		return 0;
+
 	if (pos->dummy)
 		return 0;
 
@@ -37,27 +43,24 @@ int ctf_text_integer_write(struct stream_pos *ppos, struct definition *definitio
 	fprintf(pos->fp, " ");
 	if (pos->print_names)
 		fprintf(pos->fp, "%s = ",
-			g_quark_to_string(definition->name));
+			rem_(g_quark_to_string(definition->name)));
 
-	switch (integer_declaration->base) {
-	case 2:
-	{
-		int bitnr;
-		uint64_t v = integer_definition->value._unsigned;
+	if (pos->string
+	    && (integer_declaration->encoding == CTF_STRING_ASCII
+	      || integer_declaration->encoding == CTF_STRING_UTF8)) {
 
-		fprintf(pos->fp, "b");
-		for (bitnr = 0; bitnr < integer_declaration->len; bitnr++)
-			v <<= 1;
-		for (; bitnr < sizeof(v) * CHAR_BIT; bitnr++) {
-			fprintf(pos->fp, "%u", ((v & 1ULL) << 63) ? 1 : 0);
-			v <<= 1;
+		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);
 		}
-		break;
+		return 0;
 	}
-	case 8:
-		fprintf(pos->fp, "0%" PRIo64,
-			integer_definition->value._unsigned);
-		break;
+
+	switch (integer_declaration->base) {
+	case 0:	/* default */
 	case 10:
 		if (!integer_declaration->signedness) {
 			fprintf(pos->fp, "%" PRIu64,
@@ -67,10 +70,48 @@ int ctf_text_integer_write(struct stream_pos *ppos, struct definition *definitio
 				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:
-		fprintf(pos->fp, "0x%" PRIX64,
-			integer_definition->value._unsigned);
+	{
+		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;
 	}