X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Fbitfield.c;h=a7111b1c454f81a293e4a1dc1244bdd7e0db814a;hp=dc0e474392b79727673974e13c6a56cbb8f802c8;hb=90b676d73fc6f817958083c0f159028a2f0b40ca;hpb=698f0fe44073e0bfdc6c26222c3bdc1a0dc2d423

diff --git a/types/bitfield.c b/types/bitfield.c
index dc0e4743..a7111b1c 100644
--- a/types/bitfield.c
+++ b/types/bitfield.c
@@ -19,6 +19,7 @@
  */
 
 #include <babeltrace/compiler.h>
+#include <babeltrace/types.h>
 #include <stdint.h>
 
 /*
@@ -41,8 +42,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,27 +74,44 @@ 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)
+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;
+	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)
+{
+	struct type_class_bitfield *bitfield_class;
 	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;
-	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 */