X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;ds=sidebyside;f=formats%2Fctf%2Ftypes%2Finteger.c;h=fb6e0d425d2c7cbf420b11595aeff664ff1516a6;hb=f66259163f060ada8d0fee348857c968e338ea40;hp=b2c429f5129e095ac82412650cd3698ccfb9efdb;hpb=bed864a75d2315c344a6e625db66ae9bfbc51e27;p=babeltrace.git diff --git a/formats/ctf/types/integer.c b/formats/ctf/types/integer.c index b2c429f5..fb6e0d42 100644 --- a/formats/ctf/types/integer.c +++ b/formats/ctf/types/integer.c @@ -3,42 +3,40 @@ * * Integers read/write functions. * - * Copyright (c) 2010 Mathieu Desnoyers + * Copyright 2010 - Mathieu Desnoyers * - * 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 +#include +#include #include #include #include -uint64_t ctf_uint_read(struct stream_pos *pos, - const struct type_class_integer *int_class) +static +uint64_t _aligned_uint_read(struct stream_pos *pos, + const struct declaration_integer *integer_declaration) { - int rbo = (int_class->byte_order != BYTE_ORDER); /* reverse byte order */ + int rbo = (integer_declaration->byte_order != BYTE_ORDER); /* reverse byte order */ - align_pos(pos, int_class->p.alignment); + 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); + move_pos(pos, integer_declaration->len); return v; } case 16: @@ -46,7 +44,7 @@ uint64_t ctf_uint_read(struct stream_pos *pos, uint16_t v; v = *(const uint16_t *)pos->base; - move_pos(pos, int_class->len); + move_pos(pos, integer_declaration->len); return rbo ? GUINT16_SWAP_LE_BE(v) : v; } case 32: @@ -54,7 +52,7 @@ uint64_t ctf_uint_read(struct stream_pos *pos, uint32_t v; v = *(const uint32_t *)pos->base; - move_pos(pos, int_class->len); + move_pos(pos, integer_declaration->len); return rbo ? GUINT32_SWAP_LE_BE(v) : v; } case 64: @@ -62,7 +60,7 @@ uint64_t ctf_uint_read(struct stream_pos *pos, uint64_t v; v = *(const uint64_t *)pos->base; - move_pos(pos, int_class->len); + move_pos(pos, integer_declaration->len); return rbo ? GUINT64_SWAP_LE_BE(v) : v; } default: @@ -70,20 +68,21 @@ uint64_t ctf_uint_read(struct stream_pos *pos, } } -int64_t ctf_int_read(struct stream_pos *pos, - const struct type_class_integer *int_class) +static +int64_t _aligned_int_read(struct stream_pos *pos, + const struct declaration_integer *integer_declaration) { - int rbo = (int_class->byte_order != BYTE_ORDER); /* reverse byte order */ + int rbo = (integer_declaration->byte_order != BYTE_ORDER); /* reverse byte order */ - align_pos(pos, int_class->p.alignment); + 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); + move_pos(pos, integer_declaration->len); return v; } case 16: @@ -91,7 +90,7 @@ int64_t ctf_int_read(struct stream_pos *pos, int16_t v; v = *(const int16_t *)pos->base; - move_pos(pos, int_class->len); + move_pos(pos, integer_declaration->len); return rbo ? GUINT16_SWAP_LE_BE(v) : v; } case 32: @@ -99,7 +98,7 @@ int64_t ctf_int_read(struct stream_pos *pos, int32_t v; v = *(const int32_t *)pos->base; - move_pos(pos, int_class->len); + move_pos(pos, integer_declaration->len); return rbo ? GUINT32_SWAP_LE_BE(v) : v; } case 64: @@ -107,7 +106,7 @@ int64_t ctf_int_read(struct stream_pos *pos, int64_t v; v = *(const int64_t *)pos->base; - move_pos(pos, int_class->len); + move_pos(pos, integer_declaration->len); return rbo ? GUINT64_SWAP_LE_BE(v) : v; } default: @@ -115,18 +114,19 @@ int64_t ctf_int_read(struct stream_pos *pos, } } -void ctf_uint_write(struct stream_pos *pos, - const struct type_class_integer *int_class, +static +void _aligned_uint_write(struct stream_pos *pos, + const struct declaration_integer *integer_declaration, uint64_t v) { - int rbo = (int_class->byte_order != BYTE_ORDER); /* reverse byte order */ + int rbo = (integer_declaration->byte_order != BYTE_ORDER); /* reverse byte order */ - align_pos(pos, int_class->p.alignment); + align_pos(pos, integer_declaration->p.alignment); assert(!(pos->offset % CHAR_BIT)); if (pos->dummy) goto end; - switch (int_class->len) { + switch (integer_declaration->len) { case 8: *(uint8_t *) get_pos_addr(pos) = (uint8_t) v; break; case 16: @@ -147,21 +147,22 @@ void ctf_uint_write(struct stream_pos *pos, assert(0); } end: - move_pos(pos, int_class->len); + move_pos(pos, integer_declaration->len); } -void ctf_int_write(struct stream_pos *pos, - const struct type_class_integer *int_class, +static +void _aligned_int_write(struct stream_pos *pos, + const struct declaration_integer *integer_declaration, int64_t v) { - int rbo = (int_class->byte_order != BYTE_ORDER); /* reverse byte order */ + int rbo = (integer_declaration->byte_order != BYTE_ORDER); /* reverse byte order */ - align_pos(pos, int_class->p.alignment); + align_pos(pos, integer_declaration->p.alignment); assert(!(pos->offset % CHAR_BIT)); if (pos->dummy) goto end; - switch (int_class->len) { + switch (integer_declaration->len) { case 8: *(int8_t *) get_pos_addr(pos) = (int8_t) v; break; case 16: @@ -182,6 +183,72 @@ void ctf_int_write(struct stream_pos *pos, assert(0); } end: - move_pos(pos, int_class->len); + move_pos(pos, integer_declaration->len); return; } + +uint64_t ctf_uint_read(struct stream_pos *pos, + const struct declaration_integer *integer_declaration) +{ + uint64_t v = 0; + + 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 + bt_bitfield_read_be(pos->base, unsigned long, pos->offset, + integer_declaration->len, &v); + move_pos(pos, integer_declaration->len); + return v; +} + +int64_t ctf_int_read(struct stream_pos *pos, + const struct declaration_integer *integer_declaration) +{ + int64_t v = 0; + + 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 + bt_bitfield_read_be(pos->base, unsigned long, pos->offset, + integer_declaration->len, &v); + move_pos(pos, integer_declaration->len); + return v; +} + +void ctf_uint_write(struct stream_pos *pos, + const struct declaration_integer *integer_declaration, + uint64_t v) +{ + align_pos(pos, integer_declaration->p.alignment); + if (pos->dummy) + goto end; + if (integer_declaration->byte_order == LITTLE_ENDIAN) + bt_bitfield_write_le(pos->base, unsigned long, pos->offset, + integer_declaration->len, v); + else + bt_bitfield_write_be(pos->base, unsigned long, pos->offset, + integer_declaration->len, v); +end: + move_pos(pos, integer_declaration->len); +} + +void ctf_int_write(struct stream_pos *pos, + const struct declaration_integer *integer_declaration, + int64_t v) +{ + align_pos(pos, integer_declaration->p.alignment); + if (pos->dummy) + goto end; + if (integer_declaration->byte_order == LITTLE_ENDIAN) + bt_bitfield_write_le(pos->base, unsigned long, pos->offset, + integer_declaration->len, v); + else + bt_bitfield_write_be(pos->base, unsigned long, pos->offset, + integer_declaration->len, v); +end: + move_pos(pos, integer_declaration->len); +}