Add float type class to babeltrace types

[babeltrace.git] / types / bitfield.c

diff --git a/types/bitfield.c b/types/bitfield.c
index dc0e474392b79727673974e13c6a56cbb8f802c8..b21fdc917355fc675d05e856cba8906b5d1b6583 100644 (file)
--- a/types/bitfield.c
+++ b/types/bitfield.c
@@ -41,8 +41,12 @@ size_t bitfield_copy(unsigned char *dest, const struct format *fdest,
 
        if (!(int_class->p.alignment % CHAR_BIT)
            && !(int_class->len % CHAR_BIT)
-           && !(bitfield_class->start_offset))
+           && !(bitfield_class->start_offset % CHAR_BIT)) {
+               size_t offset = bitfield_class->start_offset / CHAR_BIT;
+               dest += offset;
+               src += offset;
                return integer_copy(dest, fdest, src, fsrc, type_class);
+       }
 
        if (!int_class->signedness) {
                uint64_t v;
@@ -69,10 +73,13 @@ size_t bitfield_copy(unsigned char *dest, const struct format *fdest,
        }
 }
 
-int bitfield_type_new(const char *name, size_t start_offset,
-                     size_t len, int byte_order, int signedness)
+struct type_class_bitfield *bitfield_type_new(const char *name,
+                                             size_t start_offset,
+                                             size_t len, int byte_order,
+                                             int signedness,
+                                             size_t alignment)
 {
-       struct type_class_bitfield bitfield_class;
+       struct type_class_bitfield *bitfield_class;
        struct type_class_integer *int_class;
        int ret;
 
@@ -82,14 +89,23 @@ int bitfield_type_new(const char *name, size_t start_offset,
        bitfield_class = g_new(struct type_class_bitfield, 1);
        int_class = &bitfield_class->p;
        int_class->p.name = g_quark_from_string(name);
+       int_class->p.alignment = alignment;
        int_class->len = len;
        int_class->byte_order = byte_order;
        int_class->signedness = signedness;
        bitfield_class->start_offset = start_offset;
-       ret = ctf_register_type(&int_class->p);
-       if (ret)
-               g_free(bitfield_class);
-       return ret;
+       if (int_class->p.name) {
+               ret = ctf_register_type(&int_class->p);
+               if (ret) {
+                       g_free(bitfield_class);
+                       return NULL;
+               }
+       }
+       return bitfield_class;
 }
 
-/* TODO: bitfield_type_free */
+void bitfield_type_free(struct type_class_bitfield *bitfield_class)
+{
+       if (!bitfield_class->name)
+               g_free(bitfield_class);
+}