X-Git-Url: https://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf-text%2Ftypes%2Finteger.c;h=ca0e5e6020b3ed0f3002ef410934bf196bb0b493;hb=eb75a494900f763d9daca6a9bab5a8f01ffe552f;hp=34df4fc9fca49190f7c55c0d26440563ed18f5d8;hpb=b5a8598f01c8e40163449bff173909eff824647b;p=babeltrace.git

diff --git a/formats/ctf-text/types/integer.c b/formats/ctf-text/types/integer.c
index 34df4fc9..ca0e5e60 100644
--- a/formats/ctf-text/types/integer.c
+++ b/formats/ctf-text/types/integer.c
@@ -31,7 +31,7 @@
 #include <inttypes.h>
 #include <stdint.h>
 #include <babeltrace/bitfield.h>
-#include <babeltrace/trace-debuginfo.h>
+#include <babeltrace/trace-debug-info.h>
 
 int ctf_text_integer_write(struct bt_stream_pos *ppos, struct bt_definition *definition)
 {
@@ -101,10 +101,19 @@ int ctf_text_integer_write(struct bt_stream_pos *ppos, struct bt_definition *def
 	{
 		uint64_t v;
 
-		if (!integer_declaration->signedness)
+		if (!integer_declaration->signedness) {
 			v = integer_definition->value._unsigned;
-		else
+		} else {
 			v = (uint64_t) integer_definition->value._signed;
+			if (integer_declaration->len < 64) {
+				/* Round length to the nearest 3-bit */
+				uint8_t rounded_len =
+					integer_declaration->len +
+					((integer_declaration->len + 2) % 3);
+
+				v &= ((uint64_t) 1 << rounded_len) - 1;
+			}
+		}
 
 		fprintf(pos->fp, "0%" PRIo64, v);
 		break;
@@ -113,10 +122,18 @@ int ctf_text_integer_write(struct bt_stream_pos *ppos, struct bt_definition *def
 	{
 		uint64_t v;
 
-		if (!integer_declaration->signedness)
+		if (!integer_declaration->signedness) {
 			v = integer_definition->value._unsigned;
-		else
+		} else {
 			v = (uint64_t) integer_definition->value._signed;
+			if (integer_declaration->len < 64) {
+				/* Round length to the nearest nibble */
+				uint8_t rounded_len =
+					((integer_declaration->len + 3) & ~0x3);
+
+				v &= ((uint64_t) 1 << rounded_len) - 1;
+			}
+		}
 
 		fprintf(pos->fp, "0x%" PRIX64, v);
 		break;