X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Ftypes%2Finteger.c;h=66036ae2511004fafe8bd3056cb848949f11a209;hp=cd81b17aa0d47d29f98334e0f798f1e7fd625119;hb=c462e188f3e7819c7bc74f671038cdbf36e8c3c0;hpb=7172902caa455601e0d7429378e898eb12bbb2ba diff --git a/formats/ctf/types/integer.c b/formats/ctf/types/integer.c index cd81b17a..66036ae2 100644 --- a/formats/ctf/types/integer.c +++ b/formats/ctf/types/integer.c @@ -3,156 +3,303 @@ * * Integers read/write functions. * - * Copyright (c) 2010 Mathieu Desnoyers + * Copyright 2010-2011 EfficiOS Inc. and Linux Foundation * - * 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. + * Author: Mathieu Desnoyers * - * 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. + * 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: * - * 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. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. */ -#include +#include +#include #include #include -#include +#include + +/* + * The aligned read/write functions are expected to be faster than the + * bitfield variants. They will be enabled eventually as an + * optimisation. + */ -uint64_t uint_read(const uint8_t *ptr, size_t len, int byte_order) +static +int _aligned_integer_read(struct stream_pos *ppos, + struct definition *definition) { - int rbo = (byte_order != BYTE_ORDER); /* reverse byte order */ + struct definition_integer *integer_definition = + container_of(definition, struct definition_integer, p); + const struct declaration_integer *integer_declaration = + integer_definition->declaration; + struct ctf_stream_pos *pos = ctf_pos(ppos); + int rbo = (integer_declaration->byte_order != BYTE_ORDER); /* reverse byte order */ - switch (len) { - case 8: - { - uint8_t v; + ctf_align_pos(pos, integer_declaration->p.alignment); - v = *(const uint8_t *)ptr; - return v; - } - case 16: - { - uint16_t v; + if (!ctf_pos_access_ok(pos, integer_declaration->len)) + return -EFAULT; - v = *(const uint16_t *)ptr; - return rbo ? GUINT16_SWAP_LE_BE(v) : v; - } - case 32: - { - uint32_t v; + assert(!(pos->offset % CHAR_BIT)); + if (!integer_declaration->signedness) { + switch (integer_declaration->len) { + case 8: + { + uint8_t v; - v = *(const uint32_t *)ptr; - return rbo ? GUINT32_SWAP_LE_BE(v) : v; - } - case 64: - { - uint64_t v; + v = *(const uint8_t *) ctf_get_pos_addr(pos); + integer_definition->value._unsigned = v; + break; + } + case 16: + { + uint16_t v; - v = *(const uint64_t *)ptr; - return rbo ? GUINT64_SWAP_LE_BE(v) : v; - } - default: - assert(0); + v = *(const uint16_t *) ctf_get_pos_addr(pos); + integer_definition->value._unsigned = + rbo ? GUINT16_SWAP_LE_BE(v) : v; + break; + } + case 32: + { + uint32_t v; + + v = *(const uint32_t *) ctf_get_pos_addr(pos); + integer_definition->value._unsigned = + rbo ? GUINT32_SWAP_LE_BE(v) : v; + break; + } + case 64: + { + uint64_t v; + + v = *(const uint64_t *) ctf_get_pos_addr(pos); + integer_definition->value._unsigned = + rbo ? GUINT64_SWAP_LE_BE(v) : v; + break; + } + default: + assert(0); + } + } else { + switch (integer_declaration->len) { + case 8: + { + int8_t v; + + v = *(const int8_t *) ctf_get_pos_addr(pos); + integer_definition->value._signed = v; + break; + } + case 16: + { + int16_t v; + + v = *(const int16_t *) ctf_get_pos_addr(pos); + integer_definition->value._signed = + rbo ? (int16_t) GUINT16_SWAP_LE_BE(v) : v; + break; + } + case 32: + { + int32_t v; + + v = *(const int32_t *) ctf_get_pos_addr(pos); + integer_definition->value._signed = + rbo ? (int32_t) GUINT32_SWAP_LE_BE(v) : v; + break; + } + case 64: + { + int64_t v; + + v = *(const int64_t *) ctf_get_pos_addr(pos); + integer_definition->value._signed = + rbo ? (int64_t) GUINT64_SWAP_LE_BE(v) : v; + break; + } + default: + assert(0); + } } + ctf_move_pos(pos, integer_declaration->len); + return 0; } -int64_t int_read(const uint8_t *ptr, size_t len, int byte_order) +static +int _aligned_integer_write(struct stream_pos *ppos, + struct definition *definition) { - int rbo = (byte_order != BYTE_ORDER); /* reverse byte order */ + struct definition_integer *integer_definition = + container_of(definition, struct definition_integer, p); + const struct declaration_integer *integer_declaration = + integer_definition->declaration; + struct ctf_stream_pos *pos = ctf_pos(ppos); + int rbo = (integer_declaration->byte_order != BYTE_ORDER); /* reverse byte order */ - switch (len) { - case 8: - { - int8_t v; + ctf_align_pos(pos, integer_declaration->p.alignment); - v = *(const int8_t *)ptr; - return v; - } - case 16: - { - int16_t v; + if (!ctf_pos_access_ok(pos, integer_declaration->len)) + return -EFAULT; - v = *(const int16_t *)ptr; - return rbo ? GUINT16_SWAP_LE_BE(v) : v; - } - case 32: - { - int32_t v; + assert(!(pos->offset % CHAR_BIT)); + if (pos->dummy) + goto end; + if (!integer_declaration->signedness) { + uint64_t v = integer_definition->value._unsigned; - v = *(const int32_t *)ptr; - return rbo ? GUINT32_SWAP_LE_BE(v) : v; - } - case 64: - { - int64_t v; + switch (integer_declaration->len) { + case 8: *(uint8_t *) ctf_get_pos_addr(pos) = (uint8_t) v; + break; + case 16: + *(uint16_t *) ctf_get_pos_addr(pos) = rbo ? + GUINT16_SWAP_LE_BE((uint16_t) v) : + (uint16_t) v; + break; + case 32: + *(uint32_t *) ctf_get_pos_addr(pos) = rbo ? + GUINT32_SWAP_LE_BE((uint32_t) v) : + (uint32_t) v; + break; + case 64: + *(uint64_t *) ctf_get_pos_addr(pos) = rbo ? + GUINT64_SWAP_LE_BE(v) : v; + break; + default: + assert(0); + } + } else { + int64_t v = integer_definition->value._signed; - v = *(const int64_t *)ptr; - return rbo ? GUINT64_SWAP_LE_BE(v) : v; - } - default: - assert(0); + switch (integer_declaration->len) { + case 8: *(int8_t *) ctf_get_pos_addr(pos) = (int8_t) v; + break; + case 16: + *(int16_t *) ctf_get_pos_addr(pos) = rbo ? + (int16_t) GUINT16_SWAP_LE_BE((int16_t) v) : + (int16_t) v; + break; + case 32: + *(int32_t *) ctf_get_pos_addr(pos) = rbo ? + (int32_t) GUINT32_SWAP_LE_BE((int32_t) v) : + (int32_t) v; + break; + case 64: + *(int64_t *) ctf_get_pos_addr(pos) = rbo ? + GUINT64_SWAP_LE_BE(v) : v; + break; + default: + assert(0); + } } +end: + ctf_move_pos(pos, integer_declaration->len); + return 0; } -size_t uint_write(uint8_t *ptr, size_t len, int byte_order, uint64_t v) +int ctf_integer_read(struct stream_pos *ppos, struct definition *definition) { - int rbo = (byte_order != BYTE_ORDER); /* reverse byte order */ + struct definition_integer *integer_definition = + container_of(definition, struct definition_integer, p); + const struct declaration_integer *integer_declaration = + integer_definition->declaration; + struct ctf_stream_pos *pos = ctf_pos(ppos); - if (!ptr) - goto end; + if (!(integer_declaration->p.alignment % CHAR_BIT) + && !(integer_declaration->len % CHAR_BIT)) { + return _aligned_integer_read(ppos, definition); + } + + ctf_align_pos(pos, integer_declaration->p.alignment); - switch (len) { - case 8: *(uint8_t *)ptr = (uint8_t) v; - break; - case 16: - *(uint16_t *)ptr = rbo ? GUINT16_SWAP_LE_BE((uint16_t) v) : - (uint16_t) v; - break; - case 32: - *(uint32_t *)ptr = rbo ? GUINT32_SWAP_LE_BE((uint32_t) v) : - (uint32_t) v; - break; - case 64: - *(uint64_t *)ptr = rbo ? GUINT64_SWAP_LE_BE(v) : v; - break; - default: - assert(0); + if (!ctf_pos_access_ok(pos, integer_declaration->len)) + return -EFAULT; + + if (!integer_declaration->signedness) { + if (integer_declaration->byte_order == LITTLE_ENDIAN) + bt_bitfield_read_le(mmap_align_addr(pos->base_mma) + + pos->mmap_base_offset, unsigned long, + pos->offset, integer_declaration->len, + &integer_definition->value._unsigned); + else + bt_bitfield_read_be(mmap_align_addr(pos->base_mma) + + pos->mmap_base_offset, unsigned long, + pos->offset, integer_declaration->len, + &integer_definition->value._unsigned); + } else { + if (integer_declaration->byte_order == LITTLE_ENDIAN) + bt_bitfield_read_le(mmap_align_addr(pos->base_mma) + + pos->mmap_base_offset, unsigned long, + pos->offset, integer_declaration->len, + &integer_definition->value._signed); + else + bt_bitfield_read_be(mmap_align_addr(pos->base_mma) + + pos->mmap_base_offset, unsigned long, + pos->offset, integer_declaration->len, + &integer_definition->value._signed); } -end: - return len; + ctf_move_pos(pos, integer_declaration->len); + return 0; } -size_t int_write(uint8_t *ptr, size_t len, int byte_order, int64_t v) +int ctf_integer_write(struct stream_pos *ppos, struct definition *definition) { - int rbo = (byte_order != BYTE_ORDER); /* reverse byte order */ + struct definition_integer *integer_definition = + container_of(definition, struct definition_integer, p); + const struct declaration_integer *integer_declaration = + integer_definition->declaration; + struct ctf_stream_pos *pos = ctf_pos(ppos); - if (!ptr) - goto end; + if (!(integer_declaration->p.alignment % CHAR_BIT) + && !(integer_declaration->len % CHAR_BIT)) { + return _aligned_integer_write(ppos, definition); + } - switch (len) { - case 8: *(int8_t *)ptr = (int8_t) v; - break; - case 16: - *(int16_t *)ptr = rbo ? GUINT16_SWAP_LE_BE((int16_t) v) : - (int16_t) v; - break; - case 32: - *(int32_t *)ptr = rbo ? GUINT32_SWAP_LE_BE((int32_t) v) : - (int32_t) v; - break; - case 64: - *(int64_t *)ptr = rbo ? GUINT64_SWAP_LE_BE(v) : v; - break; - default: - assert(0); + ctf_align_pos(pos, integer_declaration->p.alignment); + + if (!ctf_pos_access_ok(pos, integer_declaration->len)) + return -EFAULT; + + if (pos->dummy) + goto end; + if (!integer_declaration->signedness) { + if (integer_declaration->byte_order == LITTLE_ENDIAN) + bt_bitfield_write_le(mmap_align_addr(pos->base_mma) + + pos->mmap_base_offset, unsigned long, + pos->offset, integer_declaration->len, + integer_definition->value._unsigned); + else + bt_bitfield_write_be(mmap_align_addr(pos->base_mma) + + pos->mmap_base_offset, unsigned long, + pos->offset, integer_declaration->len, + integer_definition->value._unsigned); + } else { + if (integer_declaration->byte_order == LITTLE_ENDIAN) + bt_bitfield_write_le(mmap_align_addr(pos->base_mma) + + pos->mmap_base_offset, unsigned long, + pos->offset, integer_declaration->len, + integer_definition->value._signed); + else + bt_bitfield_write_be(mmap_align_addr(pos->base_mma) + + pos->mmap_base_offset, unsigned long, + pos->offset, integer_declaration->len, + integer_definition->value._signed); } end: - return len; + ctf_move_pos(pos, integer_declaration->len); + return 0; }