*
* Integers read/write functions.
*
- * Copyright (c) 2010 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2010 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
*
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
*/
-#include <ctf/ctf-types.h>
+#include <babeltrace/ctf/types.h>
+#include <babeltrace/bitfield.h>
#include <stdint.h>
#include <glib.h>
#include <endian.h>
-uint64_t ctf_uint_read(struct stream_pos *pos,
+static
+uint64_t _aligned_uint_read(struct stream_pos *pos,
const struct type_class_integer *int_class)
{
int rbo = (int_class->byte_order != BYTE_ORDER); /* reverse byte order */
}
}
-int64_t ctf_int_read(struct stream_pos *pos,
+static
+int64_t _aligned_int_read(struct stream_pos *pos,
const struct type_class_integer *int_class)
{
int rbo = (int_class->byte_order != BYTE_ORDER); /* reverse byte order */
}
}
-void ctf_uint_write(struct stream_pos *pos,
+static
+void _aligned_uint_write(struct stream_pos *pos,
const struct type_class_integer *int_class,
uint64_t v)
{
move_pos(pos, int_class->len);
}
-void ctf_int_write(struct stream_pos *pos,
+static
+void _aligned_int_write(struct stream_pos *pos,
const struct type_class_integer *int_class,
int64_t v)
{
move_pos(pos, int_class->len);
return;
}
+
+uint64_t ctf_uint_read(struct stream_pos *pos,
+ const struct type_class_integer *int_class)
+{
+ uint64_t v;
+
+ align_pos(pos, int_class->p.alignment);
+ if (int_class->byte_order == LITTLE_ENDIAN)
+ ctf_bitfield_read_le(pos->base, pos->offset,
+ int_class->len, &v);
+ else
+ ctf_bitfield_read_be(pos->base, pos->offset,
+ int_class->len, &v);
+ move_pos(pos, int_class->len);
+ return v;
+}
+
+int64_t ctf_int_read(struct stream_pos *pos,
+ const struct type_class_integer *int_class)
+{
+ int64_t v;
+
+ align_pos(pos, int_class->p.alignment);
+ if (int_class->byte_order == LITTLE_ENDIAN)
+ ctf_bitfield_read_le(pos->base, pos->offset,
+ int_class->len, &v);
+ else
+ ctf_bitfield_read_be(pos->base, pos->offset,
+ int_class->len, &v);
+ move_pos(pos, int_class->len);
+ return v;
+}
+
+void ctf_uint_write(struct stream_pos *pos,
+ const struct type_class_integer *int_class,
+ uint64_t v)
+{
+ align_pos(pos, int_class->p.alignment);
+ if (pos->dummy)
+ goto end;
+ if (int_class->byte_order == LITTLE_ENDIAN)
+ ctf_bitfield_write_le(pos->base, pos->offset,
+ int_class->len, v);
+ else
+ ctf_bitfield_write_be(pos->base, pos->offset,
+ int_class->len, v);
+end:
+ move_pos(pos, int_class->len);
+}
+
+void ctf_int_write(struct stream_pos *pos,
+ const struct type_class_integer *int_class,
+ int64_t v)
+{
+ align_pos(pos, int_class->p.alignment);
+ if (pos->dummy)
+ goto end;
+ if (int_class->byte_order == LITTLE_ENDIAN)
+ ctf_bitfield_write_le(pos->base, pos->offset,
+ int_class->len, v);
+ else
+ ctf_bitfield_write_be(pos->base, pos->offset,
+ int_class->len, v);
+end:
+ move_pos(pos, int_class->len);
+}