* all copies or substantial portions of the Software.
*/
-#include <ctf/ctf-types.h>
-#include <ctf/bitfield.h>
+#include <babeltrace/ctf/types.h>
+#include <babeltrace/bitfield.h>
#include <stdint.h>
#include <glib.h>
#include <endian.h>
static
-uint64_t _aligned_uint_read(struct stream_pos *pos,
- const struct type_class_integer *int_class)
+uint64_t _aligned_uint_read(struct stream_pos *ppos,
+ const struct declaration_integer *integer_declaration)
{
- int rbo = (int_class->byte_order != BYTE_ORDER); /* reverse byte order */
+ struct ctf_stream_pos *pos = ctf_pos(ppos);
+ int rbo = (integer_declaration->byte_order != BYTE_ORDER); /* reverse byte order */
- align_pos(pos, int_class->p.alignment);
+ ctf_align_pos(pos, integer_declaration->p.alignment);
assert(!(pos->offset % CHAR_BIT));
- switch (int_class->len) {
+ switch (integer_declaration->len) {
case 8:
{
uint8_t v;
v = *(const uint8_t *)pos->base;
- move_pos(pos, int_class->len);
+ ctf_move_pos(pos, integer_declaration->len);
return v;
}
case 16:
uint16_t v;
v = *(const uint16_t *)pos->base;
- move_pos(pos, int_class->len);
+ ctf_move_pos(pos, integer_declaration->len);
return rbo ? GUINT16_SWAP_LE_BE(v) : v;
}
case 32:
uint32_t v;
v = *(const uint32_t *)pos->base;
- move_pos(pos, int_class->len);
+ ctf_move_pos(pos, integer_declaration->len);
return rbo ? GUINT32_SWAP_LE_BE(v) : v;
}
case 64:
uint64_t v;
v = *(const uint64_t *)pos->base;
- move_pos(pos, int_class->len);
+ ctf_move_pos(pos, integer_declaration->len);
return rbo ? GUINT64_SWAP_LE_BE(v) : v;
}
default:
}
static
-int64_t _aligned_int_read(struct stream_pos *pos,
- const struct type_class_integer *int_class)
+int64_t _aligned_int_read(struct stream_pos *ppos,
+ const struct declaration_integer *integer_declaration)
{
- int rbo = (int_class->byte_order != BYTE_ORDER); /* reverse byte order */
+ struct ctf_stream_pos *pos = ctf_pos(ppos);
+ int rbo = (integer_declaration->byte_order != BYTE_ORDER); /* reverse byte order */
- align_pos(pos, int_class->p.alignment);
+ ctf_align_pos(pos, integer_declaration->p.alignment);
assert(!(pos->offset % CHAR_BIT));
- switch (int_class->len) {
+ switch (integer_declaration->len) {
case 8:
{
int8_t v;
v = *(const int8_t *)pos->base;
- move_pos(pos, int_class->len);
+ ctf_move_pos(pos, integer_declaration->len);
return v;
}
case 16:
int16_t v;
v = *(const int16_t *)pos->base;
- move_pos(pos, int_class->len);
+ ctf_move_pos(pos, integer_declaration->len);
return rbo ? GUINT16_SWAP_LE_BE(v) : v;
}
case 32:
int32_t v;
v = *(const int32_t *)pos->base;
- move_pos(pos, int_class->len);
+ ctf_move_pos(pos, integer_declaration->len);
return rbo ? GUINT32_SWAP_LE_BE(v) : v;
}
case 64:
int64_t v;
v = *(const int64_t *)pos->base;
- move_pos(pos, int_class->len);
+ ctf_move_pos(pos, integer_declaration->len);
return rbo ? GUINT64_SWAP_LE_BE(v) : v;
}
default:
}
static
-void _aligned_uint_write(struct stream_pos *pos,
- const struct type_class_integer *int_class,
- uint64_t v)
+void _aligned_uint_write(struct stream_pos *ppos,
+ const struct declaration_integer *integer_declaration,
+ uint64_t v)
{
- int rbo = (int_class->byte_order != BYTE_ORDER); /* reverse byte order */
+ struct ctf_stream_pos *pos = ctf_pos(ppos);
+ int rbo = (integer_declaration->byte_order != BYTE_ORDER); /* reverse byte order */
- align_pos(pos, int_class->p.alignment);
+ ctf_align_pos(pos, integer_declaration->p.alignment);
assert(!(pos->offset % CHAR_BIT));
if (pos->dummy)
goto end;
- switch (int_class->len) {
- case 8: *(uint8_t *) get_pos_addr(pos) = (uint8_t) v;
+ switch (integer_declaration->len) {
+ case 8: *(uint8_t *) ctf_get_pos_addr(pos) = (uint8_t) v;
break;
case 16:
- *(uint16_t *) get_pos_addr(pos) = rbo ?
+ *(uint16_t *) ctf_get_pos_addr(pos) = rbo ?
GUINT16_SWAP_LE_BE((uint16_t) v) :
(uint16_t) v;
break;
case 32:
- *(uint32_t *) get_pos_addr(pos) = rbo ?
+ *(uint32_t *) ctf_get_pos_addr(pos) = rbo ?
GUINT32_SWAP_LE_BE((uint32_t) v) :
(uint32_t) v;
break;
case 64:
- *(uint64_t *) get_pos_addr(pos) = rbo ?
+ *(uint64_t *) ctf_get_pos_addr(pos) = rbo ?
GUINT64_SWAP_LE_BE(v) : v;
break;
default:
assert(0);
}
end:
- move_pos(pos, int_class->len);
+ ctf_move_pos(pos, integer_declaration->len);
}
static
-void _aligned_int_write(struct stream_pos *pos,
- const struct type_class_integer *int_class,
- int64_t v)
+void _aligned_int_write(struct stream_pos *ppos,
+ const struct declaration_integer *integer_declaration,
+ int64_t v)
{
- int rbo = (int_class->byte_order != BYTE_ORDER); /* reverse byte order */
+ struct ctf_stream_pos *pos = ctf_pos(ppos);
+ int rbo = (integer_declaration->byte_order != BYTE_ORDER); /* reverse byte order */
- align_pos(pos, int_class->p.alignment);
+ ctf_align_pos(pos, integer_declaration->p.alignment);
assert(!(pos->offset % CHAR_BIT));
if (pos->dummy)
goto end;
- switch (int_class->len) {
- case 8: *(int8_t *) get_pos_addr(pos) = (int8_t) v;
+ switch (integer_declaration->len) {
+ case 8: *(int8_t *) ctf_get_pos_addr(pos) = (int8_t) v;
break;
case 16:
- *(int16_t *) get_pos_addr(pos) = rbo ?
+ *(int16_t *) ctf_get_pos_addr(pos) = rbo ?
GUINT16_SWAP_LE_BE((int16_t) v) :
(int16_t) v;
break;
case 32:
- *(int32_t *) get_pos_addr(pos) = rbo ?
+ *(int32_t *) ctf_get_pos_addr(pos) = rbo ?
GUINT32_SWAP_LE_BE((int32_t) v) :
(int32_t) v;
break;
case 64:
- *(int64_t *) get_pos_addr(pos) = rbo ?
+ *(int64_t *) ctf_get_pos_addr(pos) = rbo ?
GUINT64_SWAP_LE_BE(v) : v;
break;
default:
assert(0);
}
end:
- move_pos(pos, int_class->len);
+ ctf_move_pos(pos, integer_declaration->len);
return;
}
-uint64_t ctf_uint_read(struct stream_pos *pos,
- const struct type_class_bitfield *int_class)
+uint64_t ctf_uint_read(struct stream_pos *ppos,
+ const struct declaration_integer *integer_declaration)
{
- uint64_t v;
+ struct ctf_stream_pos *pos = ctf_pos(ppos);
+ uint64_t v = 0;
- 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);
+ ctf_align_pos(pos, integer_declaration->p.alignment);
+ if (integer_declaration->byte_order == LITTLE_ENDIAN)
+ bt_bitfield_read_le(pos->base, unsigned long, pos->offset,
+ integer_declaration->len, &v);
else
- ctf_bitfield_read_be(pos->base, pos->offset,
- int_class->len, &v);
- move_pos(pos, int_class->len);
+ bt_bitfield_read_be(pos->base, unsigned long, pos->offset,
+ integer_declaration->len, &v);
+ ctf_move_pos(pos, integer_declaration->len);
return v;
}
-int64_t ctf_int_read(struct stream_pos *pos,
- const struct type_class_bitfield *int_class)
+int64_t ctf_int_read(struct stream_pos *ppos,
+ const struct declaration_integer *integer_declaration)
{
- int64_t v;
+ struct ctf_stream_pos *pos = ctf_pos(ppos);
+ int64_t v = 0;
- 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);
+ ctf_align_pos(pos, integer_declaration->p.alignment);
+ if (integer_declaration->byte_order == LITTLE_ENDIAN)
+ bt_bitfield_read_le(pos->base, unsigned long, pos->offset,
+ integer_declaration->len, &v);
else
- ctf_bitfield_read_be(pos->base, pos->offset,
- int_class->len, &v);
- move_pos(pos, int_class->len);
+ bt_bitfield_read_be(pos->base, unsigned long, pos->offset,
+ integer_declaration->len, &v);
+ ctf_move_pos(pos, integer_declaration->len);
return v;
}
-void ctf_uint_write(struct stream_pos *pos,
- const struct type_class_bitfield *int_class,
- uint64_t v)
+void ctf_uint_write(struct stream_pos *ppos,
+ const struct declaration_integer *integer_declaration,
+ uint64_t v)
{
- align_pos(pos, int_class->p.alignment);
+ struct ctf_stream_pos *pos = ctf_pos(ppos);
+
+ ctf_align_pos(pos, integer_declaration->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);
+ if (integer_declaration->byte_order == LITTLE_ENDIAN)
+ bt_bitfield_write_le(pos->base, unsigned long, pos->offset,
+ integer_declaration->len, v);
else
- ctf_bitfield_write_be(pos->base, pos->offset,
- int_class->len,, v);
+ bt_bitfield_write_be(pos->base, unsigned long, pos->offset,
+ integer_declaration->len, v);
end:
- move_pos(pos, int_class->len);
+ ctf_move_pos(pos, integer_declaration->len);
}
-void ctf_int_write(struct stream_pos *pos,
- const struct type_class_bitfield *int_class,
- int64_t v)
+void ctf_int_write(struct stream_pos *ppos,
+ const struct declaration_integer *integer_declaration,
+ int64_t v)
{
- align_pos(pos, int_class->p.alignment);
+ struct ctf_stream_pos *pos = ctf_pos(ppos);
+
+ ctf_align_pos(pos, integer_declaration->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);
+ if (integer_declaration->byte_order == LITTLE_ENDIAN)
+ bt_bitfield_write_le(pos->base, unsigned long, pos->offset,
+ integer_declaration->len, v);
else
- ctf_bitfield_write_be(pos->base, pos->offset,
- int_class->len, v);
+ bt_bitfield_write_be(pos->base, unsigned long, pos->offset,
+ integer_declaration->len, v);
end:
- move_pos(pos, int_class->len);
+ ctf_move_pos(pos, integer_declaration->len);
}