Add base integer attribute, and use it in ctf-text

[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 6abe9b5e55d2c8d8fe335c83497fe5a0f9c6c316..a01284583f6ecdd64e83cc2a9d34c31b00bc0a8f 100644 (file)
--- a/formats/ctf-text/types/integer.c
+++ b/formats/ctf-text/types/integer.c
@@ -21,7 +21,7 @@
 #include <inttypes.h>
 #include <stdint.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 +30,50 @@ 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" (%" 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));
+
+       switch (integer_declaration->base) {
+       case 2:
+       {
+               int bitnr;
+               uint64_t v = integer_definition->value._unsigned;
+
+               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;
+               }
+               break;
+       }
+       case 8:
+               fprintf(pos->fp, "0%" PRIo64,
+                       integer_definition->value._unsigned);
+               break;
+       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 16:
+               fprintf(pos->fp, "0x%" PRIX64,
                        integer_definition->value._unsigned);
-       } else {
-               fprintf(pos->fp, "%" PRId64" (%" PRIX64 ")\n",
-                       integer_definition->value._signed,
-                       integer_definition->value._signed);
+               break;
+       default:
+               return -EINVAL;
        }
+
+       return 0;
 }