Fix: respect signed integers' length when printing in hex base

[babeltrace.git] / formats / ctf-text / types / integer.c

diff --git a/formats/ctf-text/types/integer.c b/formats/ctf-text/types/integer.c
index 3a469f611ae2e2bd1a4c483d4742df19ef3ba15b..cc3a3551b2bc31074c4fd532c6414b456868db44 100644 (file)
--- a/formats/ctf-text/types/integer.c
+++ b/formats/ctf-text/types/integer.c
@@ -31,8 +31,9 @@
 #include <inttypes.h>
 #include <stdint.h>
 #include <babeltrace/bitfield.h>
+#include <babeltrace/trace-debuginfo.h>
 
-int ctf_text_integer_write(struct bt_stream_pos *ppos, struct definition *definition)
+int ctf_text_integer_write(struct bt_stream_pos *ppos, struct bt_definition *definition)
 {
        struct definition_integer *integer_definition =
                container_of(definition, struct definition_integer, p);
@@ -112,10 +113,15 @@ int ctf_text_integer_write(struct bt_stream_pos *ppos, struct definition *defini
        {
                uint64_t v;
 
-               if (!integer_declaration->signedness)
+               if (!integer_declaration->signedness) {
                        v = integer_definition->value._unsigned;
-               else
+               } else {
+                       /* Round length to the nearest nibble */
+                       uint8_t rounded_len = ((integer_declaration->len + 3) & ~0x3);
+
                        v = (uint64_t) integer_definition->value._signed;
+                       v &= ((uint64_t) 1 << rounded_len) - 1;
+               }
 
                fprintf(pos->fp, "0x%" PRIX64, v);
                break;
@@ -124,5 +130,7 @@ int ctf_text_integer_write(struct bt_stream_pos *ppos, struct definition *defini
                return -EINVAL;
        }
 
+       ctf_text_integer_write_debug_info(ppos, definition);
+
        return 0;
 }