*/
#include <babeltrace/compiler.h>
+#include <babeltrace/types.h>
#include <stdint.h>
/*
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;
}
}
-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 */