Standardise spelling of debug info

[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 34a899ddd0e901dab98141133f71c1c2526e92c2..ca0e5e6020b3ed0f3002ef410934bf196bb0b493 100644 (file)
--- 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,6 +16,14 @@
  *
  * 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>
@@ -21,8 +31,9 @@
 #include <inttypes.h>
 #include <stdint.h>
 #include <babeltrace/bitfield.h>
+#include <babeltrace/trace-debug-info.h>
 
-int ctf_text_integer_write(struct 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);
@@ -30,6 +41,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;
 
@@ -38,7 +52,21 @@ 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)));
+
+       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 */
@@ -61,7 +89,7 @@ int ctf_text_integer_write(struct stream_pos *ppos, struct definition *definitio
                else
                        v = (uint64_t) integer_definition->value._signed;
 
-               fprintf(pos->fp, "b");
+               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);
@@ -73,31 +101,48 @@ int ctf_text_integer_write(struct stream_pos *ppos, struct definition *definitio
        {
                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);
 
-               fprintf(pos->fp, "0%" PRIo64,
-                       integer_definition->value._unsigned);
+                               v &= ((uint64_t) 1 << rounded_len) - 1;
+                       }
+               }
+
+               fprintf(pos->fp, "0%" PRIo64, v);
                break;
        }
        case 16:
        {
                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);
 
-               fprintf(pos->fp, "0x%" PRIX64,
-                       integer_definition->value._unsigned);
+                               v &= ((uint64_t) 1 << rounded_len) - 1;
+                       }
+               }
+
+               fprintf(pos->fp, "0x%" PRIX64, v);
                break;
        }
        default:
                return -EINVAL;
        }
 
+       ctf_text_integer_write_debug_info(ppos, definition);
+
        return 0;
 }