Finish float

[babeltrace.git] / types / bitfield.c

diff --git a/types/bitfield.c b/types/bitfield.c
index b21fdc917355fc675d05e856cba8906b5d1b6583..697748773f413b0171388b85f0315821bf402ab3 100644 (file)
--- a/types/bitfield.c
+++ b/types/bitfield.c
@@ -19,62 +19,43 @@
  */
 
 #include <babeltrace/compiler.h>
+#include <babeltrace/types.h>
 #include <stdint.h>
 
-/*
- * Shortcut to integer copy if we copy bit-aligned data with 0 start_offset.
- * This skips the bitfield overhead when dealing with enumerations (which use
- * the bitfield copy functions).
- */
-extern
-size_t integer_copy(unsigned char *dest, const struct format *fdest, 
-                   const unsigned char *src, const struct format *fsrc,
-                   const struct type_class *type_class);
-
-size_t bitfield_copy(unsigned char *dest, const struct format *fdest, 
-                    const unsigned char *src, const struct format *fsrc,
+size_t bitfield_copy(struct stream_pos *dest, const struct format *fdest, 
+                    struct stream_pos *src, const struct format *fsrc,
                     const struct type_class *type_class)
 {
        struct type_class_bitfield *bitfield_class =
                container_of(type_class, struct type_class_bitfield, p);
        struct type_class_integer *int_class = &bitfield_class->p;
 
-       if (!(int_class->p.alignment % CHAR_BIT)
-           && !(int_class->len % CHAR_BIT)
-           && !(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;
 
-               v = fsrc->bitfield_unsigned_read(src,
-                                       bitfield_class->start_offset,
-                                       int_class->len,
-                                       int_class->byte_order);
-               return fdest->bitfield_unsigned_write(dest,
-                                       bitfield_class->start_offset,
-                                       int_class->len, int_class->byte_order,
-                                       v);
+               v = fsrc->bitfield_unsigned_read(src, bitfield_class);
+               return fdest->bitfield_unsigned_write(dest, bitfield_class, v);
        } else {
                int64_t v;
 
-               v = fsrc->bitfield_signed_read(src,
-                                       bitfield_class->start_offset,
-                                       int_class->len,
-                                       int_class->byte_order);
-               return fdest->bitfield_signed_write(dest,
-                                       bitfield_class->start_offset,
-                                       int_class->len, int_class->byte_order,
-                                       v);
+               v = fsrc->bitfield_signed_read(src, bitfield_class);
+               return fdest->bitfield_signed_write(dest, bitfield_class, v);
        }
 }
 
+void bitfield_type_free(struct type_class_bitfield *bitfield_class)
+{
+       g_free(bitfield_class);
+}
+
+static void _bitfield_type_free(struct type_class *type_class)
+{
+       struct type_class_bitfield *bitfield_class =
+               container_of(type_class, struct type_class_bitfield, p);
+       bitfield_type_free(bitfield_class);
+}
+
 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)
@@ -83,17 +64,15 @@ struct type_class_bitfield *bitfield_type_new(const char *name,
        struct type_class_integer *int_class;
        int ret;
 
-       /*
-        * Freed when type is unregistered.
-        */
        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->p.copy = bitfield_copy;
+       int_class->p.free = _bitfield_type_free;
        int_class->len = len;
        int_class->byte_order = byte_order;
        int_class->signedness = signedness;
-       bitfield_class->start_offset = start_offset;
        if (int_class->p.name) {
                ret = ctf_register_type(&int_class->p);
                if (ret) {
@@ -103,9 +82,3 @@ struct type_class_bitfield *bitfield_type_new(const char *name,
        }
        return bitfield_class;
 }
-
-void bitfield_type_free(struct type_class_bitfield *bitfield_class)
-{
-       if (!bitfield_class->name)
-               g_free(bitfield_class);
-}